Anthony Davis
|
fedea2cdc3
|
VRFS-923
|
2014-01-08 07:04:23 -06:00 |
|
Anthony Davis
|
bc4223be22
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-08 05:52:14 -06:00 |
|
Anthony Davis
|
273495698a
|
VRFS-923 wrong sdk/method
|
2014-01-08 05:51:55 -06:00 |
 Seth Call
|
4c35f05826
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-08 11:31:13 +00:00 |
|
Seth Call
|
a973a370a3
|
* removing print because tests passed on build server
|
2014-01-08 11:30:54 +00:00 |
|
Anthony Davis
|
f631351315
|
minor refactor in recordings spec
|
2014-01-08 05:11:05 -06:00 |
|
Anthony Davis
|
ee5eccfdc3
|
VRFS-923 'jamkazam-testing' s3 bucket is emptied after tests
|
2014-01-08 05:10:40 -06:00 |
|
Seth Call
|
a97472503d
|
* adding some prints to debug failing tests
|
2014-01-08 10:22:33 +00:00 |
|
Seth Call
|
bffe453a6a
|
* marking sign url test as pending until credentials are provided, and bringing back icecast test
|
2014-01-08 04:27:56 +00:00 |
|
Seth Call
|
010f41fed0
|
* marking other icecast test as failing
|
2014-01-08 03:58:08 +00:00 |
|
Seth Call
|
cbac485e7e
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-08 03:42:34 +00:00 |
|
Seth Call
|
89fd0c2995
|
* VRFS-971- fixed duplicate recorded_tracks being sent as a result of list_downloads; query much more efficient too
|
2014-01-08 03:28:15 +00:00 |
Brian Smith
|
76a1d01a66
|
reformatting
|
2014-01-07 22:05:36 -05:00 |
jam
|
f003fb2501
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-08 01:43:13 +00:00 |
|
jam
|
8c51eb31db
|
Fix test and make sure icecast is at the bottom of the sql command chain
|
2014-01-08 01:42:59 +00:00 |
|
Seth Call
|
e91dbc1388
|
* removing async:trues in code (because it's default), to make it easier to find async:false
|
2014-01-08 00:44:56 +00:00 |
|
Seth Call
|
c92dd66f24
|
* moving icecast to bottom
|
2014-01-07 23:32:08 +00:00 |
|
Seth Call
|
f0dcf419b5
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-07 23:30:55 +00:00 |
|
Seth Call
|
473cb69f6d
|
* VRFS-972 - profile.js changes
|
2014-01-07 23:30:23 +00:00 |
|
Anthony Davis
|
a7be00c8f9
|
VRFS-923
|
2014-01-07 16:32:16 -06:00 |
|
jam
|
25f4d9b449
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-07 22:27:11 +00:00 |
|
jam
|
ae1fd60bbf
|
add builder to gems list
|
2014-01-07 22:27:00 +00:00 |
|
Anthony Davis
|
4ff1674f20
|
Pulling out snapshot until it's finished
|
2014-01-07 14:42:39 -06:00 |
|
jam
|
2463be1f84
|
Remove -l arg from bash script
|
2014-01-07 14:37:22 -06:00 |
|
jam
|
1ac74eadb3
|
Icecast changes
|
2014-01-07 14:32:12 -06:00 |
|
jam
|
111ab5811a
|
Icecast changes
|
2014-01-07 14:31:52 -06:00 |
|
jam
|
66558b70e9
|
Icecast test models
|
2014-01-07 14:30:06 -06:00 |
|
jam
|
932f59cea6
|
Icecast models
|
2014-01-07 14:29:40 -06:00 |
|
Anthony Davis
|
8b3d1abd5c
|
VRFS-923 - pushing a pretend delete. will review Jenkins
|
2014-01-07 13:40:26 -06:00 |
|
Seth Call
|
9045e82530
|
* make runweb and update use login shell for better support with rvm
|
2014-01-07 16:20:52 +00:00 |
|
Seth Call
|
75eb3839ad
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-07 16:01:58 +00:00 |
|
Seth Call
|
8e8e699788
|
* fixing nil.publish test in mq_router.spec
|
2014-01-07 16:01:36 +00:00 |
|
Anthony Davis
|
7e1a6cd565
|
snapshot doesn't need to write to tmp subfolder
|
2014-01-06 21:22:54 -06:00 |
|
Seth Call
|
9c8bbe9c20
|
* MUSIC_SESSION_JOIN/DEPART are now SESSION_JOIN/SESSION_DEPART, VRFS-965
|
2014-01-06 22:34:16 +00:00 |
|
Seth Call
|
050af95b56
|
* fixing more tests
|
2014-01-06 22:15:02 +00:00 |
|
Seth Call
|
6aba436781
|
* fixing failing test
|
2014-01-06 21:51:48 +00:00 |
|
Seth Call
|
8cd679bea1
|
* VRFS-964 - fixed reconnect button
|
2014-01-06 21:08:37 +00:00 |
|
Seth Call
|
45a18c4449
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-06 20:35:41 +00:00 |
|
Seth Call
|
fa23c267f5
|
* VRFS-946 and VRFS-922 - in-session recording features complete
|
2014-01-06 20:35:35 +00:00 |
Chris Doughty
|
d8cb2c72c4
|
VRFS-951 Pushing only develop or master branch files as debians
|
2014-01-05 21:35:22 -06:00 |
|
Brian Smith
|
18d8ff8d3f
|
VRFS-933 notification bug fixes
|
2014-01-05 16:42:18 -05:00 |
|
Brian Smith
|
5d2ef909ce
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-05 08:26:29 -05:00 |
|
Brian Smith
|
c52e27c7d1
|
fix race condition on user profile screen
|
2014-01-05 08:26:24 -05:00 |
|
Seth Call
|
17486c6ed2
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-01-05 03:47:35 +00:00 |
|
Seth Call
|
ba3b9ab873
|
* VRFS-946 - in-session recording
|
2014-01-05 03:47:23 +00:00 |
|
Anthony Davis
|
f8aea9ac73
|
VRFS-433 - oops little typo
|
2014-01-04 20:52:32 -06:00 |
|
Anthony Davis
|
d8dd7fddb9
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-01-04 20:42:26 -06:00 |
|
Anthony Davis
|
c625c812e1
|
Laying groundwork for VRFS-433, refactoring and adding to recordings spec
|
2014-01-04 20:42:05 -06:00 |
|
Brian Smith
|
6dec9a5239
|
fix tests
|
2014-01-04 20:25:05 -05:00 |
|
Seth Call
|
cc4ecf097f
|
* forcing a build of develop branch
|
2014-01-05 00:02:48 +00:00 |