Commit Graph

5837 Commits

Author SHA1 Message Date
Seth Call d63d3ba1b2 * wip 2015-07-10 10:49:48 -05:00
Seth Call 3eea6c89d5 Merge branch 'develop' into feature/new_session
Conflicts:
	web/app/assets/javascripts/fakeJamClient.js
	web/app/assets/javascripts/globals.js
	web/app/assets/javascripts/trackHelpers.js
	web/app/assets/javascripts/utils.js
	web/app/views/dialogs/_dialogs.html.haml
2015-07-08 12:34:06 -05:00
Seth Call f520b889e5 * wip 2015-07-08 12:17:45 -05:00
Seth Call 15f9c6196a * wip 2015-07-06 14:25:37 -05:00
Seth Call 86258a9641 * wip 2015-07-06 14:23:42 -05:00
Seth Call 08ccda245e * wip 2015-07-06 14:23:33 -05:00
Seth Call 43d0ee7916 * wip 2015-07-03 08:17:03 -05:00
Seth Call 49caddd79f * support recording showing up everywhere 2015-07-02 11:29:32 -05:00
Seth Call c96a19d1b4 add webcam viewer 2015-07-02 11:02:14 -05:00
Seth Call 6f9d6c2fb5 * cleanup notifications 2015-07-02 10:43:16 -05:00
Seth Call 3130ab31a2 * fix webcam_viewer init problem 2015-07-01 18:19:32 -05:00
Seth Call 512e89074b * wip 2015-07-01 15:24:33 -05:00
Seth Call 7e6e79ccca * wip 2015-07-01 13:25:31 -05:00
Seth Call bc0add9aa0 * wip 2015-06-30 20:25:41 -05:00
Seth Call 4be1117a02 * wip 2015-06-26 13:03:32 -05:00
Seth Call 5c79bdab5c * make unsubscribed work, and only dump first_name 2015-06-20 14:49:11 -05:00
Seth Call c5bc95c562 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-06-20 14:04:13 -05:00
Seth Call 53d62f1087 * synchronize jam-admin and jam-web secret token 2015-06-20 14:03:24 -05:00
Seth Call 910b052204 *wip 2015-06-20 08:56:52 -05:00
Seth Call 7a803bb682 * wip 2015-06-17 19:03:01 -05:00
Steven Miers 0d8beef0e2 VRFS-3190 : Last band test fixed 2015-06-17 15:56:29 -05:00
Steven Miers 75779da846 VRFS-3190 : Fix saveInvitations method 2015-06-17 15:05:19 -05:00
Steven Miers d37383a578 VRFS-3190 : Fix more band tests. 2015-06-17 15:04:27 -05:00
Steven Miers 104a0c015a VRFS-3190 : Fix another band test, add constant, more cleanup. 2015-06-17 08:24:57 -05:00
Steven Miers e6d1980495 VRFS-3190 : Fix band tests, add new tests for new tabs / cleanup 2015-06-16 17:55:55 -05:00
Steven Miers cfda14e16e VRFS-3190 : Merge with latest develop branch 2015-06-16 12:23:57 -05:00
Seth Call 2da5b3804e * * delete broadcast views when user is deleted (for tests) 2015-06-16 08:21:41 -05:00
Seth Call 5af9d759f2 * delete broadcast views when user is deleted (for tests) 2015-06-15 20:54:40 -05:00
Seth Call a769dd37bf * wip 2015-06-15 19:35:59 -05:00
Steven Miers 02be103694 VRFS-3190 : Fix band model tests 2015-06-15 19:09:25 -05:00
Steven Miers bd0c931df0 VRFS-3270 : Fix submit button on edit musician profile screen.
This was broken when changing from ids to classes on screens common to
band and user profiles.
2015-06-15 18:23:31 -05:00
Steven Miers c5285002e4 VRFS-3247 : Hide online presence and performance sample icons by default. Avoids flash at page load time. 2015-06-15 18:11:27 -05:00
Steven Miers e72980a32e VRFS-3248 : Band profile - history
* Allow context.JK.Feed to be attached to band, passing through to jam
rest as necessary.  Hook up from band profile JS.
* Markup and styling for feed on band profile history tab.
2015-06-15 18:10:17 -05:00
Seth Call 9ff44a21ac * deal with changed ChannelGroupIds enum in backend 2015-06-15 13:58:21 -05:00
Seth Call c28d8f3e7f * wip 2015-06-15 13:44:23 -05:00
Steven Miers 9b24e0c05b VRFS-3247 : Band profile - use classes instead of ids for embedded partials. 2015-06-11 17:33:04 -05:00
Seth Call 6afcc84088 * only list users who have opted into email 2015-06-10 16:41:52 -05:00
Steven Miers 4e8d563184 VRFS-3247 : JS rendering of band instruments, current interests and experience. 2015-06-10 15:34:43 -05:00
Steven Miers 8cd3b836ea VRFS-3247 : Band's online presence and performance samples specify foreign key so it won’t default to a nonexistent field name. 2015-06-10 15:31:36 -05:00
Seth Call 622f750b2d * VRFS-3261 add link to let sendgrid pull our users email info down for emailing out good unsubscribe links 2015-06-10 15:14:15 -05:00
Seth Call 60302fc1fe * wip 2015-06-10 15:00:47 -05:00
Seth Call 0dbbfc0ee7 * VRFS-2855 - broadcast notifications done 2015-06-10 08:26:45 -05:00
Steven Miers 141ee5f2e7 VRFS-3247 : Band Summary - About
* Layout and styling for musical experience, performance samples,
online presence, and current interests.
* Refactor online presence icons into slim partial and use from both
musician and band profile
* Refactor performance sample icons into slim partial and use from both
musician and band profile.
* Hook up buttons: edit, delete, invite, edit bio.
2015-06-06 10:17:32 -05:00
Steven Miers 0967513a4d VRFS-3247 : Cleanup/rename. 2015-06-05 17:22:50 -05:00
Steven Miers ba52794c3d VRFS-3247 : Refactor rendering logic to util class. Incremental. 2015-06-05 15:56:19 -05:00
Steven Miers 01c3b8af5f VRFS-3190 : Use scoped classes instead of ids for navigation buttons. Initialize musician profile samples properly. 2015-06-05 12:55:55 -05:00
Steven Miers 61268bdc30 VRFS-3190 : Fix race condition. Init should be called in the same asynchronous block as construction. 2015-06-05 09:24:49 -05:00
Steven Miers cb058e851b VRFS-3190 : Several bug fixes for band profile
* Storing validator in window was screwing things up now that we have
multiple of these.  This is now stored at the class instance level.
* Deleting a performance sample didn’t delete it from the validator, as
the comparison was flaky.
* Styling fixes
2015-06-04 18:55:15 -05:00
Steven Miers 972b65c4ef VRFS-3190 : Fix a few functional and style problems. Cleanup as necessary. 2015-06-04 14:05:20 -05:00
Steven Miers b39c314e5b VRFS-3246 : Scope the unstopped selector. 2015-06-03 17:44:17 -05:00