Brian Smith a0f4dd9e0b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop		2013-10-16 03:23:51 -04:00
admin	vrfs-768: added check for user_admin_eq in scoped_collection	2013-10-10 14:42:40 -05:00
db	* VRFS-734 - adding all user progression tracking that is possible currently	2013-09-30 02:37:22 +00:00
pb	VRFS-758 join request notification logic	2013-10-16 03:23:43 -04:00
ruby	VRFS-758 join request notification logic	2013-10-16 03:23:43 -04:00
web	Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop	2013-10-16 03:23:51 -04:00
websocket-gateway	* VRFS-699; adding bugsnag to websocket-gateway as well, and hook up EventMachine errors in jam-web	2013-09-21 20:43:40 +00:00
.gitignore	* updating gitignore	2013-09-22 19:11:47 +00:00
runweb	* adding helper scripts	2013-09-25 15:34:53 +00:00
update	* forgot bundle update on ruby	2013-09-25 15:43:40 +00:00