Commit Graph

586 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 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 1d42b7b662 VRFS-2698 refactoring validator interface 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
Seth Call a0e486aed7 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-02-03 09:49:34 -06:00
Seth Call 768c9e2024 VRFS-2739 - remove aggressive check for bad session info and add some basic tests to catch errors in the future 2015-02-03 09:49:19 -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
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 9086fac76a VRFS-2697 enhanced error handling; crop url length 2015-01-31 18:07:51 +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 9ae7b425ad Restore missing tags. 2015-01-27 14:58:59 -06:00
Steven Miers 23d4c88f46 Convert session partial to slim. 2015-01-26 14:24:15 -06: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 ff95fe1c35 VRFS-2498, VRFS-2499 : Mesh out backing track/metronome track support at necessary layers rest/api/UI/etc. Implement necessary methods in fakeJamClient for quicker iterating. 2015-01-20 22:14:48 -06:00
Steven Miers 3fb45c0dd0 VRFS-2499 - Incremental, nearly done. 2015-01-15 20:28:34 -06:00
Brian Smith 825a293c30 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-12 02:08:09 -05:00
Seth Call 46ae56e7e8 * fix listen link 2015-01-11 20:43:15 -06:00
Brian Smith a07728ffa3 Merge branch 'feature/find_session_start_session' into develop 2015-01-11 21:22:59 -05:00
Steven Miers d0c0c6d01e VRFS-2498, VRFS-2499 : Validations. 2015-01-11 14:15:47 -06: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
Steven Miers 34d7985762 VRFS-2498, VRFS-2499 : Incremental 2015-01-09 02:47:46 -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
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 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
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 e4e3121b31 VRFS-1442 cosmetic updates 2014-12-03 08:22:35 +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 220fd639e0 VRFS-1442 fixed layout of band social tab 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
Seth Call 069fc6a664 * removing trailing close comment 2014-12-02 17:29:29 -06:00
Seth Call 0601e85e9d * configurable hiding for tests of jamtracks 2014-12-02 07:49:18 -06:00
Seth Call f6e0ebe910 * disabling shopping cart in view for now 2014-12-01 20:31:52 -06: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 7f59067226 VRFS-2480 : Refactor and cleanup, incremental. 2014-11-25 14:35:05 -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