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

899 Commits

Author SHA1 Message Date
Seth Call 9c4ab6418c * wip 2014-08-19 14:23:41 -05:00
Seth Call 8f49a9ab66 Merge branch 'develop' into feature/latency_hover 2014-08-19 12:49:54 -05:00
Seth Call 27f4adf772 * VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs 2014-08-18 20:41:44 -05:00
Seth Call 0c3a43a177 * wip 2014-08-18 10:37:55 -05:00
Brian Smith 25e3f23dcf VRFS-1891 VRFS-2022 bug fixes / test additions 2014-08-15 00:32:45 -04:00
Brian Smith af1a4596e0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-08-14 23:57:51 -04:00
Seth Call d34929d70b * landing pages in VRFS-2037 2014-08-14 22:23:22 -05:00
Seth Call b9a5c75ec5 * VRFS-2055 - escape keyword in hand-crafted SQL query\! 2014-08-14 21:28:30 -05:00
Brian Smith 5691e6092f VRFS-2022 show private sessions/recordings in the feed 2014-08-14 01:45:37 -04:00
Seth Call 4c85740597 * wip 2014-08-13 11:09:52 -05:00
Brian Smith e8847280bc VRFS-1995 do not send notifications to users with canceled RSVPs 2014-08-12 02:20:25 -04:00
Brian Smith dece2afc1b VRFS-1478 fix bugs 2014-08-12 00:24:57 -04:00
Brian Smith cc26969f8a VRFS-1891 cancel RSVP flow fix 2014-08-09 23:22:17 -04:00
Brian Smith fd9893ca42 Merge branch 'develop' into hotfix/cancel_rsvp_flow 2014-08-09 18:35:23 -04:00
Brian Smith f97a416867 VRFS-1891 VRFS-2011 cancel RSVP flow / show proficiency in RSVP dialog 2014-08-08 02:22:32 -04:00
Jonathan Kolyer 9249e99581 added method min_create_date 2014-08-05 12:09:12 +00:00
Seth Call e871cc5390 fix latency presention - divide by 2 then round 2014-08-03 21:38:53 -05:00
Seth Call aa863240b9 * VRFS-1992 finished (daily session email improvements) 2014-08-01 16:17:04 -05:00
Seth Call 8048c5012d * wip 2014-07-31 21:06:06 -05:00
Seth Call 00dee99e17 * wip 2014-07-31 20:16:38 -05:00
Seth Call 9544e3d075 * rename new column because it's not working for reasons I can't understand on the build server 2014-07-30 21:05:59 -05:00
Seth Call a11ae44a90 * VRFS-1951 - make sure staging emails don't get sent from my machie 2014-07-30 16:39:59 -05:00
Seth Call 8966a3fc2f * VRFS-1992 - check open_rsvps for daily session email, VRFS-1991 - remove hardcoded 10 in audio latency on create/join, VRFS-1990 - only send update rsvp notification if scheduled start time changes 2014-07-30 15:11:03 -05: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 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 0a075da783 VRFS-1983 session organizer cancelling RSVP should send notification to RSVP requester 2014-07-29 22:07:46 -04:00
Brian Smith 19f36b7d1b copy is_unstructured_rsvp flag on RsvpSlot 2014-07-29 21:52:08 -04:00
Seth Call 027456105b * VRFS-1968 - locids are now in score history 2014-07-29 18:11:00 -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 1e6524e534 * VRFS-1956 - fixes for musicians page 2014-07-28 23:04:56 -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 4f7c1ef22e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-27 11:46:38 -05:00
Seth Call 2dd6153ed8 * wip on score export 2014-07-26 14:18:17 -05:00
Jonathan Kolyer e87ae50dfe VRFS-1942 tuning admin view 2014-07-26 04:10:40 +00:00
Jonathan Kolyer d28a65c5ff Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-26 03:59:11 +00:00
Jonathan Kolyer ff73c170bd VRFS-1942 refactoring scheduled session emails; new admin view into batch email data queries 2014-07-26 03:58:58 +00:00
Seth Call adb0b15555 * fixing bad schedules on scheduler.yml, and wip on admin web reporting 2014-07-25 15:01:14 -05:00
Seth Call 6a037d9987 * VRFS-1944 - user info added to scores and score_histories 2014-07-24 18:39:26 -05:00
Seth Call cc6f3fe974 * VRFS-1934/VRFS-1936 - fix scrolling in sessions, VRFS-1938 - no dups in find session page 2014-07-23 15:11:02 -05:00
Seth Call 333e321877 * updating the last_jam info on user in 5 needed locations (login, registration, ftue, import, etc) 2014-07-22 14:36:45 -05:00
Seth Call 57728fbfe8 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-21 16:42:36 -05:00
Seth Call 6c4bcd98be * VRFS-1924 - score_history added 2014-07-21 16:42:30 -05:00
Jonathan Kolyer ecf4b6f397 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-21 05:14:11 +00:00
Jonathan Kolyer b4ab41637c VRFS-1629 added UserAuthorization.goog_auth method to exclude auths past expiration 2014-07-21 05:14:05 +00:00
Jonathan Kolyer 25cff163dc VRFS-1874 added query constraint to filter out users with last_jam_locidispid = NULL 2014-07-21 05:12:07 +00:00
Brian Smith 4aa359fc13 VRFS-1921 legal policy links are now specific to environment, fixed bug with legal policy link on Session Info page 2014-07-21 01:05:07 -04:00
Seth Call 513a46067a * merged 2014-07-19 21:12:11 -05:00
Seth Call 5f131f9407 * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
Bert Owen 5027000c49 VRFS-1927 Session organizer needs to be prohibited from canceling their RSVP 2014-07-16 20:19:43 +02:00
Bert Owen 590e6d8028 VRFS-1926 fixed, fix scheduled session query 2014-07-16 18:21:21 +02:00
Seth Call ae8c3120aa * wip 2014-07-14 17:22:49 -05:00
Seth Call 8441acacef * VRFS-1922 - marking unscheduled sessions as started if activemusicsession is created, and added a migration to fix up old sessions 2014-07-14 16:43:46 -05:00
Seth Call c2a5936720 * wip 2014-07-14 15:53:04 -05:00
Bert Owen 26f7d2755b VRFS-1918 Session Details Update Screen - once over with tests 2014-07-14 20:40:00 +02:00
Brian Smith 6b00538436 miscellaneous formatting fixes 2014-07-13 13:36:56 -04:00
Seth Call 4b4a6606bf VRFS-1882 - you can create (actually, join) a session multiple times... 2014-07-12 22:20:15 -05:00
Brian Smith a7621b0326 VRFS-1911 fixed date formatting in app / email notifications, added session name and start time to popup notification 2014-07-12 18:24:12 -04:00
Seth Call 14dad29c59 * VRFS-1861 - show something useful in the session section of the account screen 2014-07-12 08:55:58 -05:00
Seth Call ba4fa985bf * VRFS-1877; list 4 hours old and newer sessions - also noticed that create session listed sessions were filtering TBD scheduled sessions; brought those back in 2014-07-11 22:44:49 -05:00
Seth Call d47218961e * working on formatting still 2014-07-11 21:11:34 -05:00
Seth Call 471a0d13a0 * VRFS-1917 - timezone set correctly 2014-07-11 20:54:54 -05:00
Seth Call 2923969e94 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-11 17:22:01 -05:00
Seth Call 014a423a3d * VRFS-1860 - account screen lists by date; VRFS-1911 partially done (using proper date formatting) 2014-07-11 17:21:55 -05:00
Brian Smith 3bc94249ca VRFS-1497 VRFS-1749 added resque job to clean stale sessions, added tests for session scheduler and session cleaner jobs 2014-07-11 02:23:10 -04:00
Seth Call 55aea1109f * VRFS-1869 - use offset 2014-07-10 22:08:03 -05:00
Seth Call 74b2f19460 * VRFS-1897 - fix the creator getting approval notice 2014-07-10 16:37:48 -05:00
Seth Call afa2fa58cf * VRFS-1887 - make the RSVP text helpful as to the state of the session relative to the viewing user 2014-07-10 15:57:48 -05:00
Seth Call f693470c63 * VRFS-1910 - approved_rsvps to handle null instruments on slots, as well as remove attr_accessors as holders on user model 2014-07-10 15:22:00 -05:00
Seth Call 3a5d146ef3 * change can_delete to can_cancel, and don't cehck for start_at anymore 2014-07-10 11:38:17 -05:00
Seth Call f2975c8838 * VRFS-1908 - add more canceled checks 2014-07-10 11:27:26 -05:00
Brian Smith 0041562933 VRFS-1419 VRFS-1906 do not delete music session when canceling because it leaves dangling notifications / added paging support for Find Session screen 2014-07-10 00:39:38 -04:00
Seth Call 71737f3f5e * VRFS-1879 - handle case of no instruments selected for others; VRFS-1894 - canceled RSVPs that have not been dealt with are not shown 2014-07-08 16:52:25 -05:00
Seth Call 0020a8eb0d * VRFS-1889 completed; VRFS-1879 - partially done 2014-07-08 13:34:03 -05:00
Seth Call 27fe4f4ae9 * VRFS-1880 - fixed issue and added test 2014-07-07 16:08:36 -05:00
Brian Smith 4872c037ad added field to approved_rsvps method per request from Bert 2014-07-05 21:51:45 -04:00
Seth Call 3f53cb9819 * removing jquery draggable from web and landing 2014-07-03 17:53:16 -05:00
Brian Smith 4e1a68f344 VRFS-1855 fixed Create / Find Session issues related to open RSVPs 2014-07-03 00:51:54 -04:00
Bert Owen 421d183ba3 Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop 2014-07-02 15:57:55 +02:00
Bert Owen 2ced001f77 add account scheduled session properties page, add spec, fix detail page, create session flow 2014-07-02 15:57:18 +02:00
Seth Call 7dcf205a6b * VRFS-1821 - clarify error message on music notation fail 2014-07-01 13:58:58 -05:00
Seth Call 607c0a145d * get rid of print 2014-07-01 13:26:27 -05:00
Seth Call ba57c00dec * VRFS-1429 - instruments stay selected, and tos stays selected 2014-07-01 13:19:33 -05:00
Brian Smith b0011137b9 VRFS-1827 add Fan Page URL to session info page 2014-07-01 00:44:10 -04:00
Brian Smith 0ece384569 VRFS-1828 VRFS-1829 add date/time info to Find Session screen, fix RSVP dialog issues 2014-07-01 00:36:06 -04:00
Seth Call 2cdc1b87e3 VRFS-1817 remove jamtracks option 2014-06-30 16:24:56 -05:00
Seth Call 7a10e67c76 * take out restriction for max 12 hours in the future for scheduled sessions 2014-06-30 16:14:01 -05:00
Seth Call 63dfb8929c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-30 15:44:38 -05:00
Seth Call cbe4bf1747 * VRFS-1757 - updated signin dialog to 'modern' standards; VRFS-1826 - 2/3 fixed 2014-06-30 15:44:28 -05:00
Bert Owen 156095f3c8 Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop 2014-06-29 15:55:18 +02:00
Bert Owen 07d96d7a57 VRFS-1667, VRFS-1729 implemented account session page, session detail page 2014-06-29 15:54:51 +02:00
Brian Smith 287faa765c VRFS-1812 added latency indicators to the session info page 2014-06-28 13:06:32 -04:00
Seth Call b130818011 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-27 14:18:09 -05:00
Seth Call 865b488f93 * VRFS-304 - user history (feed) tab 2014-06-27 14:17:56 -05:00
Brian Smith eb30ee3391 VRFS-1672 music notation file upload work 2014-06-26 23:07:48 -04:00
Seth Call f9ce995a8f * tweak date offset logic 2014-06-25 21:50:20 -05:00
Seth Call c7a0208804 * create session/find session 'what app' guard movement; * VRFS-1753 - network guard in place (and FTUE guard withit) 2014-06-25 16:54:31 -05:00
Seth Call fe7c58bafc * adding code to handled positive timezone 2014-06-25 10:21:36 -05:00
Jonathan Kolyer 31ec7ae6b1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-25 14:49:44 +00:00
Jonathan Kolyer 05b3d855d7 VRFS-1458 cleaned up labels and selection issues with country/region/city selects 2014-06-25 14:49:33 +00:00
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 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 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 75b22ced5b added ability to retrieve RSVP requests by approval status 2014-06-16 01:46:52 -04: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 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
Jonathan Kolyer c0287cc224 VRFS-1664 enhancing tests 2014-06-09 05:12:29 +00:00
Bert Owen f333f110b8 fix type error 2014-06-09 10:43:07 +08:00