ecdfde2cdb
vrfs988: sync api wrapper with search model
2014-01-11 09:12:26 -06:00
0279b05454
vrfs-988: fixed text search return value
2014-01-11 08:59:09 -06:00
2229babf68
vrfs-988: refactoring search as text by entity, rather than site-wide
2014-01-11 06:27:05 -06:00
Seth Call
26f751cdc4
* sending 'downloadavailable' messages when mix becomes available
2014-01-11 05:34:26 +00:00
Seth Call
eb7adbd303
* working out more issues with VRFS-801
2014-01-11 05:23:29 +00:00
Seth Call
f5a271c35b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-11 04:57:30 +00:00
Seth Call
d89ce4c140
* VRFS-801 - almost working on my dev machine
2014-01-11 04:57:07 +00:00
85d6129a50
vrfs-927: fixing latest promotions
2014-01-10 18:10:14 -06:00
e5d23cc3bd
merge conflicts
2014-01-08 18:45:34 -06:00
4b85863a33
vrfs-927: buzz admin fixes
2014-01-08 18:00:22 -06:00
Seth Call
783a7c3adf
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-08 22:55:51 +00:00
Seth Call
83409e9da8
* adding resque gem to Gemfile
2014-01-08 22:55:44 +00:00
e827f274b2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-08 22:42:24 +00:00
9ed2210500
websock set timeout on development build
2014-01-08 22:42:10 +00:00
Seth Call
9e7debdeda
* merged
2014-01-08 21:49:35 +00:00
Seth Call
59bf00a97e
* DownloadAvailable proto msg added to help poke client when downloads become available
2014-01-08 21:24:21 +00:00
d899b88dd1
switching failing specs to expect() syntax
2014-01-08 15:21:32 -06:00
9127d1861d
VRFS-923 commenting out AWS wipe in web as well
2014-01-08 13:59:53 -06:00
Seth Call
88888a6846
* oops. didn't realize that the client footer is reused by 2 other templates
2014-01-08 19:49:21 +00:00
Seth Call
40480f1484
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-08 18:04:21 +00:00
Seth Call
a400c0f289
* VRFS-971 adding progress at bottom of fotor
2014-01-08 18:04:11 +00:00
b10f0917fd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
...
# By Anthony Davis (3) and Seth Call (2)
# Via Anthony Davis (2) and Seth Call (1)
* 'develop' of bitbucket.org:jamkazam/jam-cloud:
VRFS-923 wrong sdk/method
* removing print because tests passed on build server
minor refactor in recordings spec
VRFS-923 'jamkazam-testing' s3 bucket is emptied after tests
* adding some prints to debug failing tests
2014-01-08 07:34:21 -05:00
bc4223be22
Merge remote-tracking branch 'origin/develop' into develop
2014-01-08 05:52:14 -06:00
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
f631351315
minor refactor in recordings spec
2014-01-08 05:11:05 -06:00
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
6f66f4219c
VRFS-929 Double Scroll Bars.
2014-01-08 05:07:56 -05:00
76a1d01a66
reformatting
2014-01-07 22:05:36 -05: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
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
a7be00c8f9
VRFS-923
2014-01-07 16:32:16 -06:00
25f4d9b449
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-07 22:27:11 +00:00
ae1fd60bbf
add builder to gems list
2014-01-07 22:27:00 +00:00
4ff1674f20
Pulling out snapshot until it's finished
2014-01-07 14:42:39 -06:00
8b3d1abd5c
VRFS-923 - pushing a pretend delete. will review Jenkins
2014-01-07 13:40:26 -06:00
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
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
d8cb2c72c4
VRFS-951 Pushing only develop or master branch files as debians
2014-01-05 21:35:22 -06:00
18d8ff8d3f
VRFS-933 notification bug fixes
2014-01-05 16:42:18 -05:00
5d2ef909ce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-01-05 08:26:29 -05:00
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
f8aea9ac73
VRFS-433 - oops little typo
2014-01-04 20:52:32 -06:00
c625c812e1
Laying groundwork for VRFS-433, refactoring and adding to recordings spec
2014-01-04 20:42:05 -06:00
6dec9a5239
fix tests
2014-01-04 20:25:05 -05:00
fab83707b7
VRFS-933 notification work
2014-01-04 17:02:47 -05:00
071ab4c0e9
Revert "VRFS-933 fix issues"
...
This reverts commit 1b3fdee99e
2014-01-04 16:41:21 -05:00
1b3fdee99e
VRFS-933 fix issues
2014-01-04 12:35:15 -05:00
8b87b11f4d
VRFS-933 merge with develop
2014-01-04 12:24:11 -05:00
a2b34d68dd
VRFS-933 notification bug fixes
2014-01-04 12:20:28 -05:00
7ef959782e
VRFS-933 notifications
2014-01-04 10:40:21 -05:00
c94537da62
vrfs-927: added carrierwave-direct
2014-01-04 03:22:29 -06:00
a99d793e6c
VRFS-750 Starting generic page for 503 error
2014-01-02 19:35:50 -06:00
3872898b95
VRFS-933 notification work
2014-01-02 14:57:16 -05:00
452ddb3ff0
VRFS-933 more notification work; fixed test failures
2014-01-01 22:06:59 -05:00
2d51d04bbd
VRFS-948 Formatting updates
...
Will possibly need to revisit in the context of 294
2014-01-01 19:33:27 -05:00
c00267f31c
VRFS-948 / VRFS-930 / VRFS-931 Formatting updates
...
Will possibly need to revisit in the context of 294
2014-01-01 15:41:40 -05:00
e76244c360
VRFS-940 Change Avatar link borked.
...
Add in avatar.
2013-12-31 23:24:10 -05:00
051b8eec5e
remove crash dump file
2013-12-30 22:36:00 -05:00
5b31e802d6
VRFS-933 more notification work
2013-12-30 22:35:38 -05:00
Seth Call
c3954d65f0
* delete existing tracks on older migration that will break existing deployments
2013-12-30 19:16:08 +00:00
Seth Call
73b04ba5fc
* oomps--left in my local capybara-screenshot reference
2013-12-30 19:10:12 +00:00
Seth Call
e4ed571dcb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-30 18:34:26 +00:00
Seth Call
ab70d15eaf
* the form VRFS-922, VRFS-918 (mix checks user permissions), VRFS-945 (verify download permissions for tracks)
2013-12-30 18:34:15 +00:00
e22784c6c3
VRFS-294 Adjustments to HTML/ CSS.
...
Account Profile Avatar page
2013-12-29 21:04:07 -05:00
102306e4d1
VRFS-933 notification work
2013-12-29 20:49:44 -05:00
90f81e0994
VRFS-934 Remove extraneous scrollbar
...
due to explicit height in markup
2013-12-29 16:42:18 -05:00
56bf445610
VRFS-935 Account identity screen borked.
2013-12-29 15:55:55 -05:00
144f97f470
VRFS-935 Account identity screen borked.
2013-12-29 15:52:29 -05:00
1806c5245f
VRFS-933 notification work
2013-12-29 14:40:21 -05:00
7bb4b4a3c8
VRFS-936 Session header bar missing
2013-12-29 13:14:50 -05:00
7e78163bb9
VRFS-933 notification work
2013-12-28 23:51:35 -05:00
4a9ad7b733
VRFS-937 - locking 'gon' to ~>4.1.0 to fix test failures
2013-12-28 11:54:53 -06:00
75b9b97c60
fix warning related to ruby- prefix in .ruby-version files
2013-12-27 16:28:28 -05:00
8fa8895944
vrfs-743: dropped expire date for read to 20 years, as 25 years is too long for S3
2013-12-21 22:01:25 -06:00
Seth Call
d8a5dbd031
* making a test as pending that fails only on build server for now
2013-12-21 16:35:17 +00:00
Seth Call
182242c7fb
* VRFS-856 - hopefully the fix
2013-12-21 15:12:25 +00:00
Seth Call
9943e4518b
* oops. adding path to poltergeist gem
2013-12-21 02:43:55 +00:00
Seth Call
8deced77c7
* pinning aws-sdk to 1.29.1 everywhere because the gem released today is broken
2013-12-20 23:44:12 +00:00
Seth Call
a68235f280
* adding 'select' to dialog-inner so it'll look JKish
2013-12-20 22:24:14 +00:00
Seth Call
242016c38b
* VRFS-821 - recordings manager changes
2013-12-20 22:01:51 +00:00
9c6ccee6f0
VRFS-294 Adjustments to HTML/ CSS.
2013-12-20 07:04:58 -05:00
0ecbf9f047
vrfs-916: added toggles for fan/musician; misc fan tweaks
2013-12-18 22:12:28 -06:00
f7c08ce472
vrfs-916: added fan page branching logic
2013-12-18 17:59:02 -06:00
56a02a24b2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-18 22:47:34 -05:00
d5b53c3406
remove hard-coded band ID
2013-12-18 22:33:56 -05:00
Seth Call
de4a2c8321
* VRFS-821; sending loggedin/loggedout events to backend from frontend
2013-12-18 17:18:23 +00:00
Seth Call
d97a960a0e
* VRFS-821 many changes for upload apis, mostly
2013-12-17 19:44:21 +00:00
3c8dbf4d80
Merge branch 'web_pages' into develop
2013-12-17 11:00:57 -06:00
f442196f8d
Merge remote-tracking branch 'origin/develop' into develop
2013-12-17 22:07:48 -06:00
daf9b38a9e
VRFS-909 - pushing typo fix in legal email
2013-12-17 22:07:24 -06:00
020f9d544e
vrfs-884: tweaking layout
2013-12-17 10:59:16 -06:00
4329338fa8
vrfs-884: added check for client_id==undefined in participant_delete method
2013-12-17 10:58:35 -06:00
932de5cc35
VRFS-877 band photo bug fixes
2013-12-16 23:22:30 -05:00
d7a6253b76
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-16 20:32:31 -06:00
60b59a88c7
vrfs-884: fixing tests for commit
2013-12-16 20:32:17 -06:00
64e0089960
Merge remote-tracking branch 'origin/develop' into develop
2013-12-16 14:43:08 -06:00
aec6e52ace
VRFS-907 - removed links to jeffkoke.com also fixing character
2013-12-16 14:42:34 -06:00
196b895f32
vrfs-884: merge conflict
2013-12-16 12:36:41 -06:00
fc6d12e9c8
vrfs-884: band filter page
2013-12-16 12:31:12 -06:00
9dd631d05a
vrfs-884: added PARAM_BAND support
2013-12-16 12:29:16 -06:00
a354f6c6d5
vrfs-884: updating sample data for bands
2013-12-16 12:28:21 -06:00
7a3594a0cc
Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop
2013-12-16 07:51:56 -06:00
836e786ebf
Correcting staging cloudfront distribution with correct s3 bucket
2013-12-16 07:51:46 -06:00
0431c40e93
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-15 22:53:34 -05:00
d583393598
VRFS-877 bug fixes
2013-12-15 22:53:16 -05:00
f10d43e41f
Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop
2013-12-15 20:08:59 -06:00
d310484c3b
VRFS-719 fixing error case where path is incorrectly built
2013-12-15 20:01:13 -06:00
10d9232e3f
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-15 16:27:24 -05:00
5b5aef15c8
VRFS-877 band photo work
2013-12-15 16:27:11 -05:00
9de0d84106
adding: bands_spec (oops, was not git added)
2013-12-14 17:59:48 -06:00
4e273759ba
adding: bands_spec, link ids, more in_session JS testing and refactoring
2013-12-14 17:53:18 -06:00
b5efad954d
Adding prd and dev cloudfront hosts
2013-12-14 13:07:38 -06:00
c0a6541039
Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop
2013-12-12 20:47:33 -06:00
fa8df410da
VRFS-719 Added code to force downloads through cloudfront
2013-12-12 20:47:20 -06:00
Seth Call
a30bc2a022
* fix for VRFS-901 - when you remove a track there was a typo in the jamClient reference
2013-12-12 14:57:54 +00:00
88f9339fe2
vrfs-884: removed commented code
2013-12-09 13:55:18 -06:00
3968f4015a
vrfs-884: added bands view layout
2013-12-09 13:55:02 -06:00
2a93ce7caf
vrfs-884: refactored search filter var names
2013-12-09 13:54:02 -06:00
4c804d2f94
vrfs-884: added band geocoding; inital band filtering tests; refactoring musicians filter page
2013-12-09 07:15:59 -06:00
6b4e42dfc5
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-08 22:32:02 -05:00
833eb45379
VRFS-878 use IP address to default location for band setup
2013-12-08 22:31:49 -05:00
1b77065826
VRFS-294 Resizing Create Session View tweaks for ~1024 px width.
...
tweak to content-icon
2013-12-08 13:07:36 -05:00
0bad5573b2
VRFS-294 Resizing Create Session View tweaks for ~1024 px width.
...
enables scrolling within the session container for short screens.
2013-12-08 12:12:26 -05:00
5856c5d176
VRFS-876 allow user to remove band members
2013-12-07 20:45:24 -05:00
c49406d467
VRFS-294 Resizing Create Session View tweaks for ~1024 px width
2013-12-07 12:31:02 -05:00
Seth Call
4f97753f47
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-12-05 11:16:26 +00:00
Seth Call
73087f0f7a
* recordings manager - changes to download/upload REST APIs - VRFS-821
2013-12-05 11:16:21 +00:00
c18848fa03
vtfs-884: cleanup of musicians page prepping for bands page clone
2013-11-29 18:34:00 -06:00
7f302a6f0e
vrfs-774: removed the like button for results and commented out the message link for compliance with product spec
2013-11-29 15:07:15 -06:00
cc4f2512bd
VRFS-867 bug fixes
2013-12-01 18:16:33 -05:00
3e1e05e378
VRFS-867 preselect assigned genres when editing band details
2013-12-01 17:53:24 -05:00
6e180b86d1
VRFS-867 preload location data correctly when editing band details
2013-12-01 16:53:05 -05:00
95954f4789
VRFS-867 band edit feature
2013-12-01 15:09:44 -05:00
63a5559689
VRFS-689 integrate email / Google+ invitation dialog
2013-12-01 01:25:01 -05:00
4824ca4eb3
VRFS-689 show pending band invitations on Band Profile Members tab
2013-12-01 01:11:23 -05:00
419ff2793d
VRFS-689 reset form when cancelling setup
2013-11-30 16:35:22 -05:00
4fadedb04b
VRFS-689 added validations for required fields
2013-11-30 16:19:20 -05:00
c3d49de7f1
vrfs-868: added auth_action route to enable GET-based actions requiring authentication
2013-11-28 06:15:22 -06:00
1d0b07cbe1
vrfs-775: fixed arg handling in new musicians email
2013-11-27 23:35:16 -06:00
37c571d9ea
VRFS-689 city/state/country dropdowns should be dynamic using REST API
2013-11-28 00:36:32 -05:00
71eae1dbb2
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2013-11-27 00:57:56 -05:00
Jonathan Kolyer
Seth Call
jam
Anthony Davis
Daniel Weigh
Brian Smith
Chris Doughty
Chris Doughty
Brian Smith
Brian Smith