 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 |
|
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
|
c31c13b07e
|
* adding chat_messages constraint for user_id
|
2014-05-06 20:04:53 -05:00 |
|
Seth Call
|
9700fff691
|
* fixing some SQL in conn manager for querying active_music_sessions
|
2014-05-06 18:02:00 -05: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 |
|
Seth Call
|
23082beb2f
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-05-06 08:34:54 -05:00 |
|
Seth Call
|
f3d39a351d
|
* wip
|
2014-05-06 08:34:38 -05:00 |
|
Jonathan Kolyer
|
1c6b5b78bb
|
VRFS-1577 fixing specs
|
2014-05-06 07:20:14 +00:00 |
|
Jonathan Kolyer
|
5f74bce061
|
VRFS-1577
|
2014-05-06 06:41:10 +00:00 |
|
Jonathan Kolyer
|
294bb22cdd
|
Merge branch 'develop' into vrfs1577
|
2014-05-06 05:21:31 +00:00 |
|
Jonathan Kolyer
|
0119001d3d
|
VRFS-1698 testing
|
2014-05-06 05:21:09 +00:00 |
|
Jonathan Kolyer
|
a519191394
|
replaced find with find_by_id
|
2014-05-06 02:55:32 +00:00 |
|
Seth Call
|
eab5e5b72b
|
* merging in master with heartbeat fixes into develop after release
|
2014-05-05 10:50:47 -05:00 |
|
Seth Call
|
acd1efd877
|
* wip
|
2014-05-05 10:06:27 -05:00 |
|
Seth Call
|
15936855e9
|
* fixing yet another bug associated with websockets and reconnect
|
2014-05-03 08:50:06 -05:00 |
|
Seth Call
|
30b3098244
|
* don't null user on context; it should always be non-null
|
2014-05-02 19:07:10 -05:00 |
Scott Comer
|
6be0791adb
|
merge
|
2014-05-02 15:20:21 -05:00 |