seth
/
jam-cloud
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
4,591 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

791 Commits

Author SHA1 Message Date
Brian Smith 75b22ced5b added ability to retrieve RSVP requests by approval status 2014-06-16 01:46:52 -04:00
Brian Smith 4c81fdc1eb Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-06-15 15:49:47 -04:00
Brian Smith 7f3f47c3e6 VRFS-1749 session info tests 2014-06-15 15:49:43 -04:00
Scott Comer 07c1a4c85d added attribute accessors for music_session_id and latency; added access to ams_users_tmp via ams_users method in ActiveMusicSession; added test of same in the spec 2014-06-15 10:35:15 -05:00
Bert Owen ab2ad1b93c Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-06-15 15:12:07 +08:00
Bert Owen db6d6fa315 fix tests, rsvp error 2014-06-15 15:10:44 +08:00
Scott Comer ab5a7dc47a Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-06-14 21:27:43 -05:00
Scott Comer 3c3565893d wire up live latency and tag; accessors for tag and latency; fix borked function def; ams_init function; ams transaction 2014-06-14 21:27:34 -05:00
Brian Smith a557e9966a VRFS-1749 more session info tests / fix "deprecated" warnings 2014-06-14 13:13:45 -04:00
Bert Owen 03705547dd fix music session - rsvp 2014-06-14 21:42:46 +08:00
Bert Owen d4b467fd42 scheduled session - RSVP slot updated 2014-06-14 21:25:32 +08:00
Scott Comer 2799a6443e added asm_index method to controller and fix a few issues with asm_index and included a simple test 2014-06-13 23:51:54 -05:00
Scott Comer b918d24d32 reverse query ams_index to produce list of augmented music_sessions 2014-06-13 19:47:34 -05:00
Scott Comer beca3b5608 stub out active_music_sessions#ams_index 2014-06-13 12:38:36 -05:00
Brian Smith bedb377be8 VRFS-1749 session info tests wip 2014-06-13 03:45:45 -04:00
Brian Smith aa95dd783b fix tests 2014-06-11 09:15:03 -04:00
Brian Smith 5fc9696d01 merge develop 2014-06-11 08:45:34 -04:00
Scott Comer 161f75a126 use current_scores instead of scores 2014-06-10 20:50:59 -05:00
Brian Smith 7c058fd3e0 fix notification test 2014-06-10 01:38:11 -04:00
Brian Smith 4c758f3185 VRFS-1749 finished RsvpSlot model tests 2014-06-10 01:08:28 -04:00
Brian Smith 0fe76dae13 VRFS-1749 finished RsvpRequest model tests 2014-06-10 00:35:38 -04:00
Bert Owen 11c7f87fa1 Merge branch 'feature/create_session_flow' into feature/scheduled_sessions 2014-06-10 06:16:01 +08:00
Bert Owen 3ed14be60f finish basic create session flow 2014-06-10 06:13:54 +08:00
Seth Call 4a603cbaa2 * VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives 2014-06-09 15:43:16 -05:00
Jonathan Kolyer c0287cc224 VRFS-1664 enhancing tests 2014-06-09 05:12:29 +00:00
Bert Owen f333f110b8 fix type error 2014-06-09 10:43:07 +08:00
Brian Smith a09326470e VRFS-1749 RsvpRequest model tests wip 2014-06-07 13:01:03 -04:00
Brian Smith cff09fd4de Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-06-06 03:05:14 -04:00
Brian Smith 1a93b5f1f3 VRFS-1710 added scheduled session info to hover bubble / show session hover bubble for session-related notifications 2014-06-06 03:04:52 -04:00
Jonathan Kolyer eee0281c37 VRFS-1665 fixed typo 2014-06-06 06:08:53 +00:00
Jonathan Kolyer 98ede13fbc VRFS-1664 fixed typo 2014-06-06 06:08:32 +00:00
Jonathan Kolyer 18167e898d VRFS-1665 added large batch test 2014-06-06 05:31:53 +00:00
Jonathan Kolyer 743bb1e0dd Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-06-05 16:29:09 +00:00
Jonathan Kolyer a657236814 VRFS-1664 fixed large batch test 2014-06-05 16:29:01 +00:00
Jonathan Kolyer e669205c64 VRFS-1664 added looping test 2014-06-05 15:42:23 +00:00
Brian Smith 1141f2bd2e VRFS-1693 bug fixes 2014-06-05 00:55:15 -04:00
Brian Smith 8cc14b1ede VRFS-1693 copy canceled RSVP for slot if none were chosen 2014-06-04 23:17:45 -04:00
Bert Owen 60a004a252 integrating api, (without music_notations, start scheduled information) 2014-06-05 03:19:45 +08:00
Brian Smith d07e649c7b VRFS-1693 music session scheduler 2014-06-04 01:47:28 -04:00
Brian Smith 50706e7858 Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-06-03 01:10:39 -04:00
Brian Smith a9b67a9a6b VRFS-1693 resque job to schedule recurring music sessions 2014-06-03 01:10:25 -04:00
Jonathan Kolyer 84ed2949f6 VRFS-736 refactoring tests 2014-06-03 04:21:00 +00:00
Jonathan Kolyer d36ec17436 VRFS-1664 fixed mail sending test 2014-06-03 03:25:23 +00:00
Jonathan Kolyer 1f726df320 VRFS-1665 prevent session creator from getting notified of sessions 2014-06-02 06:17:31 +00:00
Jonathan Kolyer 7ea659c71f VRFS-1665 rewrote daily email queries and adding pagination; other tweaks 2014-06-02 06:01:55 +00:00
Jonathan Kolyer 2719b35dee VRFS-1664 added paging to fetc_recipients 2014-06-02 02:31:42 +00:00
Jonathan Kolyer e35e318884 VRFS-1664 replace tmp tbl with subquery 2014-06-02 02:11:00 +00:00
Scott Comer b5503afd0d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-31 18:07:30 -05:00
Scott Comer c0d08ebe27 scores integrated into display where i could, not exactly where david wanted. this finishes vrfs-1455 2014-05-31 18:07:25 -05:00
Jonathan Kolyer 0edacbe3e2 merging with develop 2014-05-31 21:07:18 +00:00
Jonathan Kolyer 4f5adf1340 VRFS-1664 fixing query 2014-05-31 20:41:48 +00:00
Jonathan Kolyer aa44302517 VRFS-1664 tweaking query 2014-05-31 20:34:42 +00:00
Jonathan Kolyer edbd3b1c6d VRFS-1664 new musicians email 2014-05-31 19:09:18 +00:00
Jonathan Kolyer 689e0a8609 VRFS-1664 new musicians emailer 2014-05-31 09:36:10 +00:00
Brian Smith ae79912dab merge develop 2014-05-31 07:41:59 -04:00
Jonathan Kolyer 30037bc967 VRFS-1698 removed sendgrid email error handling 2014-05-31 09:03:18 +00:00
Jonathan Kolyer b8736ff389 VRFS-1698 changed batch sending to one-at-a-time 2014-05-31 07:44:56 +00:00
Scott Comer 275c997591 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-30 14:12:35 -05:00
Scott Comer e9b77ff5b5 attempt to try to add scoring to musicians web page; add appropriate back-end filtering for score 2014-05-30 11:34:06 -05:00
Seth Call 7da75e94d9 * VRFS-1575 2014-05-29 14:44:37 -05:00
Seth Call dff3fa4870 *wip 2014-05-29 14:44:37 -05:00
Seth Call fcc7130536 * wip 2014-05-29 14:44:37 -05:00
Seth Call e4da30f39e * wip 2014-05-29 14:39:08 -05:00
Seth Call 05666f7927 wip 2014-05-29 14:34:18 -05:00
Scott Comer 3b3776f065 get score from Search.musician_filter into json sent to client 2014-05-29 13:03:33 -05:00
Jonathan Kolyer 77b6bdf106 Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-29 16:32:29 +00:00
Brian Smith a607124e63 VRFS-1746 RSVP cancel dialog bug fixes 2014-05-29 22:19:30 -04:00
Jonathan Kolyer ff15da9f4e VRFS-1665 mail formatting; bug fixing 2014-05-29 16:32:22 +00:00
Jonathan Kolyer f90f55fb11 VRFS-1665 added mail delivery test 2014-05-29 09:15:46 +00:00
Jonathan Kolyer 243e06533b VRFS-1665 scheduled session impl 2014-05-29 07:19:55 +00:00
Brian Smith f1229f6842 VRFS-1746 RSVP cancel dialog work 2014-05-29 02:33:37 -04:00
Brian Smith b640c31301 fix test 2014-05-29 01:28:40 -04:00
Brian Smith 7a4ad83cef merge develop 2014-05-29 00:20:09 -04:00
Brian Smith 4d63dad502 VRFS-1671 RSVP submit dialog 2014-05-28 23:43:57 -04:00
Scott Comer ebfe72e11d fix tests for scoring musician search 2014-05-28 21:19:50 -05:00
Brian Smith c7fc7bdc22 VRFS-1668 clean up notifications / fix comment notification for session info page 2014-05-27 22:35:26 -04:00
Scott Comer 6f57265a0d finish up mods for geocoding based on scores 2014-05-27 11:52:18 -05:00
Brian Smith 989a2a2b3a VRFS-1670 session info page work 2014-05-27 00:32:14 -04:00
Brian Smith f31248815d VRFS-1670 session info page work 2014-05-26 23:52:59 -04:00
Scott Comer 7446898071 added tests for new_musicians 2014-05-26 14:16:01 -05:00
Brian Smith 304008d693 VRFS-1670 more session info work 2014-05-26 14:00:34 -04:00
Brian Smith cc4686ab79 VRFS-1670 session info page work 2014-05-26 01:35:57 -04:00
Brian Smith 16b240fdc8 merge scheduled_sessions branch 2014-05-24 04:01:40 -04:00
Brian Smith a06ba7197e VRFS-1670 session info page work 2014-05-24 03:58:47 -04:00
Bert Owen fbeddf1735 VRFS-1682, VRFS-1679 : upload music notation, download music notation 2014-05-24 02:58:59 +08:00
Scott Comer 81495315f7 simplify Search.new_musicians api 2014-05-22 21:42:07 -05:00
Scott Comer bf06df36a3 added better regions database; added appropriate indexing for regions table 2014-05-22 15:17:00 -05:00
Bert Owen 5685e2f0e8 VRFS-1678 added music session update feature 2014-05-22 17:49:35 +08:00
Bert Owen 00d06fe6f2 * merge 2014-05-22 16:07:17 +08:00
Bert Owen 57f1fab935 VRFS-1677 fixed 2014-05-22 16:02:48 +08:00
Brian Smith b4f7035fed Merge branch 'feature/sched_sessions_rsvps' into feature/scheduled_sessions 2014-05-22 00:42:50 -04:00
Brian Smith 03eb125fa8 Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-22 00:42:33 -04:00
Brian Smith 0e419a7881 VRFS-1692 cancel RSVP complete 2014-05-22 00:40:17 -04:00
Brian Smith 176e862338 VRFS-1691 update RSVP request complete 2014-05-21 23:36:34 -04: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
Brian Smith 25f325d720 VRFS-1690 create RSVP request working 2014-05-21 17:47:11 -04:00
Bert Owen a1f288fe4d VRFS-1676 fixed 2014-05-22 03:11:50 +08:00
Scott Comer 4a76e0c983 get_work has a larger radius and excludes the current connections address 2014-05-21 14:05:45 -05:00
Bert Owen 1904c8f474 VRFS-1675 completed 2014-05-22 00:24:40 +08:00
Jonathan Kolyer 9ad0badff1 VRFS-736 filling out remaining subtypes 2014-05-21 06:20:15 +00:00
Brian Smith 7f5940ac01 VRFS-1739 API for RSVP slots 2014-05-21 01:36:32 -04:00
Brian Smith f793b14879 VRFS-1738 more RSVP API work 2014-05-21 00:57:32 -04:00
Scott Comer 3e0667e24d added Scores.score_conns to help with making scores for tests; comments for usage of musician_filter; optional score_dt for Score.createx; betterify query for connection in scoring api 2014-05-20 09:46:45 -05:00
Bert Owen 22f4d0ffc5 Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-20 21:26:55 +08:00
Bert Owen cebbd869cb VRFS-1675 add join session feature 2014-05-20 21:26:32 +08:00
Brian Smith 96f62b1364 VRFS-1690 VRFS-1691 VRFS-1692 RSVP API work 2014-05-20 02:45:00 -04:00
Jonathan Kolyer f53ca0010d VRFS-736 looping through results 2014-05-20 05:58:06 +00:00
Jonathan Kolyer cd801d7852 VRFS-736 fixing progression email algorithm and tests 2014-05-20 05:21:11 +00:00
Brian Smith d665a09080 scheduled session rsvp wip 2014-05-20 00:31:26 -04:00
Brian Smith ca53ee0ead update data model / fix tests 2014-05-19 23:34:56 -04:00
Bert Owen 97843035ba Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-19 23:36:23 +08:00
Bert Owen cdc9d121cb VRFS-1674 Create Session API 2014-05-19 23:35:38 +08:00
Jonathan Kolyer e44ccc7653 VRFS-736 client_notdl mailer 2014-05-19 15:12:59 +00:00
Jonathan Kolyer 4ddd699302 VRFS-736 filling out progression steps 2014-05-19 04:35:25 +00:00
Jonathan Kolyer 30f2387658 VRFS-736 2014-05-19 03:23:14 +00:00
Brian Smith dce007a13d VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres 2014-05-18 22:31:25 -04:00
Jonathan Kolyer f6196bb2c8 VRFS-736 consolidating query 2014-05-19 00:43:37 +00:00
Brian Smith 95100a1b49 VRFS-1668 added some edge case tests for new notifications (still need sunny day tests) 2014-05-18 14:59:57 -04: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
Brian Smith 0b2acda11e VRFS-1668 email notifications for scheduled sessions 2014-05-18 01:22:20 -04:00
Brian Smith 8fc30baf42 VRFS-1668 more notification work 2014-05-18 00:09:21 -04:00
Scott Comer a1b8d78e6a fix a problem with band location vs. user location management 2014-05-17 22:09:31 -05: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 72110cb057 Merge branch 'develop' into vrfs1664 2014-05-17 17:43:35 +00:00
Jonathan Kolyer e330fb96c7 VRFS-1664 some tweaks 2014-05-17 17:38:22 +00:00
Jonathan Kolyer 7428a2f26b VRFS-1664 new musician weekly email 2014-05-16 07:58:06 +00:00
Bert Owen 091998c200 * fix music_session test 2014-05-16 01:22:21 +08:00
Bert Owen 027fd61606 * added recurring_mode to music_session for recurring sessions 2014-05-16 00:19:44 +08:00
Bert Owen 24117c1b67 VRFS-1718 added MusicNotation model, migration 2014-05-15 23:49:06 +08:00
Brian Smith baee1b7506 VRFS-1668 merge with test fixes for notification changes 2014-05-15 01:06:48 -04:00
Seth Call a19d6dcc07 * adding RsvpRequest and RsvpSlot models 2014-05-14 15:48:42 -05:00
Seth Call 9ee27a5127 Revert "VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic" 
This reverts commit 2302c89154.
 2014-05-13 08:21:32 -05:00
Brian Smith 2302c89154 VRFS-1668 initial work on new notifications / refactor to make notification buttons more dynamic 2014-05-13 01:22:23 -04:00
Scott Comer 9deb7fcc74 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-12 21:13:33 -07:00
Scott Comer 79136d2127 correct weirdness in how user location is set 2014-05-12 21:13:16 -07:00
Jonathan Kolyer 5327be79eb VRFS-1664 changed batch to 500 2014-05-11 09:43:40 +00:00
Bert Owen 2c58ded35f VRFS-1700 fixed 2014-05-10 00:37:51 +08: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 6817d2f458 * fixing another bug in the SQL of MusicSession.index and MusicSession.index (bad inner join with music_session and active_music_session) 2014-05-07 14:16:35 -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
Jonathan Kolyer ebe9aa1047 VRFS-1577 VRFS-736 2014-05-07 01:33:27 +00: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
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