Andrew Brown 06c6b0ce89 Merge resolution		2015-03-13 20:12:42 -05:00
..
concerns	Merge resolution	2015-03-13 20:12:42 -05:00
application_controller.rb	add my_content helper for getting content owned by currently-logged-in user	2014-03-14 20:47:29 +00:00
characters_controller.rb	let equipment be tied to a universe	2014-01-09 14:01:36 +00:00
equipment_controller.rb	let equipment be tied to a universe	2014-01-09 14:01:36 +00:00
generator_controller.rb	fix sizing on magic appearance tab long-form content fields	2013-04-21 21:53:00 -05:00
languages_controller.rb	allow languages to be tied to a universe	2014-01-09 14:25:21 +00:00
locations_controller.rb	Use location paths on location#edit, not character paths	2014-10-23 03:33:04 +00:00
magic_controller.rb	tie magic to universe + show it on universe#show	2014-01-09 14:57:03 +00:00
main_controller.rb	skeleton page for attribution	2013-12-08 14:15:30 -06:00
sessions_controller.rb	Do not double-hash user passwords #378	2014-08-03 19:44:31 -05:00
universes_controller.rb	hide private content, allow #show on public content	2014-01-09 03:04:11 +00:00
users_controller.rb	Do not double-hash user passwords #378	2014-08-03 19:44:31 -05:00