Commit Graph

2333 Commits

Author SHA1 Message Date
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 abb5c3afb2 VRFS-2697 fixed js typo 2015-01-31 08:59:25 +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
Seth Call 96bc9487c4 * merged 2015-01-29 16:13:40 -06:00
Steven Miers a4d8ea5f60 VRFS-2498 : Fix tempo and sound strings for initial metronome opening. 2015-01-29 16:12:26 -06:00
Steven Miers d9d3e67fc5 VRFS-2582 : Hook up to client rather than stubbed API to list backing tracks. Implement in fakeJamClient for easy testing. 2015-01-29 16:11:57 -06:00
Steven Miers 33177ddae6 Merge with develop. 2015-01-29 10:55:10 -06:00
Steven Miers aec1419e6e Check for nil - fix intermittent test failure. 2015-01-29 10:53:30 -06:00
Steven Miers aa20f77eaf *Bump 2015-01-28 16:08:47 +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 6f8113b374 Merge branch 'develop' into feature/backing_tracks 2015-01-26 12:11:57 -06:00
Seth Call 8556aaac13 * make dynamic registrations confgurable, in case server crashes again: VRFS-2645 2015-01-23 16:51:59 -06:00
Brian Smith 3f2be132bd VRFS-2539 protect against error during notification load if the related session is missing / clean up the notifications of nonexistent sessions 2015-01-21 22:40:31 -05: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 4741312294 Fix test, cleanup 2015-01-21 15:10:02 -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 fe64995f54 Merge branch 'develop' into feature/backing_tracks 2015-01-19 17:10:28 -06:00
Steven Miers cefce67e89 Merge branch 'develop' into feature/backing_tracks 2015-01-19 15:21:13 -06:00
Seth Call 8f9e49ccf1 * VRFS-2660 - fixing dead links in welcome email and some corp pages 2015-01-19 15:07:52 -06:00
Seth Call f8b3d8cc7d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-19 10:25:53 -06:00
Seth Call 6880aec9ef * VRFS-2658 - adding commints 2015-01-19 10:24:23 -06:00
Seth Call 48b2f5b965 * add value = 1 to series 2015-01-19 10:24:18 -06:00
Seth Call 8a6a9b224b * VRFS-2658 - track if audio was established 2015-01-19 10:24:11 -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
Steven Miers 4f94444429 VRFS-2498, VRFS-2618 : API, routes and specs for backing tracks/metronomes. 2015-01-13 10:15:46 -06:00
Brian Smith 2017fed9ce Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-12 22:37:28 -05:00
Brian Smith 54d0f36319 VRFS-2465 use new table for text messages 2015-01-12 22:37:07 -05:00
Seth Call 5f9986b30e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-12 13:40:38 -06:00
Seth Call 9718cc7cca * remove dynamic registration code 2015-01-12 13:37:50 -06:00
Steven Miers babd9d7d90 VRFS-2540 : Don't send welcome email if recaptcha fails. Spec to verify. 2015-01-12 12:41:44 -06:00
Brian Smith 825a293c30 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-12 02:08:09 -05:00
Brian Smith 73e8f9ac6f VRFS-2465 wip text message changes 2015-01-12 01:26:27 -05:00
Brian Smith 21f25e51d0 VRFS-1985 VRFS-2252 added tests 2015-01-12 01:20:19 -05:00
Seth Call edbd28d357 * remove extra close bracket in listen link fi 2015-01-11 20:46:45 -06:00
Seth Call 5b1cb4527f Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-11 20:43:55 -06: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 a900087d87 VRFS-2540 : Fix. Remove usage of recaptcha; refactor nocaptcha check in google_client (was youtube_client). Fix and add tests. 2015-01-11 19:17:18 -06:00
Steven Miers d0c0c6d01e VRFS-2498, VRFS-2499 : Validations. 2015-01-11 14:15:47 -06:00
Brian Smith 50ede5bd9e VRFS-1985 VRFS-2252 allow only session creator to start session with TBD date/time 2015-01-10 15:09:06 -05:00
Seth Call 7e0ba4ed44 * fix bad code introcude into jamtrack download method by me 2015-01-09 16:13:04 -06:00
Seth Call 72ef14a87d * remove spurious log 2015-01-09 15:20:32 -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
Seth Call e8ffb9c27d Merge branch 'develop' into feature/session_jamtracks 2015-01-09 11:24:03 -06:00
Seth Call 2c798e8860 * VRFS-2629 - one can follow the progression of a jam track being signed with detail 2015-01-09 11:23:20 -06:00
Brian Smith 4e0d2cd1cf Merge branch 'develop' into feature/find_session_start_session 2015-01-09 07:08:41 -05:00
Steven Miers 34d7985762 VRFS-2498, VRFS-2499 : Incremental 2015-01-09 02:47:46 -06:00
Brian Smith aeabfcafc8 VRFS-1985 VRFS-2252 only show start button for RSVP / invited user if there is less than 15 minutes left to sesession start time 2015-01-09 03:08:03 -05:00
Brian Smith 9643fe1187 fixed javascript error on session detail screen 2015-01-09 02:38:38 -05: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
Seth Call b5c446dd04 * VRFS-2625 - adding bpm and tap_in_count to tap in row, and remove tap_in from jamtracks 2015-01-08 11:38:46 -06:00
Steven Miers 9dc364ea20 VRFS-2498 : Metronome graphic, made transparent. Session UI for metronome. 2015-01-08 11:14:02 -06:00
Seth Call e28db48e94 * resolving VRFS-2624 - if nil recording_ids, just exit early 2015-01-08 10:25:54 -06:00
Brian Smith 79eec652d1 VRFS-1985 wip start session from Find Session screen 2015-01-07 23:18:07 -05:00
Seth Call e9e9962c42 Conflicts:
db/manifest
	ruby/spec/jam_ruby/models/email_batch_spec.rb
2015-01-07 17:44:56 -06:00
Seth Call 99f5e46ff6 * another quick fix for broken databasecleaner transaction cleanup 2015-01-07 16:57:25 -06:00
Seth Call d58cf2a048 * VRFS-2617 - allow only purchased jamtracks to be returned by list method. (reuse existing API) 2015-01-07 16:16:57 -06:00
Steven Miers 3028e421fb VRFS-2614 : Allow jam track to be hidden to non-admin users by setting available=false.
Model, controller, admin UI, web UI, and spec to verify non-available
jam_tracks can only be seen by admin users.
2015-01-07 12:33:49 -06:00
Steven Miers 81ad2c89b5 VRFS-2610 : Fix bad API call that was throwing exception in console. 2015-01-07 11:27:21 -06:00
Seth Call 2ff30946e8 * VRFS-2606 - add new tap in fields, support them in activeadmin 2015-01-07 09:30:05 -06:00
Seth Call 585f307747 * add missing icon_folder.png 2015-01-07 08:54:28 -06:00
Seth Call 98c99c9a12 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-06 16:52:24 -06: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 7a9e5ec9a9 VRFS-2609 : Put cancel button next to create account button. 2015-01-06 12:14:30 -06:00
Steven Miers 32dd3f272f Touch 2015-01-06 03:45:39 +00:00
Steven Miers 9047e26aba Bypass recaptcha for feature specs exercising the signup mechanism. 2015-01-05 21:29:23 -06:00
Steven Miers f677714e9a Revert change. 2015-01-05 19:03:28 -06:00
Steven Miers eb990dd930 One more foxy 2015-01-05 18:27:14 -06:00
Steven Miers 16667a9ce3 Fix typo. 2015-01-05 17:25:43 -06:00
Steven Miers 6cfe5decbf Merge branch 'develop' into feature/nocaptcha 2015-01-05 17:04:13 -06:00
Steven Miers 4d5b1c0ee1 VRFS-2540 : Add recaptcha tests to user manager spec that verify that system behaves properly for both the passed-in recaptcha flag AND the "recaptcha_enable" application config value. 2015-01-05 17:02:55 -06:00
Steven Miers 9d5d36f059 VRFS-2540 : Clean out some existing recaptcha scaffolding.
Current recaptcha gem only works within controllers, so pass flag down
the stack when recaptcha fails.  Respect application config for
“recaptcha_enable” at all levels higher than user level.  Allows usage
of existing mechanism for attribute validation and passing subsequent
errors back to the UI for reporting.
2015-01-05 17:01:28 -06:00
Steven Miers 13e6f226ea VRFS-2540 : Recaptcha UI components 2015-01-05 16:57:49 -06:00
Seth Call 6906e4454a * VRFS-2601 - REST API to return keys 2015-01-05 16:53:43 -06:00
Seth Call d677b43c28 * VRFS-2603 private key now stored 2015-01-05 15:19:20 -06:00
Seth Call 7f18bff3fc * VRFS-2602 - make it dead easy to parse out JamTrackId from URL 2015-01-05 14:48:46 -06:00
Seth Call 356e9c657a * bump to get a develop build out 2015-01-04 22:45:13 -06:00
Steven Miers 2853c77b7e VRFS-2597 : Fix some broken tests:
* Naming issues
* Restore method that was caught by friendly fire in a cleanup session
* Add a few new specs to properly exercise controller methods to catch
errors sooner, i.e., not in feature specs.
* Restore deleted route
2015-01-04 16:24:31 -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 77d62a4744 Merge branch 'feature/jam_tracks' of bitbucket.org:jamkazam/jam-cloud into feature/jam_tracks
Conflicts:
	web/jt_metadata.json
	web/spec/controllers/api_recurly_spec.rb
2015-01-04 09:02:04 -06:00
Seth Call 1f72d1cca4 * debug test that messes with websocket gateway 2015-01-04 09:00:50 -06:00
Steven Miers 3c719e3f97 Another puts. 2015-01-03 11:51:42 -06:00
Steven Miers 94480e1d88 Don't commit transient file. 2015-01-03 11:45:24 -06:00
Steven Miers 2c2a32e140 Remove stray puts. 2015-01-03 11:45:24 -06:00
Seth Call 3c1816492c * fix event_spec test for the rename of broadcast wixget on session landing page 2015-01-02 16:32:33 -06:00
Seth Call 4873da6448 * make test not break randomly 2015-01-02 16:00:53 -06:00
Seth Call 5f14f73322 * some more fixes for broadcasting - VRFS-2523 2015-01-02 15:29:31 -06:00
Seth Call 82b7c005ec * if promos is selected, then change text to 'Selected Sessions and Recordings' VRFS-2591 2015-01-02 11:18:39 -06:00
Seth Call 0f288539cd Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-01-01 14:23:00 -06:00
Seth Call 9b1525715e * fix a bug in broadcasting and also fix bad log refernce 2015-01-01 14:22:42 -06:00
Jonathan Kolyer e8fd6360aa VRFS-2552 removed config.json_engine due to this error: undefined method key? JSON::Ext::Generator::State 2015-01-01 18:00:43 +00: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 116cf8cfce Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-12-31 20:39:27 -06:00