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,851 Commits 118 Branches 1,306 Tags 359 MiB
Commit Graph

1129 Commits

Author SHA1 Message Date
Seth Call aed848c507 Merge branch 'develop' into feature/jam_tracks 
Conflicts:
	db/manifest
	pb/src/client_container.proto
	ruby/lib/jam_ruby.rb
	web/config/environments/development.rb
	web/config/environments/test.rb
 2015-01-04 09:31:33 -06:00
Seth Call 5f14f73322 * some more fixes for broadcasting - VRFS-2523 2015-01-02 15:29:31 -06:00
Seth Call 9b1525715e * fix a bug in broadcasting and also fix bad log refernce 2015-01-01 14:22:42 -06:00
Seth Call 8a84ff5609 * fix broken tests because of removal of diagnostics, and fix bad logging pattern 2014-12-31 23:17:47 -06:00
Seth Call 83396675e6 * remove a diagnostic from javascript 2014-12-31 20:44:51 -06:00
Seth Call 71399dcaa7 * fixes for multiple issues: VRFS-2587 - no forking in resque, VRFS-2586 - fix influxdb client's shutdown behavior, VRFS-2585 - firefox cache busting 2014-12-31 20:39:22 -06:00
Seth Call ed15eef3ac * I'm not sure how I typo'ed this... 2014-12-30 21:06:56 -06:00
Seth Call a3f40b2f99 * fix typo in write_point /write VRFS-2569 2014-12-30 17:15:28 -06:00
Seth Call 6058b1770a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-12-30 17:12:44 -06:00
Seth Call 786486026b * wip 2014-12-30 17:10:16 -06:00
Brian Smith a402e31633 VRFS-2102 dedup instruments for in session users 2014-12-28 00:19:25 -05:00
Brian Smith 9eb6870502 VRFS-2359 warn user when starting a TBD session 2014-12-23 01:50:07 -05:00
Steven Miers bbee617c4b VRFS-1960 : Jam Track Signed Notification, usage in notificationPanel, and spec. 2014-12-22 14:23:05 -06:00
Seth Call 9876c00a7a * VRFS-2456 - add listen function to find session page, and update of join/rsvp icons 2014-12-19 14:00:49 -06:00
Seth Call 08a266a203 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-12-18 16:08:29 -06:00
Seth Call 01808e6dac * VRFS-2523 - broadcast fixes 2014-12-18 15:14:23 -06:00
Seth Call d83a632d0b Conflicts: 
db/manifest
	web/app/assets/javascripts/jam_rest.js
 2014-12-18 15:13:55 -06:00
Brian Smith 16fb200a2e VRFS-2162 clear out friend text entry box after selection is made (fixes bug when tabbing out of friend selector list) 2014-12-17 22:43:36 -05:00
Seth Call 566035348b * VRFS-2562, VRFS-2561, VRFS-2560 - fixes for mute state and behavior for voice chat and my tracks 2014-12-17 09:08:45 -06:00
Brian Smith 08842ae243 VRFS-2426 do not divide by 2 when calculating full score for latency badge 2014-12-17 01:14:37 -05:00
Brian Smith c71b9c8f0f VRFS-2441 prevent long notation file names from overlaying buttons 2014-12-14 22:25:08 -05:00
Seth Call 977a83277d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-12-08 15:37:38 -06:00
Seth Call 566598fffc * fix for failing tests 2014-12-08 15:37:31 -06:00
Jonathan Kolyer 93672844f2 VRFS-2529 remove quick-start scheduled sessions from account tab 2014-12-08 06:26:06 +00:00
Steven Miers 8634d4f726 VRFS-1959 : change the primary key (id) to be a big int and to share the sequence used by mixes.id and recorded_tracks.id 
Also modify references as necessary, both from other tables and various
code usages.
 2014-12-06 19:55:59 -06:00
Jonathan Kolyer e53b9b3df8 VRFS-2424 added user genres 2014-12-05 08:16:49 +00:00
Jonathan Kolyer 9f60327d20 VRFS-2424 added user.genres; refactored band_genres to genre_players; incorporated editing of user genres in profile 2014-12-05 07:50:03 +00:00
Jonathan Kolyer e834a1dfd6 VRFS-1442 refresh session band list each time entering step3 2014-12-03 08:22:35 +00:00
Jonathan Kolyer 868ca0b476 VRFS-1442 sessions band selection 2014-12-03 08:22:35 +00:00
Jonathan Kolyer 9bdddc22ff VRFS-1442 band deletion; band member layout; invitations; band admin support 2014-12-03 08:22:35 +00:00
Jonathan Kolyer 45542b7a1d VRFS-1442 band profile, members editing; change notifyAlert to default to 1 button; added band_admin attribute to band members 2014-12-03 08:22:35 +00:00
Jonathan Kolyer 588f03a199 VRFS-1442 bands page updates 2014-12-03 08:22:35 +00:00
Steven Miers 41096f08ad VRFS-2480: Additional back-end and UI functionality required for checking out. 2014-12-01 18:45:41 -06:00
Steven Miers 76548b1af1 Merge branch 'develop' into feature/jam_tracks_merge 2014-12-01 11:45:54 -06:00
Steven Miers 09163d2778 Fix javascript to get credit card expiration year from correct field. 2014-11-25 13:59:24 -06:00
Steven Miers 9e95f75e2e VRFS-2480 : Card number was getting whacked from submittal due to a bad javascript assignment. 2014-11-24 15:06:45 -06:00
Steven Miers b35f3ef9ef Fix fat finger. 2014-11-24 15:05:38 -06:00
Seth Call 6ad844035d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-21 17:16:21 -06:00
Seth Call eedc5ae970 * VRFS-1491 - finishing up dealing with refactor of monitor vs master tracks 2014-11-21 17:16:00 -06:00
Brian Smith 55c5167e36 fix bug with deduping instruments in recording hover 2014-11-21 08:15:59 -05:00
Brian Smith f0b60f28e4 VRFS-2467 dedup users and instruments on session hover bubble 2014-11-21 01:20:27 -05:00
Steven Miers 7f88a7550c VRFS-2480 : Incremental 2014-11-17 21:24:39 -06:00
Seth Call 76adc44a50 * wip 2014-11-17 17:16:30 -06:00
Seth Call b780b4a462 * merged 2014-11-17 13:32:13 -06:00
Seth Call 6ea19f35aa Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-16 21:40:50 -06:00
Seth Call 6b5cd42432 * VRFS-2097 - move around hover hookups 2014-11-16 21:40:21 -06:00
Steven Miers b01b3ecd7d VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge. 2014-11-16 16:23:31 -06:00
Jonathan Kolyer 38bf21ad6b VRFS-2125 prevent duplicate clicks from create band button 2014-11-16 05:40:24 +00:00
Seth Call f27673eb31 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-15 15:10:43 -06:00
Seth Call 94efaf8a8e * use hover events (js) instead of CSS to detect if hovering VRFS-2097 2014-11-15 15:07:13 -06:00