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

679 Commits

Author SHA1 Message Date
Seth Call 3b71931e73 merge conflict from feature/new_session (VRFS-3283) 2015-07-15 10:04:45 -05:00
Steven Miers 2761ea8ed7 Merged session reminder feature branch. 
Squashed commit of the following:

commit 84293ed637
Author: Steven Miers <steven.miers@gmail.com>
Date:   Thu Jul 9 17:52:26 2015 -0500

    VRFS-3300 : Reminder notification functionality -- sends in-app/1-day/upcoming emails as necessary.

commit 521b0f4ba7
Author: Steven Miers <steven.miers@gmail.com>
Date:   Thu Jul 9 17:50:33 2015 -0500

    VRFS-3300 : Reminder mails on user mailer.   Also add tests to spec.

commit ed487e11a3
Author: Steven Miers <steven.miers@gmail.com>
Date:   Thu Jul 9 17:48:04 2015 -0500

    VRFS-3300 : Music session reminder job and spec

commit e5c7f50cd2
Author: Steven Miers <steven.miers@gmail.com>
Date:   Thu Jul 9 17:46:55 2015 -0500

    VRFS-3300 : Reminder cron setting
 2015-07-10 10:51:12 -05:00
Steven Miers 614cfcbe85 Merge feature/calendaring branch: 
commit 8023d6481c
    VRFS-3276 : Hook calendar creation into user controller API.  Add test to verify.

commit 3a35002a46
    VRFS-3276 : Calendar cleanup job

    * Add cleanup method to calendar manager
    * Create a daily job.
    * Add calendar cleanup to that job.
    * Add CRON entry
    * Daily job/ calendar cleanup test cases
    * Fix calendar manager spec for new required attribute

commit 3ff5910f1f
    VRFS-3276 : Add a delete-calendar directive when RSVP is canceled.
    VRFS-3276 : Include path to partial.  This fails depending on the method used to start the web server.

commit d2441cbf57
    VRFS-3276 : Test new calendar features. Use icalendar gem in test mode only to more deeply verify calendar in strict mode.

commit 9ac272a0fb
    VRFS-3276 : Calendar manager updates to include manual calendars.  Some refactoring to keep common stuff in one place.

commit b5d0c758f0
    VRFS-3276 : Schema, model updates and new calendar model.

commit 20472b6b26
    VRFS-3276 : Change initial submit behavior of RSVP dialog to display calendar info.  The user can then close the dialog after this prompt.

commit 77c99103d0
    VRFS-3276 : Calendar feed markup and styling.  Included as partial.

commit e632f48600
    VRFS-3276 : Routes and controller implementation of user calendar ICS feed, which uses calendar manager.

commit 21fd80a188
    VRFS-3276 : Initial tests for calendar manager

commit 92a2524c65
    VRFS-3276 : Calendar manager

    * Streamline logic
    * Enable recurring sessions through rrule
    * Implement method to create ics feed for user
    * Extract a type-safe scheduled duration method on music_session for
    external and internal use.

commit b71ad3a4cd
    VRFS-3276 : Include calendar manager

commit f8eaafd036
    VRFS-3276 : Calendar Manager - initial checkin

    * Create ICS events given individual parameters
    * Create calendar from music session
    * Also will create ICS “delete” events
 2015-07-06 15:34:27 -05:00
Jonathan Kolyer 832e716e8b Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-06-28 19:52:45 +00:00
Steven Miers cfda14e16e VRFS-3190 : Merge with latest develop branch 2015-06-16 12:23:57 -05:00
Seth Call 0dbbfc0ee7 * VRFS-2855 - broadcast notifications done 2015-06-10 08:26:45 -05:00
Jonathan Kolyer 3eca6aeee5 Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-06-04 05:59:31 +00:00
Steven Miers d5a8959677 Merge with develop. 2015-06-03 14:22:21 -05:00
Seth Call 2cb01d8492 * VRFS-3268 - make bugsnag and recurly async 2015-05-29 21:33:45 -05:00
Seth Call 43b92d4a17 * VRFS-3264 - help bubbles on jamtrack browse screen when not logged in, VRFS-3267 help IE11 visualize jamtrack browse page correctly 2015-05-29 15:30:23 -05:00
Seth Call 54a7cb40c9 * turn timing off, and track with GA 2015-05-28 11:10:50 -05:00
Seth Call d959a17be4 * affiliate program in place VRFS-3030 2015-05-28 08:20:14 -05:00
Jonathan Kolyer da58ac6eab merging 2015-05-22 08:20:07 +00:00
Seth Call c96f0a7859 * VRFS-3260 - fraud check code and admin helpers complete 2015-05-20 09:24:17 -05:00
Steven Miers d684ecda3b Merge with latest from develop and manually fix. 2015-05-18 16:02:07 -05:00
Seth Call 781a9838b7 * VRFS-3216 - add virtual page views for JamTrack funnels, add test mode for fraud check VRFS-3260 2015-05-18 10:33:58 -05:00
Jonathan Kolyer 737367b016 VRFS-3036 building out band search filter features, refactoring musician search filter 2015-05-18 04:00:12 +00:00
Seth Call f5595a03d5 * actually send email when fraud detected 2015-05-16 10:18:35 -05:00
Seth Call a62aaeef11 * VRFS-3260 - fraud check allowed in tests 2015-05-15 23:50:27 -05:00
Seth Call 792212e952 * VRFS-3260 - disable fraud 2015-05-15 23:28:46 -05:00
Seth Call 939f8cdf82 * VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests 2015-05-15 12:34:35 -05:00
Steven Miers 193888f960 VRFS-3242 : Merge with latest develop 2015-05-13 20:56:58 -05:00
Seth Call 2723cd8a78 * VRFS-3215 - add checkoutComplete URL 2015-05-12 14:14:44 -05:00
Steven Miers 294c01d44a Merge with latest develop 2015-05-11 17:25:37 -05:00
Seth Call 4709622546 * VRFS-2680 - adding redirect logic for ssl 2015-05-11 16:52:58 -05:00
Seth Call 8c04a601ab * add required websocket configs 2015-05-11 09:50:45 -05:00
Seth Call 62b6820e90 * VRFS-3220 - estimate taxes manually 2015-05-09 08:30:12 -05:00
Seth Call 10da152916 * VRFS-3225 - show sampler ate dropdown 2015-05-08 15:03:19 -05:00
Seth Call 840d2169b1 * remove puts/debug settings 2015-05-07 09:03:24 -05:00
Seth Call 0ea2931837 * add config to remove whitespace from credit card number. probably unnecessary; just doing now before release 2015-05-07 09:02:58 -05:00
Seth Call 12eeb460a3 * VRFS-3212 - track counts of concurrent packaging attempts 2015-05-07 08:49:15 -05:00
Seth Call f593a6d706 VRFS-3208 - let admins purchase anyway when pucrhase_nabled = false 2015-05-07 07:45:07 -05:00
Seth Call b523850296 * VRFS-3208 - add new config - purchases_enabled, so that we can stop purchases if needed 2015-05-06 22:09:07 -05:00
Seth Call a2d5c0a2b9 * VRFS-3166 - only play one widget at a time 2015-05-04 07:52:30 -05:00
Steven Miers 4c4121e4d7 Merge with latest develop 2015-05-01 20:00:08 -05:00
Seth Call 1cd57cb4e8 * VRFS-3118 - check for high latency while in session, VRFS-3138 - fix tons of issues with user downloading both sample rates 2015-05-01 12:09:18 -05:00
Steven Miers 51dc0c408a Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-30 19:33:04 -05:00
Seth Call 68b4ab529a * VRFS-3118 - reload audio globally configurable 2015-04-29 22:03:02 -05:00
Steven Miers daef55d1a2 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-29 12:59:11 -05:00
Seth Call 72ff54213a * VRFS-2997 - added license to accounts link. also adding config to ignore high latency if in a pinch 2015-04-28 20:07:21 -05:00
Steven Miers 2260d21fc1 VRFS-3007 : Merge with latest develop 2015-04-28 16:43:38 -05:00
Seth Call 1bd054d050 * VRFS-3094 - update style and minor issues in shopping cart screen 2015-04-27 15:42:38 -05:00
Seth Call 13c3818c42 * add support for personal alerts email 2015-04-24 16:16:47 -05:00
Seth Call 4cce21e7f8 * VRFS-3080 - partial refund manual process done 2015-04-23 16:20:21 -05:00
Seth Call 989518fa68 * VRFS-3082 - email alert if jamtrack fails 2015-04-23 10:34:17 -05:00
Seth Call d66f8e50d1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-22 15:47:57 -05:00
Seth Call 091f2be556 * make the nobody@jamkazam.com configurable so that we can override it in chef to provide context clues 2015-04-22 15:43:36 -05:00
Steven Miers b916d4d997 VRFS-3055 : Multiple levels of config option video_available 
“none”, “mvp”, and “full”.  “mvp” mode is similar to full, except it
hides video recording functionality.
 2015-04-22 15:36:21 -05:00
Seth Call 763ade01dd * protect against webcamViewer from getting involved if video is not available 2015-04-22 10:18:33 -05:00
Steven Miers a9ab5bb730 Merge video_ui branch into develop. 2015-04-21 13:47:00 -05:00
Steven Miers ea45c286ea VRFS-3055 : Make video features optional via config option. 2015-04-21 09:21:55 -05:00
Seth Call c29af72938 * fix jamtrack landing page formatting VRFS-3056 2015-04-20 22:13:30 -05:00
Seth Call 022304c6af * VRFS-3065 - permission error name change 2015-04-20 10:42:09 -05:00
Seth Call fefd5a3fda * jamtrack UI fixes: VRFS-3041 (ordering fixed), VRFS-3004 - loading/no more jamtrack notice fixes, and VRFS-3005 - filter by band works 2015-04-16 15:44:38 -05:00
Seth Call 4cf4e21552 * VRFS-2938 - packaging phase now shows % indicator 2015-04-16 14:45:29 -05:00
Steven Miers 766568f8cb Merge and fix 2015-04-16 12:16:09 -05:00
Seth Call ec7cffbe49 * VRFS-2991 - fix bug in outputting recording links 2015-04-15 15:26:10 -05:00
Seth Call 19ad2fbcc5 * VRFS-2991 - sitemap generator done (but still vetting other parts of the site for basic SEO) 2015-04-14 16:39:39 -05:00
Seth Call 06c964a151 * VRFS-2977 - make facebook signup work with checkout flow 2015-04-14 14:12:24 -05:00
Brian Smith b81222278d merge develop 2015-04-13 08:16:45 -04:00
Jonathan Kolyer 252beca091 VRFS-2895 added unsubscribe link to email footer that doesnt require login 2015-04-12 11:03:12 +00:00
Seth Call ab2925ef88 VRFS-2821 - payment history screen added 2015-04-12 13:46:22 -05:00
Seth Call e42b926a5e * VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases 2015-04-10 15:19:08 -05:00
Brian Smith 246efbdaa8 merge develop 2015-04-09 20:47:01 -04:00
Seth Call fd02e23572 * updated home page VRFS-2868 2015-04-08 22:44:21 -05:00
Steven Miers d12b7efb38 VRFS-3018 : Resolve api_jam_tracks#purchased before api_jam_tracks/:plan_code as the wildcard was preventing resolution to the former. 2015-04-08 12:56:59 -05:00
Brian Smith 0a451742ef merge develop 2015-04-06 21:26:54 -04:00
Seth Call 821ca9d76a * VRFS-2875 - sales record keeping as well as recurly hook processing 2015-04-03 15:34:12 -05:00
Jonathan Kolyer c3ede10f1d merging feature/musician_profile_enhancements 2015-04-02 14:51:33 +00:00
Brian Smith a87c08afe3 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-01 23:09:51 -04:00
Seth Call 80a48c60c6 * VRFS-2879 - adding 3 product pages (jamblaster, platform, jamtracks) 2015-03-31 21:08:09 -05:00
Seth Call b1b2d3ad24 * VRFS-2869 - band landing page 2015-03-31 16:17:17 -05:00
Seth Call f7febfabcf * VRFS-2999 - create whole track preview for master track on import 
* VRFS-3000 - create duration for jam track
* VRFS-2996 - create jamtrack preview widget
* VRFS-2870 - individual jam track landing page (still needs tests)
 2015-03-31 13:36:49 -05:00
Jonathan Kolyer ddc4decfd3 merging feature/musician_profile_enhancements 2015-03-30 06:07:43 +00:00
Brian Smith 83c00ea6e4 merge develop 2015-03-29 10:12:42 -04:00
Jonathan Kolyer 9eeb0e454b VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-26 03:31:21 +00:00
Steven Miers 5f953d1b19 VRFS-2830 : Merge / manual fix 2015-03-25 10:56:24 -05:00
Steven Miers adef8c8c45 VRFS-2830 : Payment History 
API, client, view, styles and test
 2015-03-24 17:13:09 -05:00
Seth Call bfe302b2f1 * merged 2015-03-24 14:43:48 -05:00
Seth Call ccd60aa631 * merged develop 2015-03-24 11:27:26 -05:00
Jonathan Kolyer 8c2df0bb6b VRFS-2916 added jamtrack plays handling; worked around jam_tracks.id bigint problem (with commented dependencies); tested jamtrack play saves from JS through rspec; final cleanup of cohort reporting 2015-03-23 20:06:32 +00:00
Brian Smith 96a816f317 merge develop 2015-03-21 10:06:53 -04:00
Seth Call d44236abc4 remove jamblaster notice from site 2015-03-20 09:58:58 -05:00
Seth Call 661c4ed446 * wip 2015-03-20 08:48:00 -05:00
Brian Smith 948174f19a VRFS-2701 musical experience bug fix 2015-03-12 21:34:20 -04:00
Seth Call 9279d88d8d * VRFS-2876 - pro licensing added and 20 second snippet 2015-03-10 22:10:22 -05:00
Jonathan Kolyer b998d28c37 VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-10 04:33:37 +00:00
Brian Smith d865d0a1fa Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-09 20:25:28 -04:00
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Jonathan Kolyer 0e9f78ccdd VRFS-2795 search filter front end start 2015-03-02 09:41:53 +00:00
Brian Smith 4d133e0043 merge develop 2015-02-28 02:24:23 -05:00
Steven Miers 5396e66c67 Merge with develop 2015-02-27 11:51:45 -06:00
Seth Call 8205b5ea58 * VRFS-2841 - load jmep into the backend 2015-02-27 08:37:12 -06:00
Seth Call dbaeb8d996 merged 2015-02-25 10:43:21 -06:00
Brian Smith 500af2bc05 merge develop (had lots of migration issues) 2015-02-20 08:35:59 -05:00
Seth Call 9345d65f06 * merged 2015-02-19 14:31:00 -06:00
Jonathan Kolyer 6a46ad5910 Merge branch 'develop' into feature/recording_selector 2015-02-16 02:20:38 +00:00
Seth Call 51689e3d61 * make backing tracks show on/off and fix migration 2015-02-16 14:59:58 -06:00
Seth Call b46dce5c29 Merge branch 'feature/backing_tracks' into develop 2015-02-16 10:35:46 -06:00
Seth Call e40c964d97 * merged 2015-02-15 22:15:34 -06:00
Seth Call afe9f65709 * merged 2015-02-15 22:14:30 -06:00
Seth Call 42a2abe99c * merged 2015-02-15 22:01:06 -06:00
Jonathan Kolyer 6ff4d197ef VRFS-2700 recording source jasmine tests 2015-02-15 23:10:29 +00:00
Jonathan Kolyer 40b4537b04 Merge branch 'develop' into feature/recording_selector 2015-02-15 13:57:16 +00:00
Brian Smith c167f9d09a Merge branch 'develop' into feature/musician_profile_enhancements 2015-02-14 21:04:28 -05:00
Seth Call bbae4a7bf6 * yaka (yet another kickstarter ad 2015-02-14 16:56:21 -06:00
Seth Call 1c7518c3dd * adding another kickstarter ad 2015-02-14 16:26:01 -06:00
Seth Call 2c3ed6beea * check in new ad for kickstarter 2015-02-14 14:25:27 -06:00
Brian Smith a778eaef28 VRFS-2695 wip get user profile API 2015-02-13 22:45:19 -05:00
Brian Smith 675dc70f23 Merge branch 'develop' into feature/musician_profile_enhancements 2015-02-13 00:49:44 -05:00
Seth Call 8d60f161f5 * add new landing ad for kickstarter 2015-02-12 20:46:39 -06:00
Steven Miers aedcbde1f3 Merge with develop 2015-02-12 14:32:12 -06:00
Jonathan Kolyer 5e6a63db2e VRFS-2700 added rec_* site types to site validation 2015-02-12 08:16:54 +00:00
Brian Smith 9ede0912a1 Merge branch 'develop' into feature/musician_profile_enhancements 2015-02-07 23:22:48 -05: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 ed47441f67 VRFS-2698 refactoring website_validate to url_validate 2015-02-06 07:43:24 +00:00
Brian Smith 3cdcadda94 merge develop 2015-02-03 23:39:21 -05:00
Brian Smith 8d19e4510e VRFS-2693 VRFS-2694 wip new musician profile models 2015-01-31 16:07:34 -05:00
Jonathan Kolyer fdcc77ae80 VRFS-2697 url format and site validation 2015-01-31 08:41:56 +00:00
Jonathan Kolyer 16092ba816 VRFS-2697 website validator initial commit 2015-01-31 04:50:05 +00:00
Seth Call 9c9a42c2a5 * merged 2015-01-23 13:56:10 -06:00
Seth Call 372444ebd1 * wip 2015-01-23 10:50:58 -06:00
Seth Call 698f4ba648 * wip 2015-01-21 15:22:31 -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
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 21f25e51d0 VRFS-1985 VRFS-2252 added tests 2015-01-12 01:20:19 -05:00
Seth Call 5ac69fc646 * wip 2015-01-09 16:11:04 -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
Seth Call cc3bf2ce1f * wip 2015-01-08 20:35:39 -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
Seth Call cdf9579ada * fix port clash on tests 2014-09-26 12:57:37 -05:00
Seth Call b87ff571ce * VRFS-1073 - support multiple websocket gateways 2014-09-24 14:27:56 -05:00
Seth Call 61f0bd2aa0 * merged 2014-09-22 14:20:58 -05:00
Seth Call 6f463b7b6c * adding steven to dev users 2014-09-20 21:25:57 -05:00
Seth Call d2cd527f10 * fix preferences window not showing 2014-09-15 07:45:17 -05:00
Seth Call 2bd189b697 * VRFS-2159 merge 2014-09-12 22:30:51 -05:00
Seth Call 7761c2e9a8 * VRFS-2155 fix passing of yellow 2014-09-10 09:25:43 -05:00
Seth Call 554d100c31 * VRFS-1962, VRFS-2047, VRFS-2046, VRFS-2006 - score breakdown hover and score badges are all tested and working 2014-08-19 20:58:24 -05:00
Seth Call d34929d70b * landing pages in VRFS-2037 2014-08-14 22:23:22 -05:00
Seth Call 30b2c1bb53 * VRFS-2045 - fixing tests that use websocket-gateway, pass in 20 instead of defaulting of 0 for max connections 2014-08-14 13:16:38 -05:00
Seth Call 776704fdf5 * VRFS-2045 - guard against too many concurrent connections 2014-08-14 11:35:17 -05:00
Seth Call 322cdad87d * wip 2014-08-14 10:09:33 -05:00
Seth Call edc805e442 * VRFS-2040 - pass in retry value to backend 2014-08-13 12:51:40 -05:00
Seth Call 4c85740597 * wip 2014-08-13 11:09:52 -05:00
Seth Call 36043ec631 * make the packet size configurabel 2014-08-06 08:11:07 -05:00
Seth Call 00dee99e17 * wip 2014-07-31 20:16:38 -05:00
Seth Call 2aab3c902d * fixing test that failed on build server 2014-07-30 17:29:26 -05:00
Seth Call a11ae44a90 * VRFS-1951 - make sure staging emails don't get sent from my machie 2014-07-30 16:39:59 -05:00
Seth Call dc3fd38af1 * adding bart to dev_users 2014-07-26 14:19:48 -05:00
Seth Call adb0b15555 * fixing bad schedules on scheduler.yml, and wip on admin web reporting 2014-07-25 15:01:14 -05:00
Seth Call 6c4bcd98be * VRFS-1924 - score_history added 2014-07-21 16:42:30 -05:00
Seth Call 5f131f9407 * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
Seth Call c2a5936720 * wip 2014-07-14 15:53:04 -05:00
Brian Smith 3bc94249ca VRFS-1497 VRFS-1749 added resque job to clean stale sessions, added tests for session scheduler and session cleaner jobs 2014-07-11 02:23:10 -04:00
Seth Call 63dfb8929c Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-06-30 15:44:38 -05:00
Seth Call cbe4bf1747 * VRFS-1757 - updated signin dialog to 'modern' standards; VRFS-1826 - 2/3 fixed 2014-06-30 15:44:28 -05:00
Bert Owen 07d96d7a57 VRFS-1667, VRFS-1729 implemented account session page, session detail page 2014-06-29 15:54:51 +02:00
Brian Smith e211871168 merge develop 2014-06-23 01:09:03 -04:00
Seth Call 9e92125b59 * VRFS-1653 - websocket reconnect wasn't working if no connect on initial connect 2014-06-19 18:51:47 -05:00
Brian Smith b4151c27e9 VRFS-1669 VRFS-1672 session settings dialog / find session work 2014-06-19 00:21:34 -04:00
Seth Call 106222638f * VRFS-1684 and VRFS-1686 - updating stored procs, added /api/sessions/nonactive/, adding a bunch of tests for sms_index 2014-06-17 14:10:24 -05:00
Seth Call f680fafaf3 * VRFS-1684 - adding latency to participants and approved_rsvps JSON response. 2014-06-16 15:41:37 -05:00
Brian Smith 5fc9696d01 merge develop 2014-06-11 08:45:34 -04:00
Seth Call 4a603cbaa2 * VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives 2014-06-09 15:43:16 -05:00
Brian Smith a9b67a9a6b VRFS-1693 resque job to schedule recurring music sessions 2014-06-03 01:10:25 -04:00
Jonathan Kolyer 0edacbe3e2 merging with develop 2014-05-31 21:07:18 +00:00
Jonathan Kolyer 689e0a8609 VRFS-1664 new musicians emailer 2014-05-31 09:36:10 +00:00
Brian Smith ae79912dab merge develop 2014-05-31 07:41:59 -04:00
Jonathan Kolyer 30037bc967 VRFS-1698 removed sendgrid email error handling 2014-05-31 09:03:18 +00:00
Seth Call 6ad607cd24 * fixing latency tester's page 2014-05-29 16:52:50 -05:00
Seth Call 7da75e94d9 * VRFS-1575 2014-05-29 14:44:37 -05:00
Seth Call dff3fa4870 *wip 2014-05-29 14:44:37 -05:00
Seth Call e4da30f39e * wip 2014-05-29 14:39:08 -05:00
Seth Call 05666f7927 wip 2014-05-29 14:34:18 -05:00
Seth Call df5fae1981 * wip 2014-05-29 14:32:46 -05:00
Jonathan Kolyer 243e06533b VRFS-1665 scheduled session impl 2014-05-29 07:19:55 +00:00
Brian Smith 7a4ad83cef merge develop 2014-05-29 00:20:09 -04:00
Brian Smith f31248815d VRFS-1670 session info page work 2014-05-26 23:52:59 -04:00
Bert Owen 7fc2575588 fix routes 2014-05-26 14:25:53 +08:00
Bert Owen 972af58888 fix tests 2014-05-26 13:49:54 +08:00
Bert Owen bc0e3ba0eb VRFS-1681 cleanup unused notation files 2014-05-26 01:30:10 +08:00
Bert Owen fbeddf1735 VRFS-1682, VRFS-1679 : upload music notation, download music notation 2014-05-24 02:58:59 +08:00
Bert Owen 5685e2f0e8 VRFS-1678 added music session update feature 2014-05-22 17:49:35 +08:00
Bert Owen 00d06fe6f2 * merge 2014-05-22 16:07:17 +08:00
Bert Owen 57f1fab935 VRFS-1677 fixed 2014-05-22 16:02:48 +08:00
Brian Smith b4f7035fed Merge branch 'feature/sched_sessions_rsvps' into feature/scheduled_sessions 2014-05-22 00:42:50 -04:00
Brian Smith 03eb125fa8 Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-22 00:42:33 -04:00
Jonathan Kolyer 3891cea86d VRFS-736 updated for user_progress_emailer 2014-05-21 22:45:06 +00:00
Bert Owen a1f288fe4d VRFS-1676 fixed 2014-05-22 03:11:50 +08:00
Bert Owen 1904c8f474 VRFS-1675 completed 2014-05-22 00:24:40 +08:00
Brian Smith 7f5940ac01 VRFS-1739 API for RSVP slots 2014-05-21 01:36:32 -04:00
Brian Smith f793b14879 VRFS-1738 more RSVP API work 2014-05-21 00:57:32 -04:00
Bert Owen 22f4d0ffc5 Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions 2014-05-20 21:26:55 +08:00
Bert Owen cebbd869cb VRFS-1675 add join session feature 2014-05-20 21:26:32 +08:00
Brian Smith 96f62b1364 VRFS-1690 VRFS-1691 VRFS-1692 RSVP API work 2014-05-20 02:45:00 -04:00
Seth Call d11261c5c6 * VRFS-1730 - websocket on web layout 2014-05-20 00:33:43 -04:00
Brian Smith d665a09080 scheduled session rsvp wip 2014-05-20 00:31:26 -04:00
Seth Call 1f86b809ff * VRFS-1730 - websocket on web layout 2014-05-19 16:57:08 -05:00
Bert Owen cdc9d121cb VRFS-1674 Create Session API 2014-05-19 23:35:38 +08:00
Brian Smith dce007a13d VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres 2014-05-18 22:31:25 -04:00
Brian Smith 8fc30baf42 VRFS-1668 more notification work 2014-05-18 00:09:21 -04:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -05:00
Seth Call 5f1ea4c754 * merging manifest 2014-05-07 05:17:17 -05:00
Seth Call 7dd1e6c464 * renaming of tables in 2014-05-06 17:50:41 -05:00
Seth Call 732fd66f0e * all tests pass; but need to now rename music session tables to match class names... 2014-05-06 16:17:26 -05:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Bert Owen 7d3ac6fc54 VRFS-1503 implement session chat feature 2014-05-03 00:33:27 +08:00
Bert Owen bf04fca205 VRFS-1503 implement session chat feature 2014-05-03 00:30:56 +08:00
Seth Call c0ce26c602 * fixing tests for: * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup) 2014-05-01 14:09:33 -05:00
Jonathan Kolyer b1be072c6c VRFS-1577 VRFS-736 2014-05-01 01:48:57 +00:00
Seth Call ad266e5b80 * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup) 2014-04-30 15:29:10 -05:00
Jonathan Kolyer 968dff2829 VRFS-1577 VRFS-736 2014-04-30 16:44:37 +00:00
Seth Call 9820562892 * more websocket/heartbeat fixes 2014-04-30 03:01:28 +00:00
Seth Call 00a6139cd1 * merged 2014-04-29 14:04:26 +00:00
Seth Call 26dc80436c * merging build script 2014-04-24 18:07:52 +00:00
Seth Call f9e035e621 * adding db 1/0 to test mode 2014-04-23 21:52:35 +00:00
Seth Call 29dfba8276 * fix startup of eventmachine when in unicorn/production mode (fixes or could fix: VRFS-1636 VRFS-1637 VRFS-1642 VRFS-1643 2014-04-23 15:08:19 +00:00
Bert Owen 3921324b32 VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:34:59 +02:00
Bert Owen 07e141cc8f VRFS-1503 added protocol buffer, chat message model & controller, rest api 2014-04-23 14:27:49 +02:00
Jonathan Kolyer 7b2d124b33 VRFS-1576 affiliate report view integration 2014-04-23 06:38:49 +00:00
Seth Call 0a811a147c * adding bert as a dev user 2014-04-16 17:13:55 +00:00
Seth Call 83038cf315 * tweak hover code 2014-04-11 14:45:54 +00:00
Seth Call cc7bbf3f6a * resolved merge 2014-04-09 18:31:40 +01:00
Seth Call 95f1a59851 * VRFS-1404 reconnect with tests 2014-04-09 18:25:52 +01:00
Seth Call 79c243a20b * automatic reconnect dialog will guide user without having to click - VRFS-1404 2014-04-07 17:36:08 +01:00
Jonathan Kolyer 880027a87f VRFS-736 added liked us tracking to email footer icons for twitter/fb/goog 2014-04-07 07:54:17 +00:00
Jonathan Kolyer 15090e3c70 VRFS-1483 error collector; cleanup 2014-04-05 21:25:47 +00:00
Seth Call 700ef04edf * VRFS-1531, and a fix for feed test having 'dirt' in it from other tests. also reverting batch mailer test 2014-04-04 23:16:38 +01:00
Seth Call 90eb0bc081 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-04-02 00:43:10 +01:00
Seth Call 39bd83ae5a * launch app test 2014-03-28 04:00:57 +00:00
Seth Call 4aece93b87 * run websocket-gateway in spec_helper intsead of initializer for tests VRFS-1509 2014-03-21 04:44:34 +00:00
Seth Call b058f19692 * VRFS-1493 - redirect to forums implemented, VRFS-1507 (signin url preserved on postback failure) 2014-03-21 03:23:33 +00:00
Seth Call 7cdd47ac89 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-20 11:53:35 +00:00
Seth Call b04c7bcea5 * VRFS-871 - user-to-user messaging complete 2014-03-20 11:53:26 +00:00
Jonathan Kolyer 22104e3a97 VRFS-1483 undoing accidently checkin of wsg connect params 2014-03-19 16:38:59 +00:00
Jonathan Kolyer 0987cf2cf8 VRFS-1483 editing batch emails 2014-03-19 16:37:03 +00:00
Scott Comer ddabbcecc5 fix countries to use labels for users, bands, and new signups 2014-03-17 22:20:41 -05:00
Seth Call 9324725e3c * VRFS-1451 - fix broken signup link when clicked more than once 2014-03-15 01:25:37 +00:00
Seth Call 164a4fdbe1 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-11 07:41:18 +00:00
Seth Call c9438fcf99 * feed shows items. no scrolling, no support for query modification yet 2014-03-11 06:09:44 +00:00
Brian Smith 20ad17608e stub press release link correctly 2014-03-10 23:40:14 -04:00
Seth Call 7df02c0778 * merging manifest 2014-03-10 07:13:01 +00:00
Brian Smith b13dcef4f1 VRFS-1399 media center content 2014-03-10 01:41:06 -04:00
Seth Call 3c5a14312a * Event page 'chrome' is setup and pulling from database--now to add band logic 2014-03-09 22:58:57 +00:00
Seth Call 5a8c3886fd Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-03-09 18:05:39 +00:00
Seth Call 000dd3fdd0 * VRFS-1253 - working in a basic sense with pagination 2014-03-09 18:04:56 +00:00
Jonathan Kolyer 713344a7a7 merge conflict 2014-03-08 20:50:51 +00:00
Seth Call 8d0faa9b81 * adding test method to check 'local' behavior 2014-03-07 20:52:00 -06:00
Seth Call faed48271b * VRFS-1372 resolved, and not requiring local only until figure out some deployment issues 2014-03-07 14:20:34 -06:00
Jonathan Kolyer eb98b97cd5 merge conflict 2014-03-07 06:53:35 +00:00