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

3564 Commits

Author SHA1 Message Date
Bert Owen a1f288fe4d VRFS-1676 fixed 2014-05-22 03:11:50 +08:00
Bert Owen 1904c8f474 VRFS-1675 completed 2014-05-22 00:24:40 +08:00
Bert Owen 22f4d0ffc5 Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-20 21:26:55 +08:00
Bert Owen cebbd869cb VRFS-1675 add join session feature 2014-05-20 21:26:32 +08:00
Bert Owen b4908ce924 * fix music session api test 2014-05-20 21:23:34 +08:00
Brian Smith d665a09080 scheduled session rsvp wip 2014-05-20 00:31:26 -04:00
Brian Smith ca53ee0ead update data model / fix tests 2014-05-19 23:34:56 -04:00
Bert Owen a379689418 * remove client_id check 2014-05-19 23:52:06 +08:00
Bert Owen 97843035ba Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-19 23:36:23 +08:00
Bert Owen cdc9d121cb VRFS-1674 Create Session API 2014-05-19 23:35:38 +08:00
Brian Smith dce007a13d VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres 2014-05-18 22:31:25 -04:00
Brian Smith 95100a1b49 VRFS-1668 added some edge case tests for new notifications (still need sunny day tests) 2014-05-18 14:59:57 -04:00
Brian Smith 0b2acda11e VRFS-1668 email notifications for scheduled sessions 2014-05-18 01:22:20 -04:00
Brian Smith 8fc30baf42 VRFS-1668 more notification work 2014-05-18 00:09:21 -04:00
Bert Owen 091998c200 * fix music_session test 2014-05-16 01:22:21 +08:00
Bert Owen 027fd61606 * added recurring_mode to music_session for recurring sessions 2014-05-16 00:19:44 +08:00
Bert Owen 24117c1b67 VRFS-1718 added MusicNotation model, migration 2014-05-15 23:49:06 +08:00
Brian Smith baee1b7506 VRFS-1668 merge with test fixes for notification changes 2014-05-15 01:06:48 -04:00
Seth Call a19d6dcc07 * adding RsvpRequest and RsvpSlot models 2014-05-14 15:48:42 -05:00
Brian Smith 27517c673f VRFS-1668 more test fixes 2014-05-14 01:51:18 -04:00
Brian Smith 212ef168c9 VRFS-1668 fixing tests related to notification changes 2014-05-14 01:16:33 -04:00
Seth Call 9ee27a5127 Revert "VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic" 
This reverts commit 2302c89154.
 2014-05-13 08:21:32 -05:00
Brian Smith 2302c89154 VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic 2014-05-13 01:22:23 -04:00
Seth Call 9948917f95 * fix promotional data 2014-05-08 08:25:30 -05:00
Seth Call d4a0d8d820 * force jenkins build 2014-05-08 08:11:39 -05:00
Seth Call f6b31a675f Merge branch 'develop' into feature/scheduled_sessions 2014-05-08 08:04:45 -05:00
Seth Call 4e9c2377ba * fix broken pages in admin 2014-05-08 08:04:06 -05:00
Seth Call f158863347 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 18:50:12 -05:00
Seth Call 42de732065 * whitespace change to readme to force develop branch build in jenkins 2014-05-07 18:48:45 -05:00
Anthony Davis f496ba6349 VRFS-1651 - fixed 2014-05-07 18:29:30 -05:00
Anthony Davis 802fcf658d VRFS-1651 - debug 2014-05-07 18:21:48 -05:00
Anthony Davis 268403d5d9 VRFS-1651 - debug 2014-05-07 18:19:47 -05:00
Seth Call 1cb9699096 * VRFS-1688 - beefed up history_show.rabl 2014-05-07 16:38:28 -05:00
Seth Call 88e13aa3fc * attempt to run problem test now that fix to nindex has been made 2014-05-07 15:14:42 -05:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -05:00
Seth Call 57e8860dcb Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 14:22:56 -05:00
Seth Call 6817d2f458 * fixing another bug in the SQL of MusicSession.index and MusicSession.index (bad inner join with music_session and active_music_session) 2014-05-07 14:16:35 -05:00
Seth Call 23aec0d1a5 * uncommenting the index tests; fixed a bug too 2014-05-07 10:53:39 -05:00
Anthony Davis 4d4d04b343 VRFS-1651 - test-www should not use build_number 2014-05-07 08:30:41 -05:00
Seth Call 97269133ba Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 08:03:43 -05:00
Anthony Davis 1fa9ffcc3f VRFS-1651 - really no jam_* gems in test-www 2014-05-07 07:40:22 -05:00
Anthony Davis fb1d634875 VRFS-1651 - jam_ gem version does not matter for test_www 2014-05-07 07:33:33 -05:00
Anthony Davis 6528c5f838 VRFS-1651 - our gems aren't even needed for this 2014-05-07 07:25:48 -05:00
Seth Call 5f1ea4c754 * merging manifest 2014-05-07 05:17:17 -05:00
Brian Smith c549128c90 VRFS-1562 make musician/band avatar and name clickable in hover bubbles 2014-05-07 00:26:38 -04:00
Brian Smith 9a5bd6887e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 00:17:01 -04:00
Brian Smith 58b7f27387 VRFS-1562 make musician/band avatar and name clickable in hover bubbles 2014-05-07 00:16:20 -04:00
Anthony Davis a13e99cb19 VRFS-1651 - revert 2014-05-06 23:07:45 -05:00
Anthony Davis 9442256b97 VRFS-1651 - reverting Gemfile, adding check for test-www project 2014-05-06 23:05:29 -05:00
Anthony Davis 74d7d0b587 VRFS-1651 - decoupling jam_ gems from ENV 2014-05-06 22:57:32 -05:00