Commit Graph

4345 Commits

Author SHA1 Message Date
Seth Call bb66a7ac9a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-30 08:42:20 -05:00
Seth Call 45ef4d05e3 VRFS-1989 - update to ftue video links 2014-07-30 08:41:47 -05:00
root 95b2c3675c fix #1632, fix #1954 2014-07-30 07:37:14 +02:00
root 915bb4ad13 Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop 2014-07-30 07:13:19 +02:00
Brian Smith da0f596fc1 VRFS-1965 hide button if button text is empty 2014-07-30 00:46:10 -04:00
Brian Smith 2c7e4ec581 remove fan/band chat option to match Create Session 2014-07-30 00:39:33 -04:00
Seth Call 9e574b33e8 * VRFS-1916 - two tables were used instead of one 2014-07-29 23:04:28 -05:00
Brian Smith ebd66846ce remove Jamtracks option from update session screen 2014-07-30 00:02:17 -04:00
Brian Smith fd49851815 VRFS-1979 fix test 2014-07-29 23:43:48 -04:00
Brian Smith 80d9d5ac28 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-29 23:29:52 -04:00
Seth Call f3cc256293 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-29 22:30:15 -05:00
Brian Smith e4a30c768a VRFS-1979 show landing page for email confirmation 2014-07-29 23:29:42 -04:00
Seth Call 210510a5a4 * VRFS-1964 - any 'web' layout page does not show websocket coneciton wo 2014-07-29 22:25:04 -05:00
Seth Call 209b6f2d7e * sort score histories by date desc 2014-07-29 22:13:38 -05:00
Brian Smith 93cef4e0cd Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-29 22:46:14 -04:00
Brian Smith 24eb53cc07 fix syntax error and tests 2014-07-29 22:46:07 -04:00
Seth Call dd318a9b8a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-29 21:43:44 -05:00
Seth Call 9013ff2e94 * VRFS-1987 fix stupid typo caused by refactor of MusicSession to ActiveMusicSession 2014-07-29 21:42:35 -05:00
Brian Smith d3b22afe16 schedule sessions that are at least 4 hours old 2014-07-29 22:40:42 -04:00
Brian Smith edf6cf554d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-29 22:08:53 -04:00
Brian Smith 0a075da783 VRFS-1983 session organizer cancelling RSVP should send notification to RSVP requester 2014-07-29 22:07:46 -04:00
Seth Call 525a2b298b Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-29 20:56:12 -05:00
Seth Call 9797bd8e92 * put pending in it block. sigh 2014-07-29 20:55:43 -05:00
Brian Smith 19f36b7d1b copy is_unstructured_rsvp flag on RsvpSlot 2014-07-29 21:52:08 -04:00
Brian Smith 12397069d3 handle correct event 2014-07-29 21:41:03 -04:00
Brian Smith 9815675bc2 reduce space between Still Needed and Invited sections in right sidebar 2014-07-29 21:35:22 -04:00
Brian Smith fa7672c0e6 fix issue where Session Info page was not being refreshed after submitting or cancelling RSVPs 2014-07-29 21:32:13 -04:00
Brian Smith 051e7f8bde VRFS-1972 show correct information under Still Needed section for sessions with unstructured RSVPs 2014-07-29 21:20:38 -04:00
Brian Smith 6aaddbbe50 VRFS-1478 allow multiple session invites to same user 2014-07-29 20:29:41 -04:00
Seth Call 4ecf7abb1e * VRFS-1978 - state is now autopopulated again 2014-07-29 18:49:36 -05:00
Seth Call 027456105b * VRFS-1968 - locids are now in score history 2014-07-29 18:11:00 -05:00
Seth Call 10fbf7584e * marking time sensitive test as pending 2014-07-29 17:55:34 -05:00
Seth Call c3461e82a7 * VRFS-1976 - fixed issue where UI always picks 1st scheduled session; VRFS-1962 - use 'full latency' instead of just internet latency in musician search, find session, and new musicians email 2014-07-29 17:52:20 -05:00
root 95dcea9ca7 fixed issue #1632 #1954 2014-07-29 18:15:23 +02:00
Seth Call 7e810809ac * fixing up end time format in csv export 2014-07-28 23:15:39 -05:00
Seth Call 4d94f85421 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-28 23:06:41 -05:00
Seth Call 1e6524e534 * VRFS-1956 - fixes for musicians page 2014-07-28 23:04:56 -05:00
Anthony Davis 3136165076 VRFS-1933 - fixing Jenkins failures 2014-07-28 22:04:42 -05:00
Seth Call e9a4f33420 * VRFS-1957 - use median instead of just most recent for current_scores 2014-07-28 17:37:47 -05:00
Seth Call ef87d635e2 * fixing some admin pathing/url issues 2014-07-28 10:05:16 -05:00
Seth Call 50c611d729 * removing debugger gem from admin gemfile for now 2014-07-28 09:49:56 -05:00
Jonathan Kolyer a1cb5baf52 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-27 23:39:36 +00:00
Anthony Davis c28e932c2d VRFS-1933 - integration tests for all ways of creating a session - might fail on Jenkins 2014-07-28 21:14:21 -05:00
Jonathan Kolyer 45a48daae0 VRFS-1939 VRFS-1936 fixed session and scheduled musician invite dialog 2014-07-27 23:39:11 +00:00
Seth Call 2f76a82bd3 * fix changes to resque-scheduler includes 2014-07-27 12:46:20 -05:00
Seth Call 750bceec2e * turn on more debugging for build server 2014-07-27 12:23:15 -05:00
Seth Call c65b05993b * adding migrate script to admin 2014-07-27 12:22:35 -05:00
Seth Call 2716211b18 * VRFS-1496 fixing up help text and header text 2014-07-27 11:49:26 -05:00
Seth Call 4f7c1ef22e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-27 11:46:38 -05:00
Seth Call dbf7547625 Merge branch 'feature/score_export' into develop 2014-07-27 11:46:14 -05:00