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 |
Scott Comer
|
a11dd664ce
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-30 22:01:57 -05: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 |
 Seth Call
|
6463512420
|
* a fix for race condition that can hang eventmachine startup
|
2014-04-30 03:03:37 +00:00 |
|
Scott Comer
|
e82ae132bd
|
fix method for adding connection to music session
|
2014-04-28 22:38:30 -05:00 |
|
Seth Call
|
26dc80436c
|
* merging build script
|
2014-04-24 18:07:52 +00:00 |
|
Seth Call
|
26a9f9a162
|
* commenting 'Measurement Protocol' into related classes
|
2014-04-24 02:27:31 +00:00 |
|
Seth Call
|
29dfba8276
|
* fix startup of eventmachine when in unicorn/production mode (fixes or could fix: VRFS-1636 VRFS-1637 VRFS-1642 VRFS-1643
|
2014-04-23 15:08:19 +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
|
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 |
|
Seth Call
|
5695338266
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-22 17:53:49 +00:00 |
|
Seth Call
|
30ca8d7c5c
|
* wip still on new ftue. also push release branches to repository VRFS-1639
|
2014-04-22 17:53:41 +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 |
|
Bert Owen
|
4cfc1b878a
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-21 17:18:11 +02:00 |
|
Jonathan Kolyer
|
62dbeaa818
|
VRFS-1576 added validation and tests
|
2014-04-20 23:20:27 +00:00 |
|
Jonathan Kolyer
|
245727806d
|
VRFS-1576 affiliate_partner model
|
2014-04-20 22:55:40 +00:00 |
|
Jonathan Kolyer
|
937efed3e5
|
VRFS-1576 affiliate_partner model
|
2014-04-20 22:54:49 +00:00 |
Anthony Davis
|
f85f303da8
|
VRFS-1331 - JamKazam instead of Jamkazam
|
2014-04-20 16:43:58 -05:00 |
|
Bert Owen
|
fc1fa1412f
|
VRFS-1592 fixed
|
2014-04-20 20:16:37 +02:00 |
|
Seth Call
|
ac1b5d2e42
|
* fix for timecop
|
2014-04-15 17:02:51 +00:00 |
|
Seth Call
|
1d6741714d
|
* resque_spec path removed
|
2014-04-15 15:17:44 +00:00 |
|
Jonathan Kolyer
|
bf1e315b48
|
Merge branch 'develop' into vrfs925
|
2014-04-14 10:59:58 +00:00 |
|
Jonathan Kolyer
|
9ddbc6ba5c
|
VRFS-925 finishing up tests
|
2014-04-14 10:57:21 +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 |
|
Seth Call
|
95f1a59851
|
* VRFS-1404 reconnect with tests
|
2014-04-09 18:25:52 +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
|
e5d280e374
|
VRFS-1483 final cleanup
|
2014-04-05 22:13:28 +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 |
|
Seth Call
|
700ef04edf
|
* VRFS-1531, and a fix for feed test having 'dirt' in it from other tests. also reverting batch mailer test
|
2014-04-04 23:16:38 +01:00 |
|
Seth Call
|
d1622cfd95
|
* fix batch_mailer tests
|
2014-04-04 20:02:44 +01:00 |
|
Seth Call
|
26d7b067f1
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-04 19:38:42 +01:00 |
|
Jonathan Kolyer
|
e750ac9e68
|
VRFS-1483 error handling
|
2014-04-04 10:08:00 +00:00 |
Brian Smith
|
981a7eb4e2
|
Merge branch 'hotfix/feed_icon_fix' into develop
|
2014-04-03 23:46:53 -04:00 |
|
Seth Call
|
18484c484b
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-04-03 15:11:31 +01:00 |