Commit Graph

3634 Commits

Author SHA1 Message Date
Seth Call e4da30f39e * wip 2014-05-29 14:39:08 -05:00
Seth Call 05666f7927 wip 2014-05-29 14:34:18 -05:00
Seth Call ebe1278e5e * wip 2014-05-29 14:32:46 -05:00
Seth Call cc3d48ed0a * wip 2014-05-29 14:32:46 -05:00
Seth Call df5fae1981 * wip 2014-05-29 14:32:46 -05:00
Seth Call d39f91e186 * VRFS-1575 - step 2 of FTUE almost done 2014-05-29 14:31:01 -05:00
Seth Call 9b18849544 * working on feature ftue 2014-05-29 14:31:01 -05:00
Scott Comer 3b3776f065 get score from Search.musician_filter into json sent to client 2014-05-29 13:03:33 -05:00
Scott Comer ebfe72e11d fix tests for scoring musician search 2014-05-28 21:19:50 -05:00
Scott Comer f51a152f97 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-27 11:52:26 -05:00
Scott Comer 6f57265a0d finish up mods for geocoding based on scores 2014-05-27 11:52:18 -05:00
Scott Comer 3886c0a413 tweak resetdb.sh 2014-05-27 09:31:50 -05:00
Scott Comer 3bdf12c981 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-26 14:16:09 -05:00
Scott Comer 7446898071 added tests for new_musicians 2014-05-26 14:16:01 -05:00
Anthony Davis 3736b93968 VRFS-1021 - tests were implicitly order-dependent, also fixing to use new ActiveMusicSession model 2014-05-26 12:20:01 -05:00
Scott Comer 918d65cd92 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-23 10:12:30 -05:00
Jonathan Kolyer 50d1696ad3 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-23 04:54:57 +00:00
Jonathan Kolyer 5f5bcaf04c VRFS-736 updated welcome message; fixed queue loading issue by updating jam_ruby.rb 2014-05-23 04:54:46 +00: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
Scott Comer 5527a6032c geolite region/state codes per country 2014-05-22 08:14:45 -05:00
Scott Comer eea6d2c41c fix spelling problem 2014-05-21 21:38:02 -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 0b3b4c5dfa merging 2014-05-21 22:46:57 +00:00
Jonathan Kolyer 3891cea86d VRFS-736 updated for user_progress_emailer 2014-05-21 22:45:06 +00: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
Anthony Davis 44c895b704 Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	monitor/spec/production_spec.rb
2014-05-21 16:52:44 -05:00
Anthony Davis 1ce510bb18 VRFS-1705 - 'monitor' subproj initial commit 2014-05-21 16:52:11 -05:00
Anthony Davis dc9b17fa46 production_spec.rb moved to 'monitor' subproject 2014-05-21 21:51:28 +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 3fd7805b1d VRFS-736 removed pending send email tests 2014-05-21 07:30:20 +00:00
Jonathan Kolyer b235817a0c VRFS-736 undo accidental commit 2014-05-21 07:19:02 +00:00
Jonathan Kolyer 6c0807ac5a VRFS-736 adding email content for progression steps 2014-05-21 07:17:42 +00:00
Jonathan Kolyer 9ad0badff1 VRFS-736 filling out remaining subtypes 2014-05-21 06:20:15 +00:00
Jonathan Kolyer b998b87a01 VRFS-736 refactoring 2014-05-21 06:06:16 +00:00
Jonathan Kolyer 70f34120b3 VRFS-736 refactoring 2014-05-21 05:24:52 +00:00
Scott Comer 867ec7c53f Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-20 10:07:05 -05: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
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
Seth Call a0fbd433b3 * brought back two pending test 2014-05-19 18:49:02 -05:00
Seth Call 1f86b809ff * VRFS-1730 - websocket on web layout 2014-05-19 16:57:08 -05: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
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