seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
5,852 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

5852 Commits

Author SHA1 Message Date
Seth Call eb5b541a05 * wip 2015-07-15 07:36:08 -05:00
Seth Call 583dec1bd3 * wip 2015-07-14 20:19:15 -05:00
Seth Call 981a38c8a3 * wip 2015-07-14 16:59:38 -05:00
Seth Call 0651326ff0 * wip 2015-07-14 16:39:56 -05:00
Seth Call 792f196e3d * still fighing build 2015-07-14 16:22:36 -05:00
Seth Call 6965f8e036 * wip 2015-07-14 16:11:22 -05:00
Seth Call 1ef12b3b8c * wip 2015-07-14 06:11:44 -05:00
Steven Miers 9980aef982 VRFS-3324 : Allow and set a a nil value to satisfy validation. 2015-07-13 16:44:16 -05:00
Seth Call b59126c3a7 switching to https 2015-07-13 14:29:42 -05:00
Seth Call 27e0d3ac66 * wip 2015-07-13 14:15:26 -05:00
Seth Call 6880428b92 * icons update 2015-07-13 14:15:26 -05:00
Steven Miers d2d0ad5c24 Fixes VRFS-3324 : Band profile setup, save current interest attributes properly. Spec to reproduce and verify. 2015-07-10 18:42:59 -05:00
Seth Call 92a47474c5 * VRFS-3323 - band setup page 3 styling 2015-07-10 13:40:15 -05:00
Seth Call 911dcf78c9 * VRFS-3320 - styling band page 2 2015-07-10 12:55:22 -05:00
Seth Call 3ff33ae146 * VRFS-3319 - styling fixes on new band page 2015-07-10 11:05:23 -05:00
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