 Seth Call
|
244f79eefb
|
* merging develop into feature/scheduled_sessions
|
2014-05-07 15:04:41 -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 |
|
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 |
|
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 |
|
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
|
7d3ac6fc54
|
VRFS-1503 implement session chat feature
|
2014-05-03 00:33:27 +08:00 |
|
Bert Owen
|
bf04fca205
|
VRFS-1503 implement session chat feature
|
2014-05-03 00:30:56 +08:00 |
|
Seth Call
|
53850a716b
|
* fixing bad ref to user_id in client cleanup code
|
2014-05-02 07:33:41 -05:00 |
|
Seth Call
|
c0ce26c602
|
* fixing tests for: * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)
|
2014-05-01 14:09:33 -05:00 |
|
Jonathan Kolyer
|
affb1cd875
|
VRFS-1577
|
2014-05-01 06:35:16 +00:00 |
Scott Comer
|
fe59865bd9
|
change join_the_session api to add tracks; move the impl to connection; a few bug fixes
|
2014-04-30 22:01:43 -05:00 |
|
Jonathan Kolyer
|
5e27268fa4
|
VRFS-1577 VRFS-736 added should_rate_session?; fixed bug in add_rating
|
2014-05-01 01:46:57 +00:00 |
|
Seth Call
|
ad266e5b80
|
* VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)
|
2014-04-30 15:29:10 -05: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 |
|
Scott Comer
|
e82ae132bd
|
fix method for adding connection to music session
|
2014-04-28 22:38:30 -05: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
|
ed09892284
|
merging develop and vrfs1576
|
2014-04-23 07:50:50 +00:00 |
|
Jonathan Kolyer
|
22566f1b29
|
VRFS-1576 added block to referrals_by_date
|
2014-04-23 06:34:21 +00:00 |
|
Jonathan Kolyer
|
c66f5879cf
|
VRFS-1576 fixed referrals_by_date to support pagination
|
2014-04-23 02:43:13 +00:00 |
|
Jonathan Kolyer
|
b232344336
|
VRFS-1576 added referrals_by_date and associated test
|
2014-04-22 07:12:05 +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 |
|
Bert Owen
|
15064ad6c0
|
VRFS-1567 fix default sender, add new migration for email_batches table
|
2014-04-21 10:39:08 -07:00 |
|
Jonathan Kolyer
|
62dbeaa818
|
VRFS-1576 added validation and tests
|
2014-04-20 23:20:27 +00:00 |
|
Jonathan Kolyer
|
937efed3e5
|
VRFS-1576 affiliate_partner model
|
2014-04-20 22:54:49 +00:00 |
|
Bert Owen
|
fc1fa1412f
|
VRFS-1592 fixed
|
2014-04-20 20:16:37 +02:00 |
|
Jonathan Kolyer
|
bf1e315b48
|
Merge branch 'develop' into vrfs925
|
2014-04-14 10:59:58 +00:00 |
|
Seth Call
|
76e63193ca
|
* fixing some broken tests
|
2014-04-09 21:11:13 +00:00 |
|
Seth Call
|
cc7bbf3f6a
|
* resolved merge
|
2014-04-09 18:31:40 +01:00 |
|
Jonathan Kolyer
|
5a4bff14d2
|
VRFS-925 running tests for server side GA events
|
2014-04-08 17:15:49 +00:00 |
|
Seth Call
|
3dfc455fa4
|
* reconnect working for in-session; beginning in-situ reconnect refactor
|
2014-04-08 12:43:26 +01:00 |
|
Jonathan Kolyer
|
7203124e89
|
merging
|
2014-04-08 07:21:50 +00: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 |
|
Jonathan Kolyer
|
887795bead
|
VRFS-1483 final cleanup
|
2014-04-05 22:16:32 +00:00 |
|
Jonathan Kolyer
|
15090e3c70
|
VRFS-1483 error collector; cleanup
|
2014-04-05 21:25:47 +00:00 |
|
Jonathan Kolyer
|
e59d9cbe7a
|
VRFS-1483 email error handling
|
2014-04-05 18:52:12 +00:00 |
|
Jonathan Kolyer
|
d49c4624cd
|
VRFS-1483 added test Rails.env check
|
2014-04-04 10:23:20 +00:00 |
|
Jonathan Kolyer
|
e9f99dbe08
|
develop merge
|
2014-04-04 10:22:48 +00:00 |
|
Jonathan Kolyer
|
b4a3c73917
|
VRFS-1483 fixed batch email test so it should always work in test Rails.env
|
2014-04-04 10:18:09 +00:00 |