Jonathan Kolyer de7b3121e2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop		2016-07-18 06:01:58 +00:00
admin	activeadmin set to real build	2016-07-17 22:23:07 -05:00
db	* upgrade to Rails 4 as well as support JjamBlaster	2016-07-17 10:16:27 -05:00
monitor	Merge with develop	2015-02-12 14:32:12 -06:00
pb	attach notations, audio, and recordings done	2016-05-26 16:25:51 -05:00
ruby	Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop	2016-07-18 06:01:58 +00:00
web	non-stupid assets	2016-07-17 21:56:29 -05:00
websocket-gateway	* upgrade to Rails 4 as well as support JjamBlaster	2016-07-17 10:16:27 -05:00
.gitignore	VRFS-2297 show instrument tooltips in session and recording hover bubbles	2014-11-07 12:39:45 -05:00
atlassian-ide-plugin.xml	VRFS-1654 - configure feed layout	2014-05-08 23:18:57 +08:00
build	merge conflict from feature/new_session (VRFS-3283)	2015-07-15 10:04:45 -05:00
resetdb.sh	tweak resetdb.sh	2014-05-27 09:31:50 -05:00
runadmin	* adding ability to run everything within jam-web for jobs	2014-01-29 13:26:11 -06:00
runjobs	* adding ability to run everything within jam-web for jobs	2014-01-29 13:26:11 -06:00
runtests	* adding runtests helper	2014-01-31 12:09:44 -06:00
runweb	* forcing a build of develop branch	2014-01-05 00:02:48 +00:00
update	VRFS-1651 - decoupling jam_ gems from ENV	2014-05-06 22:57:32 -05:00
update2	a better version of update for scott	2014-03-17 12:53:06 -05:00