seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
4,299 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

115 Commits

Author SHA1 Message Date
Seth Call 8f49a9ab66 Merge branch 'develop' into feature/latency_hover 2014-08-19 12:49:54 -05:00
Seth Call 27f4adf772 * VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs 2014-08-18 20:41:44 -05:00
Seth Call 0c3a43a177 * wip 2014-08-18 10:37:55 -05:00
Seth Call 2dd6153ed8 * wip on score export 2014-07-26 14:18:17 -05:00
Seth Call 6a037d9987 * VRFS-1944 - user info added to scores and score_histories 2014-07-24 18:39:26 -05:00
Seth Call 333e321877 * updating the last_jam info on user in 5 needed locations (login, registration, ftue, import, etc) 2014-07-22 14:36:45 -05:00
Seth Call 5f131f9407 * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
Seth Call 14dad29c59 * VRFS-1861 - show something useful in the session section of the account screen 2014-07-12 08:55:58 -05:00
Seth Call afa2fa58cf * VRFS-1887 - make the RSVP text helpful as to the state of the session relative to the viewing user 2014-07-10 15:57:48 -05:00
Seth Call f693470c63 * VRFS-1910 - approved_rsvps to handle null instruments on slots, as well as remove attr_accessors as holders on user model 2014-07-10 15:22:00 -05:00
Brian Smith f4b4734c94 VRFS-1669 find session work 2014-06-23 00:58:37 -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
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
Brian Smith a557e9966a VRFS-1749 more session info tests / fix "deprecated" warnings 2014-06-14 13:13:45 -04: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
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
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 7446898071 added tests for new_musicians 2014-05-26 14:16:01 -05:00
Jonathan Kolyer 836baee962 merging with develop 2014-05-21 21:55:26 +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 7428a2f26b VRFS-1664 new musician weekly email 2014-05-16 07:58:06 +00:00
Scott Comer 79136d2127 correct weirdness in how user location is set 2014-05-12 21:13:16 -07: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 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
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
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
Seth Call 9820562892 * more websocket/heartbeat fixes 2014-04-30 03:01:28 +00:00
Jonathan Kolyer 937efed3e5 VRFS-1576 affiliate_partner model 2014-04-20 22:54:49 +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
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 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
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
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 b9ee475db5 * working on event page 2014-03-10 06:31:20 +00: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
Seth Call 7753a2d4b3 * VRFS-1228 - can add, but not update ,user biography 2014-02-25 05:41:43 +00:00
Brian Smith 956ff422f4 fix sidebar for recordings 2014-02-19 22:48:34 -05:00