Commit Graph

76 Commits

Author SHA1 Message Date
Andrew Brown
f548c83143 Fix 500 on content pages for people with negative upload bandwidth 2017-11-11 20:53:48 +01:00
Andrew Brown
365e76951a Bugfix: Display identmarks field on characters 2017-10-12 13:59:28 +02:00
Andrew Brown
93a7ba3f54 polishing 2017-08-17 19:56:59 +02:00
Andrew Brown
f47741558b we're making things happen 2017-08-17 03:10:18 +02:00
Andrew Brown
dfdb81d854 more permissions 2017-08-17 00:30:48 +02:00
Andrew Brown
d1d157dbb4 privacy on private notes vs contributors 2017-08-15 14:17:46 +02:00
Andrew Brown
b6240fc814 treat contribs as contribs even on content they create in another universe 2017-08-15 13:45:07 +02:00
Andrew Brown
5be74214cc allow leaving a universe as collaborator 2017-08-15 13:38:56 +02:00
Andrew Brown
4b57069fa6 Allow viewing/editing collaborative content 2017-08-15 04:47:30 +02:00
Andrew Brown
1f9346f2fd Create contributors in flow 2017-08-15 02:10:31 +02:00
Andrew Brown
0022adb953 Contributor invite flow #migration 2017-08-15 01:41:43 +02:00
Andrew Brown
053b16fd4e polishing 2017-07-31 03:49:24 +02:00
Andrew Brown
30196b2d9b Little helpful hand on custom attributes/categories 2017-04-13 00:16:10 +01:00
Andrew Brown
8c960fc582 Content linking dropdowns no longer exclude same-id/different-class options, fixes #193 2017-03-26 18:11:20 +01:00
Andrew Brown
a07b3126c1 FABs and other form UI improvements 2017-02-23 17:56:07 +00:00
Andrew Brown
cd3b606741 Style content#new and content#edit to use the same design as content#show 2017-02-23 16:55:43 +00:00
Andrew Brown
fff5abf02e Style share modal 2017-02-23 14:41:02 +00:00
Andrew Brown
a90f042caa Allow uploading more than 2 images at a time 2017-02-20 17:46:59 +00:00
Andrew Brown
96e0a60ea9 Subtract account bandwidth on upload, refund on delete 2017-02-18 02:24:38 +00:00
Andrew Brown
6ce64d09b0 Merge branch 'master' into release/uploads
Conflicts:
	app/views/content/form/_panel.html.erb
	app/views/content/show.html.erb
2017-02-18 00:56:37 +00:00
Andrew Brown
1cf19aea75 Polishing gallery ui 2017-02-18 00:36:16 +00:00
Andrew Brown
ee13d748f3 Fix image destroy callback 2017-02-18 00:26:58 +00:00
Andrew Brown
c7af58da77 Delete images on s3 also 2017-02-18 00:11:35 +00:00
Andrew Brown
f30baeabfa allow deleting uploaded images 2017-02-17 23:48:21 +00:00
Andrew Brown
b211f7974f Style gallery edit partial 2017-02-17 23:29:49 +00:00
Andrew Brown
1b1fae1bb7 Show uploaded image galleries on content show pages 2017-02-17 23:01:09 +00:00
Andrew Brown
4c0cd9a1f1 Style image upload 2017-02-17 22:52:24 +00:00
Andrew Brown
d072a4c730 Show uploaded images on Gallery tab 2017-02-17 22:25:16 +00:00
Andrew Brown
bb01a25614 Upload images to S3 2017-02-17 21:03:29 +00:00
Andrew Brown
f2053b3ae0 Hook up frontend to allow multiple file uploads 2017-02-17 18:54:36 +00:00
Andrew Brown
737273d2ae Single image uploading, needs processing in controller 2017-02-17 01:41:41 +00:00
Andrew Brown
099b252e8e Add gallery tab to characters 2017-02-16 20:04:18 +00:00
Andrew Brown
798ac705ed Clean up content panel actions + allow expanding all tabs at once 2017-02-14 19:58:27 +00:00
Andrew Brown
84d3407a31 Don't include the current content in content linking dropdowns, closes #11 2017-02-06 14:47:51 +00:00
Andrew Brown
3b84989321 Show modals again, function method changed apparently 2016-11-06 16:48:42 +01:00
Andrew Brown
48cf0a2ea5 Scope content linking dropdowns to universe when scoped 2016-11-06 15:48:23 +01:00
Andrew Brown
a896c3c5ae Migrate content types to the new attribute system 2016-11-01 21:51:57 +01:00
Andrew Brown
d107512438 Merge branch 'custom-attributes' into content-expansion
Conflicts:
	app/models/content_types/character.rb
	app/models/user.rb
	app/views/content/_form.html.erb
	app/views/content/form/_text_input.html.erb
	app/views/content/index.html.erb
	app/views/content/list/_list.html.erb
	app/views/content/show.html.erb
	app/views/items/edit.html.erb
	app/views/items/new.html.erb
	app/views/locations/edit.html.erb
	app/views/locations/new.html.erb
	app/views/universes/edit.html.erb
	app/views/universes/new.html.erb
	config/locales/en.yml
	config/routes.rb
	db/schema.rb
2016-11-01 21:02:12 +01:00
Matthew Werner
72c66a60cb Attribute Field Dropdowns 2016-10-31 16:32:41 -07:00
Matthew Werner
9299699f4b better category and field creation 2016-10-25 16:37:35 -07:00
Matthew Werner
5b58364c97 merge in upstream 2016-10-25 11:05:22 -07:00
Matthew Werner
01f791d149 merge upstream 2016-10-25 10:43:18 -07:00
Andrew Brown
cb211edb6b Add translations to relation fields partial 2016-10-24 23:05:40 +02:00
Andrew Brown
157dc9b5a0 Translations and serendipitous questions for creatures 2016-10-21 14:20:23 +02:00
Mitchel Pigsley
4f77f612e2 Add new lines to forms.css and realation_input 2016-10-15 21:13:41 -05:00
Mitchel Pigsley
80fa7c4d94 Wrap relation input correctly by sizing to normal input height 2016-10-15 10:10:29 -05:00
Andrew Brown
5df1099038 remove redundant line 2016-10-11 11:48:12 +02:00
Andrew Brown
1f3e7964b7 Add smarter placeholders to content forms 2016-10-11 11:45:00 +02:00
Matthew Werner
7b109eb12b clean up 2016-10-10 16:45:03 -07:00
Matthew Werner
eca50c3276 make attribute categories accessible 2016-10-10 16:20:47 -07:00