Seth Call
|
464c595d6b
|
* fixing controller/request tests
|
2014-06-24 10:33:31 -05:00 |
Seth Call
|
6d84241cae
|
* merged
|
2014-06-23 22:28:23 -05:00 |
Seth Call
|
5750584769
|
* VRFS-1803 - myriad create session styling fixes; some default behaviors added, UI behavors added; VRFS-1808; change up how upload files works
|
2014-06-23 22:26:27 -05:00 |
Brian Smith
|
c5d9f41242
|
fix merge
|
2014-06-23 01:56:44 -04:00 |
Brian Smith
|
e211871168
|
merge develop
|
2014-06-23 01:09:03 -04:00 |
Brian Smith
|
f4b4734c94
|
VRFS-1669 find session work
|
2014-06-23 00:58:37 -04:00 |
Brian Smith
|
bc47a0a599
|
VRFS-1669 find session wip
|
2014-06-21 16:16:39 -04:00 |
Seth Call
|
3d1c4f2488
|
* VRFS-1790 - drag handles added to configure tracks; VRFS-1653 - fixed bug where slow initial connect would cause loop; also log in on initail connect instead of extra login message
|
2014-06-19 14:05:33 -05:00 |
Bert Owen
|
af06127403
|
fix create session flow, rsvp
|
2014-06-20 02:43:21 +08:00 |
Brian Smith
|
b4151c27e9
|
VRFS-1669 VRFS-1672 session settings dialog / find session work
|
2014-06-19 00:21:34 -04:00 |
Brian Smith
|
74d5053a8a
|
allow session organizer to create RSVP for self without having invitation
|
2014-06-18 22:32:21 -04:00 |
Bert Owen
|
7f6a5e75ff
|
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-06-19 00:16:24 +02:00 |
Bert Owen
|
f27ff725ef
|
fix create session flow errors.
|
2014-06-19 00:15:56 +02:00 |
Seth Call
|
8efe5ee575
|
* adding name proxy method
|
2014-06-18 09:54:08 -05:00 |
Seth Call
|
e3d521e07a
|
* adding in session.name to show.rabl and history_show.rabl
|
2014-06-18 08:09:36 -05:00 |
Seth Call
|
a46180880e
|
* fixing a few web tests
|
2014-06-17 20:07:40 -05:00 |
Seth Call
|
39a55f562c
|
* VRFS-1684 and VRFS-1684 (find session APIs) completede
|
2014-06-17 17:16:49 -05:00 |
Seth Call
|
106222638f
|
* VRFS-1684 and VRFS-1686 - updating stored procs, added /api/sessions/nonactive/, adding a bunch of tests for sms_index
|
2014-06-17 14:10:24 -05:00 |
Seth Call
|
3ef4619872
|
* cleaning up minor things
|
2014-06-16 15:58:44 -05:00 |
Seth Call
|
8d16bdacfa
|
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-06-16 15:41:52 -05:00 |
Seth Call
|
f680fafaf3
|
* VRFS-1684 - adding latency to participants and approved_rsvps JSON response.
|
2014-06-16 15:41:37 -05:00 |
Brian Smith
|
35f630bdd7
|
VRFS-1690 add autoapprove option to RSVP creation
|
2014-06-16 08:11:05 -04:00 |
Brian Smith
|
87a74e235d
|
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-06-16 01:47:07 -04:00 |
Brian Smith
|
75b22ced5b
|
added ability to retrieve RSVP requests by approval status
|
2014-06-16 01:46:52 -04:00 |
Scott Comer
|
839605255d
|
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-06-15 19:56:44 -05:00 |
Scott Comer
|
d02e10def5
|
fix asm_index stored procedure to populate all users of active sessionsinto ams_users_tmp whether they have scores or not
|
2014-06-15 19:26:13 -05:00 |
Brian Smith
|
4c81fdc1eb
|
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-06-15 15:49:47 -04:00 |
Brian Smith
|
7f3f47c3e6
|
VRFS-1749 session info tests
|
2014-06-15 15:49:43 -04:00 |
Scott Comer
|
740d48631a
|
added ams_users invocation to ams_index method of controller; fixed bug in spec relating to user id accessor of user object
|
2014-06-15 10:58:19 -05:00 |
Scott Comer
|
07c1a4c85d
|
added attribute accessors for music_session_id and latency; added access to ams_users_tmp via ams_users method in ActiveMusicSession; added test of same in the spec
|
2014-06-15 10:35:15 -05:00 |
Bert Owen
|
ab2ad1b93c
|
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-06-15 15:12:07 +08:00 |
Bert Owen
|
db6d6fa315
|
fix tests, rsvp error
|
2014-06-15 15:10:44 +08:00 |
Scott Comer
|
ab5a7dc47a
|
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
|
2014-06-14 21:27:43 -05:00 |
Scott Comer
|
3c3565893d
|
wire up live latency and tag; accessors for tag and latency; fix borked function def; ams_init function; ams transaction
|
2014-06-14 21:27:34 -05:00 |
Brian Smith
|
a557e9966a
|
VRFS-1749 more session info tests / fix "deprecated" warnings
|
2014-06-14 13:13:45 -04:00 |
Bert Owen
|
03705547dd
|
fix music session - rsvp
|
2014-06-14 21:42:46 +08:00 |
Bert Owen
|
d4b467fd42
|
scheduled session - RSVP slot updated
|
2014-06-14 21:25:32 +08:00 |
Scott Comer
|
2799a6443e
|
added asm_index method to controller and fix a few issues with asm_index and included a simple test
|
2014-06-13 23:51:54 -05:00 |
Scott Comer
|
b918d24d32
|
reverse query ams_index to produce list of augmented music_sessions
|
2014-06-13 19:47:34 -05:00 |
Scott Comer
|
beca3b5608
|
stub out active_music_sessions#ams_index
|
2014-06-13 12:38:36 -05:00 |
Brian Smith
|
bedb377be8
|
VRFS-1749 session info tests wip
|
2014-06-13 03:45:45 -04:00 |
Brian Smith
|
aa95dd783b
|
fix tests
|
2014-06-11 09:15:03 -04:00 |
Brian Smith
|
5fc9696d01
|
merge develop
|
2014-06-11 08:45:34 -04:00 |
Scott Comer
|
161f75a126
|
use current_scores instead of scores
|
2014-06-10 20:50:59 -05:00 |
Brian Smith
|
7c058fd3e0
|
fix notification test
|
2014-06-10 01:38:11 -04:00 |
Brian Smith
|
4c758f3185
|
VRFS-1749 finished RsvpSlot model tests
|
2014-06-10 01:08:28 -04:00 |
Brian Smith
|
0fe76dae13
|
VRFS-1749 finished RsvpRequest model tests
|
2014-06-10 00:35:38 -04:00 |
Bert Owen
|
11c7f87fa1
|
Merge branch 'feature/create_session_flow' into feature/scheduled_sessions
|
2014-06-10 06:16:01 +08:00 |
Bert Owen
|
3ed14be60f
|
finish basic create session flow
|
2014-06-10 06:13:54 +08:00 |
Seth Call
|
4a603cbaa2
|
* VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives
|
2014-06-09 15:43:16 -05:00 |