Devin Howard 8202fb38f3 Merge branch 'develop' into feature/realtime.video		2016-02-05 16:27:43 +08:00
..
users	fix devise integration for rails 4	2015-12-03 16:57:29 -05:00
application_controller.rb	merge develop	2016-01-22 14:59:09 +13: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	setup bare minimum devise authentication in tests	2015-12-16 21:32:50 +08:00
synapses_controller.rb	sandi metz function simplification	2015-12-03 16:57:30 -05:00
topics_controller.rb	dos2unix on the whole repo	2016-02-05 11:43:15 +08:00
users_controller.rb	set up devise authentication more srsly. Still doesn't pass the test though haha	2015-12-16 22:16:02 +08:00