Steven Miers 94963f2ad1 VRFS-2028 : Add videos to list_uploads, in addition to tracks. ... This is accomplished using a SQL union via arel.		2014-10-07 15:34:05 -05:00
admin	* VRFS-1073 - support multiple websocket gateways	2014-09-24 14:27:56 -05:00
db	Merge develop into this branch.	2014-10-06 16:17:36 -05:00
monitor	mark broken test pending	2014-09-20 17:44:21 +00:00
pb	* websocket-gateway GATEWAY_NAME fixes	2014-09-25 20:40:31 -05:00
ruby	VRFS-2028 : Add videos to list_uploads, in addition to tracks.	2014-10-07 15:34:05 -05:00
web	Merge develop into this branch.	2014-10-06 16:17:36 -05:00
websocket-gateway	Merge develop into this branch.	2014-10-06 16:17:36 -05:00
.gitignore	VRFS-1668 more test fixes	2014-05-14 01:51:18 -04:00
atlassian-ide-plugin.xml	VRFS-1654 - configure feed layout	2014-05-08 23:18:57 +08:00
build	* release branch pushes from jenkins	2014-04-22 17:59:42 +00: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