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

433 Commits

Author SHA1 Message Date
Steven Miers aedcbde1f3 Merge with develop 2015-02-12 14:32:12 -06:00
Steven Miers 81dcd9bddc VRFS-2498 : Hook up new metronome sounds. Check group_id in lieu of media_type as it is not set for metronomes. 2015-02-12 14:05:25 -06:00
Seth Call 8c001eb839 * VRFS-2750 - update /landing/wo to look good for kickstarter 2015-02-07 14:12:31 -06:00
Seth Call 66bfbd875c * comment out failing test checks for follow buttons for now, and update jamblaster link for styling suggestions 2015-02-07 08:53:30 -06:00
Seth Call b89e6e9475 * VRFS-2748, VRFS-2749 - update styling for / page and home page 2015-02-06 22:04:37 -06:00
Jonathan Kolyer 9f27ef8429 VRFS-2698 renamed url_validator to site_validator 2015-02-06 07:43:24 +00:00
Jonathan Kolyer ed47441f67 VRFS-2698 refactoring website_validate to url_validate 2015-02-06 07:43:24 +00:00
Steven Miers 957ecf6735 VRFS-2730 : Better styling for backing tracks loop checkbox. 2015-02-01 18:22:07 -06:00
Steven Miers eff19235c3 VRFS-2730 : Hook up jamtrack looping. 2015-02-01 17:59:43 -06:00
Steven Miers a10078260a VRFS-2722 : Styling and logic necessary to display long labels on backing and other tracks. 2015-02-01 17:59:43 -06:00
Steven Miers e12cbe783c VRFS-2717 : Show type (extension) and file length in MB. 2015-02-01 17:59:43 -06:00
Jonathan Kolyer 082edc7075 VRFS-2697 css styling 2015-02-01 03:43:58 +00:00
Jonathan Kolyer 9e777a84aa VRFS-2697 display errors from server-side site check 2015-01-31 18:45:10 +00:00
Jonathan Kolyer fdcc77ae80 VRFS-2697 url format and site validation 2015-01-31 08:41:56 +00:00
Jonathan Kolyer 6069399a55 VRFS-2697 initial url validation 2015-01-31 05:22:58 +00:00
Jonathan Kolyer 16092ba816 VRFS-2697 website validator initial commit 2015-01-31 04:50:05 +00:00
Steven Miers 0d9bd33eb7 Clean up and adjust session UI to display metronome tempos and click sound. Update client. 
Style updates to fit selects and default to 120 bpm.
 2015-01-21 20:16:52 -06:00
Steven Miers 5f9f8a0cdd Cleanup; upgrade deprecated gem. Attempt to fix intermittently failing test. 2015-01-16 18:00:44 -06:00
Steven Miers 3fb45c0dd0 VRFS-2499 - Incremental, nearly done. 2015-01-15 20:28:34 -06:00
Brian Smith a07728ffa3 Merge branch 'feature/find_session_start_session' into develop 2015-01-11 21:22:59 -05:00
Seth Call 0ab7686205 * VRFS-2484 - wip pausing point; the code should not affect stability because it's mostly jamtrack only related 2015-01-09 15:15:12 -06:00
Brian Smith 47293afee4 VRFS-1985 VRFS-2252 allow RSVP and invited users to start session from Find Session screen 2015-01-09 02:10:44 -05:00
Seth Call cc3bf2ce1f * wip 2015-01-08 20:35:39 -06:00
Steven Miers 9dc364ea20 VRFS-2498 : Metronome graphic, made transparent. Session UI for metronome. 2015-01-08 11:14:02 -06:00
Brian Smith 79eec652d1 VRFS-1985 wip start session from Find Session screen 2015-01-07 23:18:07 -05:00
Seth Call af83a4f6a1 * VRFS-2608 - refactor and slight cleanup of UI towards new spec 2015-01-06 16:51:19 -06:00
Steven Miers 6cfe5decbf Merge branch 'develop' into feature/nocaptcha 2015-01-05 17:04:13 -06:00
Steven Miers 13e6f226ea VRFS-2540 : Recaptcha UI components 2015-01-05 16:57:49 -06:00
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 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 d83a632d0b Conflicts: 
db/manifest
	web/app/assets/javascripts/jam_rest.js
 2014-12-18 15:13:55 -06:00
Anthony Davis 39cae7e0a0 VRFS-2559 - button spacing 2014-12-16 21:35:52 -06: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 868ca0b476 VRFS-1442 sessions band selection 2014-12-03 08:22:35 +00:00
Jonathan Kolyer 220fd639e0 VRFS-1442 fixed layout of band social tab 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 b3d80b3be6 VRFS-2480 : Fix UI problem where checkout button was obscured. 2014-11-24 15:07:55 -06:00
Seth Call b780b4a462 * merged 2014-11-17 13:32:13 -06:00
Steven Miers b01b3ecd7d VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge. 2014-11-16 16:23:31 -06:00
Seth Call 92b617898f * VRFS-2485 - allow user to tweak to lower framesizes if they experience bad i/o or audio quality 2014-11-14 20:47:56 -06:00
Seth Call 3fc0329e79 * wip 2014-11-13 09:20:08 -06:00
Seth Call 6277708bb4 VRFS-1491 - create personal/master mix toggle, and beef up user.mods 2014-11-11 16:21:46 -06:00
Seth Call c3cd742c17 * wip 2014-11-11 16:21:29 -06:00
Steven Miers 6c825db79f Merge update 2014-11-10 17:10:01 -06:00
Seth Call 3c53eab168 *wip 2014-11-09 09:13:22 -06:00
Brian Smith 5d78939002 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-08 21:32:09 -05:00
Brian Smith 9c30becc11 VRFS-1712 fix issue with wrapping buttons on musician hover bubble 2014-11-08 21:32:04 -05:00
Seth Call 4e00863de6 * merged 2014-11-07 16:16:25 -06:00
Steven Miers 7dc80c10ce VRFS-1849: Check for google authorization using AJAX and show/hide the google login button / "signed in" label as appropriate: 2014-11-06 13:16:58 -06:00