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 |
Anthony Davis
|
b919f55280
|
fixing failed bands tests
|
2014-05-13 07:40:04 -05: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 |
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 |
|
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
|
dc6dec76cf
|
* move registerChatMessage so that it always gets a chance to fire
|
2014-05-09 14:27:18 -05: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 |
|
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
|
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 |
|
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
|
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 |
|
Anthony Davis
|
26e4a2b72d
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-06 22:35:27 -05:00 |
|
Anthony Davis
|
673132c540
|
VRFS-1651 - periodic real test of www
|
2014-05-06 22:35:00 -05:00 |
|
Seth Call
|
d72cdfda14
|
* pending for now
|
2014-05-06 22:04:37 -05:00 |
|
Seth Call
|
332aee8667
|
* adding verification that the update settings dialog is dismissed
|
2014-05-06 21:48:02 -05:00 |
|
Jonathan Kolyer
|
ebe9aa1047
|
VRFS-1577 VRFS-736
|
2014-05-07 01:33:27 +00:00 |
|
Seth Call
|
7dd1e6c464
|
* renaming of tables in
|
2014-05-06 17:50:41 -05:00 |
|
Seth Call
|
732fd66f0e
|
* all tests pass; but need to now rename music session tables to match class names...
|
2014-05-06 16:17:26 -05:00 |