Andrew Brown 6f381c889d Merge branch 'master' into achetype ... Conflicts: db/schema.rb		2016-10-04 00:16:56 +02:00
..
concerns	Adjust publicly_shared? logic to account for legacy nil privacy values	2016-09-23 23:25:32 +02:00
admin_controller.rb	Merge master	2016-09-29 20:06:41 -05:00
application_controller.rb	Use rspec-prof	2016-10-02 14:18:05 -05:00
characters_controller.rb	Add archetype to character information	2016-10-02 22:24:52 -05:00
characters_generator_controller.rb	Fix two minor offenses in the CharactersGenerator	2015-03-27 23:47:41 -05:00
content_controller.rb	Merge branch 'master' into issue-18-serendipitous-i18n	2016-09-29 20:16:09 -05:00
equipment_generator_controller.rb	Refactor GeneratorController	2015-03-27 22:56:45 -05:00
items_controller.rb	Add 'past owners' relation on items	2016-10-02 01:41:31 +02:00
locations_controller.rb	Allow updating privacy field on content	2016-09-24 02:55:48 +02:00
locations_generator_controller.rb	Create tests for the locations generator	2015-04-01 16:57:58 -05:00
main_controller.rb	Re-enable dashboard serendipitous card	2016-09-30 12:32:34 +02:00
registrations_controller.rb	Report new author signups to slackgit status!	2016-09-30 00:32:07 +02:00
siblingship_controller.rb	Recognize associations on content#edit	2016-04-30 12:21:32 -05:00
universes_controller.rb	Rubocop auto-correct	2016-08-26 14:56:52 -05:00
users_controller.rb	Add author profile mvp	2016-09-05 23:48:06 -05:00
write_controller.rb	Lean entity extraction + contextual card popups in editor	2016-07-31 01:36:54 -05:00