Commit Graph

299 Commits

Author SHA1 Message Date
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
Seth Call e9e9962c42 Conflicts:
db/manifest
	ruby/spec/jam_ruby/models/email_batch_spec.rb
2015-01-07 17:44:56 -06:00
Steven Miers 6cfe5decbf Merge branch 'develop' into feature/nocaptcha 2015-01-05 17:04:13 -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
Seth Call 6906e4454a * VRFS-2601 - REST API to return keys 2015-01-05 16:53:43 -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
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 1f72d1cca4 * debug test that messes with websocket gateway 2015-01-04 09:00:50 -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 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 786486026b * wip 2014-12-30 17:10:16 -06:00
Steven Miers bb298dd6b9 VRFS-2548 : Config-ize location of jamtracks python tool 2014-12-29 15:05:19 -06:00
Seth Call 7ca3acb676 * wip 2014-12-22 09:50:59 -06:00
Seth Call 4a79f0c4ec * wip 2014-12-20 14:05: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
Steven Miers 34cb617f5f VRFS-1960 : download API for JamTracks, including a new message type, rescue job that builds the JKZ, and specs that exercise it all. 2014-12-17 17:19:36 -06:00
Steven Miers ff42a84598 VRFS-2482 : Jam Tracks cleanup and initial spec. 2014-12-15 20:30:46 -06:00
Steven Miers 361d88a0fa VRFS-1959 : jam_tracks#list_downloads API and model methods, as well as associated tests to verify. 2014-12-15 19:21:27 -06:00
Seth Call 566598fffc * fix for failing tests 2014-12-08 15:37:31 -06:00
Jonathan Kolyer 9bdddc22ff VRFS-1442 band deletion; band member layout; invitations; band admin support 2014-12-03 08:22:35 +00:00
Seth Call 0601e85e9d * configurable hiding for tests of jamtracks 2014-12-02 07:49:18 -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 76548b1af1 Merge branch 'develop' into feature/jam_tracks_merge 2014-12-01 11:45:54 -06:00
Steven Miers 7f59067226 VRFS-2480 : Refactor and cleanup, incremental. 2014-11-25 14:35:05 -06:00
Steven Miers 300426e2c9 VRFS-2480 : Additional recurly config 2014-11-25 14:34:07 -06:00
Steven Miers 7f88a7550c VRFS-2480 : Incremental 2014-11-17 21:24:39 -06:00
Seth Call d1d059b4c5 * disable score_histories for now 2014-11-17 13:28:43 -06:00
Steven Miers 2d3bbd2a47 VRFS-2480 : Recurly specs, fixes and new implementation. 2014-11-16 20:20:54 -06:00
Steven Miers bf33578fdb VRFS-2494 : Option to turn on jam tracks tile. Off in all configuration files for now.
Change config.jam_tracks_available=true to enable.
2014-11-16 16:03:56 -06:00
Steven Miers b282a69927 VRFS-2477 : Re-add google email config -- required for oauth functionality and specs.
This should address a few more tests.
2014-11-12 13:08:08 -06:00
Steven Miers 16d0342b1f Recurly subdomains for development and production. 2014-11-12 11:52:52 -06:00
Steven Miers c742a13da9 Fix a few specs. 2014-11-12 11:02:38 -06:00
Steven Miers 6c825db79f Merge update 2014-11-10 17:10:01 -06: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
Seth Call 164fe8db61 * recording cleanup logic VRFS-2393 2014-11-06 11:26:13 -06:00
Seth Call ea601711fa * make desk keys configurable 2014-11-05 20:32:37 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Steven Miers b2219da522 Merge feature/video_mvp to develop and resolve conflicts. 2014-11-03 18:28:28 -06:00
Seth Call 62833198b3 * VRFS-2431 - run normalize-ogg and normalize-mp3 to bump up master mix 2014-10-29 11:28:13 -05:00
Seth Call bcfc2def9e * VRFS-2367 - create api to discover websocket location, and fix tests 2014-10-24 21:50:40 -05:00
Seth Call fe7edbba5d * many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181 2014-10-22 23:10:49 -05:00
Steven Miers e3dadf9c4b VRFS-2032 : Youtube test account app name/developer key. 2014-10-15 15:17:03 -05:00
Steven Miers 10c5a66f24 VRFS-2033 - Youtube developer keys for test and dev environments 2014-10-15 12:24:58 -05:00
Jonathan Kolyer 26b124dde8 VRFS-2282 first pass purging stale sessions 2014-10-12 07:49:31 +00:00
Seth Call 71f6b7edc6 * VRFS-2304 - create scoring timeout when doing a network test 2014-10-06 16:44:30 -05:00
Seth Call 0fdb932db1 * VRFS-2298 - tack on JamKazam Staff to username in vanilla forums if admin 2014-10-02 14:04:36 -05:00