Scott Comer
|
c0d08ebe27
|
scores integrated into display where i could, not exactly where david wanted. this finishes vrfs-1455
|
2014-05-31 18:07:25 -05:00 |
|
Scott Comer
|
275c997591
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-05-30 14:12:35 -05:00 |
|
Scott Comer
|
14d5ddb23f
|
fix the correct musician search query for scoring
|
2014-05-30 14:12:27 -05:00 |
 Seth Call
|
5752f2d7dd
|
* fixing tests
|
2014-05-29 15:34:19 -05:00 |
|
Seth Call
|
7da75e94d9
|
* VRFS-1575
|
2014-05-29 14:44:37 -05:00 |
|
Seth Call
|
dff3fa4870
|
*wip
|
2014-05-29 14:44:37 -05:00 |
|
Seth Call
|
fcc7130536
|
* wip
|
2014-05-29 14:44:37 -05:00 |
|
Seth Call
|
e4da30f39e
|
* wip
|
2014-05-29 14:39:08 -05:00 |
|
Seth Call
|
05666f7927
|
wip
|
2014-05-29 14:34:18 -05:00 |
|
Scott Comer
|
ebfe72e11d
|
fix tests for scoring musician search
|
2014-05-28 21:19:50 -05:00 |
|
Scott Comer
|
94421c03c0
|
merge conflict with db/manifest resolved
|
2014-05-21 21:33:38 -05:00 |
|
Scott Comer
|
09231c5fe6
|
fix for vrfs-1476 - scoring should store the detail data
|
2014-05-21 21:30:43 -05:00 |
Jonathan Kolyer
|
836baee962
|
merging with develop
|
2014-05-21 21:55:26 +00:00 |
|
Scott Comer
|
4a76e0c983
|
get_work has a larger radius and excludes the current connections address
|
2014-05-21 14:05:45 -05:00 |
|
Scott Comer
|
867ec7c53f
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-05-20 10:07:05 -05:00 |
|
Scott Comer
|
3e0667e24d
|
added Scores.score_conns to help with making scores for tests; comments for usage of musician_filter; optional score_dt for Score.createx; betterify query for connection in scoring api
|
2014-05-20 09:46:45 -05:00 |
|
Seth Call
|
1f86b809ff
|
* VRFS-1730 - websocket on web layout
|
2014-05-19 16:57:08 -05:00 |
|
Jonathan Kolyer
|
e44ccc7653
|
VRFS-736 client_notdl mailer
|
2014-05-19 15:12:59 +00:00 |
|
Jonathan Kolyer
|
6ccbddfe72
|
VRFS-736 changd GA data val for email
|
2014-05-11 07:42:14 +00:00 |
|
Jonathan Kolyer
|
91ca1af98b
|
VRFS-736 like us GA support
|
2014-05-11 06:42:20 +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 |
|
Seth Call
|
244f79eefb
|
* merging develop into feature/scheduled_sessions
|
2014-05-07 15:04:41 -05:00 |
|
Seth Call
|
5f1ea4c754
|
* merging manifest
|
2014-05-07 05:17:17 -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 |
|
Seth Call
|
f3d39a351d
|
* wip
|
2014-05-06 08:34:38 -05: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 |
Bert Owen
|
bf04fca205
|
VRFS-1503 implement session chat feature
|
2014-05-03 00:30:56 +08:00 |
|
Jonathan Kolyer
|
affb1cd875
|
VRFS-1577
|
2014-05-01 06:35:16 +00:00 |
|
Jonathan Kolyer
|
b1be072c6c
|
VRFS-1577 VRFS-736
|
2014-05-01 01:48:57 +00:00 |
|
Jonathan Kolyer
|
2cbfae2215
|
VRFS-1577 VRFS-736
|
2014-04-30 20:49:32 +00:00 |
|
Jonathan Kolyer
|
968dff2829
|
VRFS-1577 VRFS-736
|
2014-04-30 16:44:37 +00:00 |
|
Jonathan Kolyer
|
2ee96c49ec
|
merging develop
|
2014-04-30 14:21:23 +00:00 |
|
Jonathan Kolyer
|
dddc0311c0
|
VRFS-1577 VRFS-736 session ratings
|
2014-04-30 14:07:23 +00:00 |
|
Seth Call
|
9820562892
|
* more websocket/heartbeat fixes
|
2014-04-30 03:01:28 +00:00 |
|
Seth Call
|
00a6139cd1
|
* merged
|
2014-04-29 14:04:26 +00:00 |
|
Bert Owen
|
3921324b32
|
VRFS-1503 added protocol buffer, chat message model & controller, rest api
|
2014-04-23 14:34:59 +02:00 |
|
Bert Owen
|
07e141cc8f
|
VRFS-1503 added protocol buffer, chat message model & controller, rest api
|
2014-04-23 14:27:49 +02:00 |
|
Jonathan Kolyer
|
7b2d124b33
|
VRFS-1576 affiliate report view integration
|
2014-04-23 06:38:49 +00:00 |
|
Jonathan Kolyer
|
af63b03d6a
|
VRFS-1576 case insensitive codes
|
2014-04-22 02:14:22 +00:00 |
|
Jonathan Kolyer
|
6ee83f8dcc
|
VRFS-1576 error handling; referral page; new admin menu
|
2014-04-22 01:55:40 +00:00 |
|
Jonathan Kolyer
|
937efed3e5
|
VRFS-1576 affiliate_partner model
|
2014-04-20 22:54:49 +00:00 |
|
Seth Call
|
83038cf315
|
* tweak hover code
|
2014-04-11 14:45:54 +00:00 |
|
Seth Call
|
5e62890003
|
* more debugs in failing build server tests
|
2014-04-11 02:58:31 +00:00 |
|
Seth Call
|
cc7bbf3f6a
|
* resolved merge
|
2014-04-09 18:31:40 +01:00 |
|
Seth Call
|
79c243a20b
|
* automatic reconnect dialog will guide user without having to click - VRFS-1404
|
2014-04-07 17:36:08 +01:00 |
|
Jonathan Kolyer
|
880027a87f
|
VRFS-736 added liked us tracking to email footer icons for twitter/fb/goog
|
2014-04-07 07:54:17 +00:00 |