seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
3,463 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

424 Commits

Author SHA1 Message Date
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
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
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
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
Jonathan Kolyer a7c8d9311f VRFS-1483 fixing tests 2014-04-03 05:03:28 +00:00
Brian Smith 7e8b6eb238 VRFS-1465 add tests 2014-04-03 00:19:39 -04:00
Seth Call 90eb0bc081 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-02 00:43:10 +01:00
Seth Call 7bfe1cb634 * VRFS-1532 - launch in chrome, ff, or IE10/11. otherwise show instructions to go run it yourself 
* VRFS-1541 - alphabetically order recordings
* VRFS-1563 - password reset page should have no crashes anymore.
 2014-04-02 00:38:36 +01:00
Jonathan Kolyer accaa99e38 VRFS-1483 integrating opt-out; fixing tests 2014-04-01 14:42:26 +00:00
Seth Call da7fc7d901 * VRFS-1541 done from a code perspective... just need to do some admin work once posted 2014-03-31 03:28:04 +01:00
Seth Call 53a6941ceb * VRFS-1473 - Notification Highlighter - make obvious to user that they have new notifications complete 
* VRFS-1523 - USER: Make "enter" key send message in new user-to-user messaging feature
 2014-03-27 18:43:15 +00:00
Seth Call 526f6fe577 * VRFS-1473 - notifications should be highlighted, wip 2014-03-26 17:09:48 +00:00
Seth Call d6210c0b2f * VRFS-1474 - link in friend invite 2014-03-25 15:29:08 +00:00
Seth Call 5aaa389a4b * VRFS-1386 - check if invited_user.email is nil, and change existing test to have email 2014-03-21 22:37:15 +00:00
Seth Call b04c7bcea5 * VRFS-871 - user-to-user messaging complete 2014-03-20 11:53:26 +00:00
Jonathan Kolyer e29907f09b merging 2014-03-19 18:44:35 +00:00
Jonathan Kolyer eecdbebf3d VRFS-1483 integrating admin interface 2014-03-19 18:42:28 +00:00
Jonathan Kolyer 74a5f3863a VRFS-1483 various fixes from testing 2014-03-19 16:32:53 +00:00
Jonathan Kolyer d15c1dbdfd VRFS-1483 2014-03-19 07:15:38 +00:00
Jonathan Kolyer 4ba18a88ee VRFS-1483 integrating sendgrid_smtpapi 2014-03-19 06:20:58 +00:00
Jonathan Kolyer e8dd5f6ae5 VRFS-1483 state transitions and optimistic locking 2014-03-19 04:24:42 +00:00
Jonathan Kolyer c6c12e7b9e Merge branch 'develop' into vrfs1483 2014-03-19 00:23:32 +00:00
Jonathan Kolyer cdb271bf98 VRFS-1483 added async support 2014-03-18 22:50:06 +00:00