Devin Howard 51d5d77629 Merge pull request #929 from metamaps/fix/develop-bugs ... fix some develop bugs, merge master, and move realtime port to .env		2016-11-09 21:14:48 -05:00
..
assets	merge changes from metamapscc instance branch (#913)	2016-11-09 09:34:10 -05:00
controllers	fix bugs on develop branch	2016-11-09 20:44:00 -05:00
helpers	misnamed variable errors out maps search (#893)	2016-10-31 16:41:37 -04:00
mailers	access requests (#762)	2016-10-16 20:22:00 -04:00
models	add channel to webhooks (#915)	2016-11-05 09:34:50 -07:00
policies	make synapse permissions depend on topic1 and topic2 (#839)	2016-10-28 11:03:59 +08:00
serializers	add channel to webhooks (#915)	2016-11-05 09:34:50 -07:00
services	add channel to webhooks (#915)	2016-11-05 09:34:50 -07:00
views	Fix a bunch of errors and style issues	2016-11-07 14:55:20 -05:00