Commit Graph

312 Commits

Author SHA1 Message Date
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 7d246ef817 * fix reconnect and limit bands 3 test 2014-05-29 20:58:40 -05:00
Seth Call 6ad607cd24 * fixing latency tester's page 2014-05-29 16:52:50 -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
Seth Call df5fae1981 * wip 2014-05-29 14:32:46 -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 6f57265a0d finish up mods for geocoding based on scores 2014-05-27 11:52:18 -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
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
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
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
Scott Comer 9eaa34b07f disable lat lng and distance in queries for users 2014-05-17 14:55:26 -05: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
Anthony Davis b919f55280 fixing failed bands tests 2014-05-13 07:40:04 -05:00
Anthony Davis f88808aa10 adding/fixing bands tests 2014-05-12 23:16:32 -05:00
Anthony Davis bf18a936c8 VRFS-1708 - fix failing feed tests, remove interdependency 2014-05-10 14:16:17 -05:00
Anthony Davis 5d5dc51434 Slight fix to chat text in sidebar 2014-05-10 14:08:39 -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
Anthony Davis ac8a9a5af6 VRFS-1705 - fix test-www by a slight decouple 2014-05-08 18:00:49 -05:00
Seth Call 88e13aa3fc * attempt to run problem test now that fix to nindex has been made 2014-05-07 15:14:42 -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
Anthony Davis 26e4a2b72d Merge remote-tracking branch 'origin/develop' into develop 2014-05-06 22:35:27 -05:00
Anthony Davis 673132c540 VRFS-1651 - periodic real test of www 2014-05-06 22:35:00 -05:00
Seth Call d72cdfda14 * pending for now 2014-05-06 22:04:37 -05:00
Seth Call 332aee8667 * adding verification that the update settings dialog is dismissed 2014-05-06 21:48:02 -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 1c6b5b78bb VRFS-1577 fixing specs 2014-05-06 07:20:14 +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 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
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 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