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,585 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

239 Commits

Author SHA1 Message Date
Jonathan Kolyer f6196bb2c8 VRFS-736 consolidating query 2014-05-19 00:43:37 +00:00
Jonathan Kolyer 1271b74bc4 VRFS-736 passing tests 2014-05-18 06:14:19 +00:00
Jonathan Kolyer fbb86dd9e7 VRFS-736 tests passing and what-not 2014-05-18 05:24:07 +00:00
Jonathan Kolyer 6e7562ffc8 VRFS-736 progression emails first pass 2014-05-18 00:12:01 +00:00
Jonathan Kolyer 72110cb057 Merge branch 'develop' into vrfs1664 2014-05-17 17:43:35 +00:00
Jonathan Kolyer c51d7de5f4 VRFS-1664 some tweaks 2014-05-17 17:38:42 +00:00
Jonathan Kolyer 7428a2f26b VRFS-1664 new musician weekly email 2014-05-16 07:58:06 +00:00
Scott Comer 00e177311d tests for last jam location setting and some cleanup of user manager and user location spec 2014-05-13 14:56:58 -05:00
Scott Comer ca27a6ab97 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 
Conflicts:
	db/manifest
 2014-05-08 19:47:17 -05:00
Scott Comer 3f688a8392 update user home base (last_jam_blah) fields upon registation and joining a music session as a musician 2014-05-08 19:44:52 -05:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -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
Seth Call 9700fff691 * fixing some SQL in conn manager for querying active_music_sessions 2014-05-06 18:02:00 -05: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
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Scott Comer 5cc515d615 a small cleanup of connection fields and fix broken tests 2014-05-02 13:44:29 -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
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 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
Seth Call 00a6139cd1 * merged 2014-04-29 14:04:26 +00:00
Scott Comer e82ae132bd fix method for adding connection to music session 2014-04-28 22:38:30 -05: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 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
Seth Call ac1b5d2e42 * fix for timecop 2014-04-15 17:02:51 +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
Jonathan Kolyer 5a4bff14d2 VRFS-925 running tests for server side GA events 2014-04-08 17:15:49 +00:00
Jonathan Kolyer 7203124e89 merging 2014-04-08 07:21:50 +00: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
Anthony Davis c7ff47dabf Fixing failing test 2014-03-27 22:23:39 -05:00
Seth Call d6210c0b2f * VRFS-1474 - link in friend invite 2014-03-25 15:29:08 +00:00
Seth Call 7cdd47ac89 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-20 11:53:35 +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 c6c12e7b9e Merge branch 'develop' into vrfs1483 2014-03-19 00:23:32 +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