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 |
Scott Comer
|
e0df9c7721
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-05-13 14:57:07 -05:00 |
|
Scott Comer
|
00e177311d
|
tests for last jam location setting and some cleanup of user manager and user location spec
|
2014-05-13 14:56:58 -05:00 |
|
Seth Call
|
ac2ee3210f
|
* VRFS-1654 - fixing tests
|
2014-05-13 14:48:58 -05:00 |
|
Scott Comer
|
43d1c9cbbd
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-05-13 09:12:43 -07: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 |
Anthony Davis
|
b919f55280
|
fixing failed bands tests
|
2014-05-13 07:40:04 -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 |
|
Anthony Davis
|
fc35f0ad9d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-12 23:17:18 -05:00 |
|
Anthony Davis
|
f88808aa10
|
adding/fixing bands tests
|
2014-05-12 23:16:32 -05:00 |
|
Scott Comer
|
9deb7fcc74
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-05-12 21:13:33 -07:00 |
|
Scott Comer
|
79136d2127
|
correct weirdness in how user location is set
|
2014-05-12 21:13:16 -07:00 |
Jonathan Kolyer
|
5327be79eb
|
VRFS-1664 changed batch to 500
|
2014-05-11 09:43:40 +00:00 |
|
Jonathan Kolyer
|
e199ee861f
|
Merge branch 'vrfs736' into develop
|
2014-05-11 09:03:48 +00:00 |
|
Jonathan Kolyer
|
6ccbddfe72
|
VRFS-736 changd GA data val for email
|
2014-05-11 07:42:14 +00:00 |
|
Jonathan Kolyer
|
738b848d28
|
VRFS-736 positioning share links on right
|
2014-05-11 07:18:02 +00:00 |
|
Jonathan Kolyer
|
91ca1af98b
|
VRFS-736 like us GA support
|
2014-05-11 06:42:20 +00:00 |
|
Jonathan Kolyer
|
833d9c9c38
|
VRFS-736 fixed broken div
|
2014-05-11 01:49:17 +00:00 |
|
Jonathan Kolyer
|
9090a71b41
|
VRFS-736 moving sharing links elsewhere
|
2014-05-11 01:45:30 +00:00 |
|
Jonathan Kolyer
|
cf7522f2e4
|
VRFS-736 images using relative path
|
2014-05-11 00:22:12 +00:00 |
|
Jonathan Kolyer
|
9f9763b653
|
Merge branch 'develop' into vrfs736
|
2014-05-11 00:18:14 +00:00 |
|
Anthony Davis
|
9929e1eca1
|
VRFS-1708 / VRFS-1654 - marking these tests as pending
|
2014-05-11 15:59:37 -05:00 |
|
Jonathan Kolyer
|
1618a37d6b
|
Merge branch 'develop' into vrfs736
|
2014-05-11 00:17:48 +00:00 |
|
Jonathan Kolyer
|
f83f333dd1
|
VRFS-736 like us features
|
2014-05-11 00:17:44 +00:00 |
|
Anthony Davis
|
bf18a936c8
|
VRFS-1708 - fix failing feed tests, remove interdependency
|
2014-05-10 14:16:17 -05:00 |
|
Anthony Davis
|
5d5dc51434
|
Slight fix to chat text in sidebar
|
2014-05-10 14:08:39 -05:00 |
|
Jonathan Kolyer
|
589b0dad34
|
VRFS-1706 fixed sporadic display of session rating
|
2014-05-10 05:59:19 +00:00 |
|
Seth Call
|
e3b17fb439
|
* .touch on the history entries
|
2014-05-09 14:36:03 -05:00 |
|
Seth Call
|
dc6dec76cf
|
* move registerChatMessage so that it always gets a chance to fire
|
2014-05-09 14:27:18 -05:00 |
|
Bert Owen
|
2c58ded35f
|
VRFS-1700 fixed
|
2014-05-10 00:37:51 +08:00 |
|
Bert Owen
|
af893f4b24
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-05-09 23:51:27 +08:00 |
|
Bert Owen
|
6ecb7abcad
|
VRFS-1654 issue fixed without test
|
2014-05-09 23:50:50 +08:00 |
|
Scott Comer
|
ca27a6ab97
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
Conflicts:
db/manifest
|
2014-05-08 19:47:17 -05:00 |
|
Scott Comer
|
3f688a8392
|
update user home base (last_jam_blah) fields upon registation and joining a music session as a musician
|
2014-05-08 19:44:52 -05:00 |
|
Anthony Davis
|
9dbb42f3de
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-08 18:01:17 -05:00 |
|
Anthony Davis
|
ac8a9a5af6
|
VRFS-1705 - fix test-www by a slight decouple
|
2014-05-08 18:00:49 -05:00 |
developer
|
8f06168f1c
|
VRFS-1654 - configure feed layout
|
2014-05-08 23:18:57 +08: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 |