Commit Graph

651 Commits

Author SHA1 Message Date
Scott Comer 7446898071 added tests for new_musicians 2014-05-26 14:16: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 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 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
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 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 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
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
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 c51d7de5f4 VRFS-1664 some tweaks 2014-05-17 17:38:42 +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
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 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
Jonathan Kolyer 91ca1af98b VRFS-736 like us GA support 2014-05-11 06:42:20 +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 57e8860dcb Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 14:22:56 -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
Anthony Davis 4d4d04b343 VRFS-1651 - test-www should not use build_number 2014-05-07 08:30:41 -05:00
Seth Call 97269133ba Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-05-07 08:03:43 -05:00
Anthony Davis 1fa9ffcc3f VRFS-1651 - really no jam_* gems in test-www 2014-05-07 07:40:22 -05:00