Connor Turland 96cee3cf21 Merge branch 'master' into thevalueweb		2015-02-06 17:44:10 -05:00
..
.gitkeep	added all files	2012-09-22 22:39:12 -04:00
in_metacode_set.rb	added ability for an admin to add metacodes and metacode sets	2014-05-17 14:57:03 -04:00
map.rb	active lists are sorting right. explore url breaking doesn't happen. explore maps pages do nicer infinite scrolling, properly loading only 20 at a time	2015-01-31 12:39:48 -05:00
mapping.rb	fixed right click on topic menu, fixed synapse color when opening for synapse card, removed mCustomScrollbar	2014-10-04 00:15:47 -04:00
metacode.rb	huge refactor 75% done	2014-07-27 15:57:35 -04:00
metacode_set.rb	added ability for an admin to add metacodes and metacode sets	2014-05-17 14:57:03 -04:00
synapse.rb	mapper who doesn't own a topic or synapse should not be able to delete it.	2015-01-28 22:35:03 -05:00
topic.rb	mapper who doesn't own a topic or synapse should not be able to delete it.	2015-01-28 22:35:03 -05:00
user.rb	merged develop into thevalueweb	2014-12-03 08:26:11 -05:00
user_preference.rb	merge develop and switch default metacode set	2014-10-27 12:15:57 -04:00