Commit Graph

2248 Commits

Author SHA1 Message Date
Seth Call c784b9faa0 * fixing websocket tests 2013-12-21 00:17:35 +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
Daniel Weigh 9c6ccee6f0 VRFS-294 Adjustments to HTML/ CSS. 2013-12-20 07:04:58 -05:00
Jonathan Kolyer 0ecbf9f047 vrfs-916: added toggles for fan/musician; misc fan tweaks 2013-12-18 22:12:28 -06:00
Jonathan Kolyer 4b3b8491b3 vrfs-916: added favorite_count method 2013-12-18 22:10:55 -06:00
Jonathan Kolyer f7c08ce472 vrfs-916: added fan page branching logic 2013-12-18 17:59:02 -06:00
Jonathan Kolyer 4e136659e8 vrfs-916: added following? method 2013-12-18 17:48:55 -06:00
Brian Smith 56a02a24b2 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-18 22:47:34 -05:00
Brian Smith 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 8bd715c7ea * VRFS-821 many changes for upload apis, mostly 2013-12-17 19:44:30 +00:00
Seth Call d97a960a0e * VRFS-821 many changes for upload apis, mostly 2013-12-17 19:44:21 +00:00
Jonathan Kolyer 3c8dbf4d80 Merge branch 'web_pages' into develop 2013-12-17 11:00:57 -06:00
Anthony Davis f442196f8d Merge remote-tracking branch 'origin/develop' into develop 2013-12-17 22:07:48 -06:00
Anthony Davis daf9b38a9e VRFS-909 - pushing typo fix in legal email 2013-12-17 22:07:24 -06:00
Jonathan Kolyer 020f9d544e vrfs-884: tweaking layout 2013-12-17 10:59:16 -06:00
Jonathan Kolyer 4329338fa8 vrfs-884: added check for client_id==undefined in participant_delete method 2013-12-17 10:58:35 -06:00
Brian Smith a1983d9803 VRFS-877 band photo bug fixes 2013-12-16 23:23:59 -05:00
Brian Smith 932de5cc35 VRFS-877 band photo bug fixes 2013-12-16 23:22:30 -05:00
Jonathan Kolyer d7a6253b76 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-16 20:32:31 -06:00
Jonathan Kolyer 60b59a88c7 vrfs-884: fixing tests for commit 2013-12-16 20:32:17 -06:00
Anthony Davis 64e0089960 Merge remote-tracking branch 'origin/develop' into develop 2013-12-16 14:43:08 -06:00
Anthony Davis aec6e52ace VRFS-907 - removed links to jeffkoke.com also fixing character 2013-12-16 14:42:34 -06:00
Jonathan Kolyer 742402dfa2 vrfs-884: merge conflict fixes 2013-12-16 12:47:59 -06:00
Jonathan Kolyer 196b895f32 vrfs-884: merge conflict 2013-12-16 12:36:41 -06:00
Jonathan Kolyer fc6d12e9c8 vrfs-884: band filter page 2013-12-16 12:31:12 -06:00
Jonathan Kolyer 9dd631d05a vrfs-884: added PARAM_BAND support 2013-12-16 12:29:16 -06:00
Jonathan Kolyer a354f6c6d5 vrfs-884: updating sample data for bands 2013-12-16 12:28:21 -06:00
Jonathan Kolyer 65f3200fd7 vrfs-884: added :genres eager loading 2013-12-16 12:23:02 -06:00
Chris Doughty 7a3594a0cc Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop 2013-12-16 07:51:56 -06:00
Chris Doughty 836e786ebf Correcting staging cloudfront distribution with correct s3 bucket 2013-12-16 07:51:46 -06:00
Brian Smith 0431c40e93 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-15 22:53:34 -05:00
Brian Smith d583393598 VRFS-877 bug fixes 2013-12-15 22:53:16 -05:00
Chris Doughty f10d43e41f Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop 2013-12-15 20:08:59 -06:00
Chris Doughty d310484c3b VRFS-719 fixing error case where path is incorrectly built 2013-12-15 20:01:13 -06:00
Brian Smith 5ea5fd3d63 VRFS-877 add missing sql file 2013-12-15 20:26:21 -05:00
Brian Smith 0aaa460934 VRFS-877 band photo work 2013-12-15 16:30:04 -05:00
Brian Smith 10d9232e3f Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2013-12-15 16:27:24 -05:00
Brian Smith 5b5aef15c8 VRFS-877 band photo work 2013-12-15 16:27:11 -05:00
Anthony Davis 9de0d84106 adding: bands_spec (oops, was not git added) 2013-12-14 17:59:48 -06:00
Anthony Davis 4e273759ba adding: bands_spec, link ids, more in_session JS testing and refactoring 2013-12-14 17:53:18 -06:00
Chris Doughty b5efad954d Adding prd and dev cloudfront hosts 2013-12-14 13:07:38 -06:00
Chris Doughty c0a6541039 Merge branch 'develop' of bitbucket.com:jamkazam/jam-cloud into develop 2013-12-12 20:47:33 -06:00
Chris Doughty 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
Jonathan Kolyer 88f9339fe2 vrfs-884: removed commented code 2013-12-09 13:55:18 -06:00
Jonathan Kolyer 3968f4015a vrfs-884: added bands view layout 2013-12-09 13:55:02 -06:00
Jonathan Kolyer 2a93ce7caf vrfs-884: refactored search filter var names 2013-12-09 13:54:02 -06:00