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

208 Commits

Author SHA1 Message Date
Scott Comer 1d19bf613c removed users isp field, use last_jam_locidispid%1000000 instead; added fields for state and country codes. 2014-06-01 16:03:32 -05:00
Seth Call 05666f7927 wip 2014-05-29 14:34:18 -05:00
Scott Comer bf06df36a3 added better regions database; added appropriate indexing for regions table 2014-05-22 15:17:00 -05:00
Scott Comer 5527a6032c geolite region/state codes per country 2014-05-22 08:14:45 -05:00
Scott Comer 94421c03c0 merge conflict with db/manifest resolved 2014-05-21 21:33:38 -05:00
Scott Comer 09231c5fe6 fix for vrfs-1476 - scoring should store the detail data 2014-05-21 21:30:43 -05:00
Jonathan Kolyer bbd0c27d23 VRFS-736 cleanup of sess_notrecord text; added progress mailer queue 2014-05-21 22:41:17 +00:00
Jonathan Kolyer 836baee962 merging with develop 2014-05-21 21:55:26 +00:00
Scott Comer 4a76e0c983 get_work has a larger radius and excludes the current connections address 2014-05-21 14:05:45 -05:00
Jonathan Kolyer e44ccc7653 VRFS-736 client_notdl mailer 2014-05-19 15:12:59 +00:00
Jonathan Kolyer 6e7562ffc8 VRFS-736 progression emails first pass 2014-05-18 00:12:01 +00:00
Scott Comer 9eaa34b07f disable lat lng and distance in queries for users 2014-05-17 14:55:26 -05:00
Jonathan Kolyer b393cf35c4 VRFS-1664 STI columns for email batches 2014-05-17 17:42:47 +00: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 9948917f95 * fix promotional data 2014-05-08 08:25:30 -05:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -05:00
Seth Call 5f1ea4c754 * merging manifest 2014-05-07 05:17:17 -05:00
Seth Call c31c13b07e * adding chat_messages constraint for user_id 2014-05-06 20:04:53 -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
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
Scott Comer 6be0791adb merge 2014-05-02 15:20:21 -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 7515b1c3bd * moving new migration to end of manifest 2014-05-02 11:36:51 -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 65fb0511c6 * merging manually database migrations from the master branch now, because I need to preserve db lineage with www as a priority 2014-05-01 15:04:23 -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 1af868dd60 VRFS-1577 moved session_ratings.sql to bottom 2014-04-30 14:23:26 +00: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 e3e9cb5830 * keeping master in line with development, for dataabse 2014-04-29 16:31:36 +00:00
Seth Call d472c2b78f * keeping master manifest is lock with develop 2014-04-29 16:29:06 +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 ddf3c9cc5f VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:27:58 +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
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 937efed3e5 VRFS-1576 affiliate_partner model 2014-04-20 22:54:49 +00: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 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 e750ac9e68 VRFS-1483 error handling 2014-04-04 10:08:00 +00:00
Jonathan Kolyer accaa99e38 VRFS-1483 integrating opt-out; fixing tests 2014-04-01 14:42:26 +00:00
Jonathan Kolyer e29907f09b merging 2014-03-19 18:44:35 +00:00