Connor Turland 415c9b8ac3 final touchups on oauth		2016-03-24 21:26:07 -07:00
..
api	Merge branch 'feature/no-cancancan' into develop	2016-03-24 20:47:35 -07:00
users	before_filter => before_action	2016-02-28 17:48:18 +08:00
application_controller.rb	final touchups on oauth	2016-03-24 21:26:07 -07:00
main_controller.rb	json response was broken	2016-03-12 12:58:13 +11:00
mappings_controller.rb	rebase onto develop which now has API and pundit	2016-03-13 10:36:38 +11:00
maps_controller.rb	Merge branch 'develop' into feature/realtime.video	2016-03-14 10:45:16 +11:00
messages_controller.rb	switch messages to use pundit	2016-03-23 16:29:26 -07:00
metacode_sets_controller.rb	before_filter => before_action	2016-02-28 17:48:35 +08:00
metacodes_controller.rb	before_filter => before_action	2016-02-28 17:48:35 +08:00
synapses_controller.rb	pundit: fixing up topics and synapses	2016-03-12 11:47:05 +11:00
topics_controller.rb	topic related things weren't working at all	2016-03-14 21:36:34 +11:00
users_controller.rb	before_filter => before_action	2016-02-28 17:48:35 +08:00