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
..
admin_helper.rb	Add admin stat pages for users, characters, locations, items, and universes	2016-09-28 23:39:32 +02:00
application_helper.rb	Show content names as page titles when available	2016-08-04 22:41:48 -05:00
attributes_helper.rb	Clean up content panel actions + allow expanding all tabs at once	2017-02-14 19:58:27 +00:00
export_helper.rb	Add content exporting to TXT, CSV, and JSON	2016-10-04 14:25:28 +02:00
image_upload_helper.rb	Single image uploading, needs processing in controller	2017-02-17 01:41:41 +00:00
siblingship_helper.rb	Siblingship join model	2016-04-29 14:01:35 -05:00
subscriptions_helper.rb	Add subscriptions UI	2017-01-21 15:13:01 +00:00
users_helper.rb	Add users controller + routes for author profiles	2016-09-05 21:51:21 -05:00
write_helper.rb	add proof of concept editor	2016-07-31 00:20:28 -05:00