Connor Turland 49dd2f2e92 merge develop		2015-12-22 13:16:03 -05:00
..
users	fix devise integration for rails 4	2015-12-03 16:57:29 -05:00
application_controller.rb	merge develop	2015-12-22 13:16:03 -05:00
main_controller.rb	more fixes	2015-12-03 16:57:30 -05:00
mappings_controller.rb	change from category/topic_id/synapse_id to mappable_type/mappable_id	2015-12-03 16:57:24 -05:00
maps_controller.rb	great progress	2015-12-11 14:23:41 -05:00
messages_controller.rb	great progress	2015-12-11 14:23:41 -05:00
metacode_sets_controller.rb	fix other controllers needing create/update changed for rails 4	2015-12-03 16:57:23 -05:00
metacodes_controller.rb	bugfix	2015-12-03 16:57:27 -05:00
synapses_controller.rb	sandi metz function simplification	2015-12-03 16:57:30 -05:00
topics_controller.rb	dependent destroy models for topics/maps/synapses on mappings	2015-12-03 16:57:23 -05:00
users_controller.rb	sandi metz function simplification	2015-12-03 16:57:30 -05:00