 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 |
|
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 |
|
Jonathan Kolyer
|
40a2049bdf
|
VRFS-1483 added from_email column to email_batches
|
2014-03-18 20:31:23 +00:00 |
|
Jonathan Kolyer
|
98a4553f72
|
VRFS-1483 specs for test users
|
2014-03-18 18:33:48 +00:00 |
|
Jonathan Kolyer
|
3204de01e6
|
VRFS-1483 merge
|
2014-03-18 15:13:03 +00:00 |
|
Jonathan Kolyer
|
e6d0851391
|
VRFS-1483 adding first set of updates for batch emails
|
2014-03-18 15:07:45 +00:00 |
|
Seth Call
|
b783d270b1
|
* VRFS-1457 - resolved two issues; invited users will be able to invite, and the error path will show errors
|
2014-03-15 16:47:21 +00:00 |
|
Seth Call
|
993afe1174
|
if either fan access or musician access is public, expose rabl VRFS-1427
|
2014-03-14 14:44:11 +00:00 |
|
Scott Comer
|
60aa59e11f
|
faster signup
|
2014-03-11 17:35:00 -05:00 |
|
Scott Comer
|
3c3f191239
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-11 13:20:33 -05:00 |
|
Scott Comer
|
2dd8ad0be8
|
data models for countries, regions, and cities tables.
|
2014-03-11 13:20:00 -05:00 |
|
Seth Call
|
1d1578fde8
|
* adding social description ability for sharing facebook
|
2014-03-11 18:14:05 +00:00 |
|
Seth Call
|
24f8bb257c
|
* VRFS-1168 - done except the distance filter, but that's assigned elsewhere anyway
|
2014-03-11 07:40:58 +00:00 |
|
Seth Call
|
c9438fcf99
|
* feed shows items. no scrolling, no support for query modification yet
|
2014-03-11 06:09:44 +00:00 |
|
Seth Call
|
a2061ff830
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-10 15:24:55 +00:00 |
|
Seth Call
|
c9625a4529
|
* VRFS-1377 done, tested. going to manually test soon on production
|
2014-03-10 15:21:21 +00:00 |
|
Scott Comer
|
84011ce339
|
remove bogus reference to non-existent GeoIpIsp
|
2014-03-10 07:26:15 -05:00 |
|
Jonathan Kolyer
|
d63f090657
|
VRFS-925 merge conflict
|
2014-03-10 09:01:33 +00:00 |
|
Seth Call
|
7df02c0778
|
* merging manifest
|
2014-03-10 07:13:01 +00:00 |
|
Scott Comer
|
8072096427
|
fix problem where jam_isp importer deleted contents of geoiplocations instead of geoipisp.
|
2014-03-10 01:45:32 -05:00 |
|
Seth Call
|
b9ee475db5
|
* working on event page
|
2014-03-10 06:31:20 +00:00 |
|
Seth Call
|
3c5a14312a
|
* Event page 'chrome' is setup and pulling from database--now to add band logic
|
2014-03-09 22:58:57 +00:00 |
|
Brian Smith
|
959320f909
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-09 18:56:24 -04:00 |
|
Brian Smith
|
dbed2edee8
|
VRFS-1397 ensure instruments are always synced in music_sessions_user_history table
|
2014-03-09 18:56:08 -04:00 |
|
Scott Comer
|
bf86b9b30b
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-09 17:35:29 -05:00 |
|
Scott Comer
|
af748cba75
|
rake tasks for importing geoip data
|
2014-03-09 17:35:12 -05:00 |
|
Seth Call
|
23e5906e55
|
* VRFS-1253 - account for unknowns
|
2014-03-09 19:35:42 +00:00 |
|
Brian Smith
|
e250b0f175
|
do not send band session join notification to band members
|
2014-03-09 14:44:06 -04:00 |
|
Jonathan Kolyer
|
3b2c3ea755
|
VRFS-925 merge conflict
|
2014-03-09 13:42:53 +00:00 |
|
Jonathan Kolyer
|
2b11cb7abb
|
VRFS-925 ga event processing
|
2014-03-09 13:38:46 +00:00 |
|
Scott Comer
|
c1bea4ae03
|
merge conflict
|
2014-03-09 01:28:41 -06:00 |
|
Scott Comer
|
f8e06c476d
|
fixed and normalized data types and nullability in max_mind_geo and max_mind_isp; fixed rakes for same to use ruby csv instead of pg; dropped the huge maxmind data files i committed earlier; fixed lack of genre in websocket factories.rb constructed music sessions.
|
2014-03-09 00:22:51 -06:00 |
|
Jonathan Kolyer
|
713344a7a7
|
merge conflict
|
2014-03-08 20:50:51 +00:00 |
|
Seth Call
|
5a51bae5fd
|
* set server_id to be same as hostname
|
2014-03-07 15:03:44 -06:00 |
|
Seth Call
|
755cd0172e
|
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
|
2014-03-07 14:20:43 -06:00 |