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

1620 Commits

Author SHA1 Message Date
Seth Call bf4044d92e * VRFS-3422 - don't die if the user has on sale_line_items 2015-08-19 09:24:14 -05:00
Seth Call 87c62b4db2 * a fix for linux? hfa code 2015-08-19 08:29:22 -05:00
Seth Call d045c94f54 * more HFA request polish 2015-08-19 07:17:37 -05:00
Seth Call 5ba03a2755 * VRFS-3431 - better response when creating HFA request 2015-08-18 20:41:37 -05:00
Seth Call f6101f3621 VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing 2015-08-18 14:26:41 -05:00
Steven Miers 6edb4b6012 Merge with develop 2015-08-15 17:18:15 -05:00
Steven Miers c1927dd20a VRFS-3359 : Teacher API detail method 
* Now includes sub-records: genres, instruments, languages, subjects
* Test to verify
 2015-08-15 16:35:51 -05:00
Seth Call e62d9e126f * VRFS-3435 allow multiple onboarders to execute 2015-08-15 06:22:46 -05:00
Seth Call ee6493afd3 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-08-13 11:10:04 -05:00
Seth Call d36999032f * expand part size 2015-08-13 11:09:54 -05:00
Seth Call 795f0b5375 * allow a non-video client into a session on a server configured with video 2015-08-10 11:05:24 -05:00
Seth Call aec3d106fa * more scopes for onboarding 2015-08-09 17:27:30 -05:00
Seth Call af355ec096 * get activeadmin working for JamTracks after onboarding enhancements were added 2015-08-09 13:47:49 -05:00
Seth Call 557e19e5e7 * allow better onboarding of JamTracks including audio from Tency Music (VRFS-3296, VRFS-3386) 2015-08-09 13:37:43 -05:00
Steven Miers 8908ef3081 VRFS-3359 : Validations and tests for introductory video. 2015-08-08 15:01:38 -05:00
Jonathan Kolyer c11cc5eb9e added fixmes for sql injection vulnerabilities 2015-08-04 14:11:46 +00:00
Jonathan Kolyer aa36b2f215 merging develop 2015-08-04 13:44:47 +00:00
Steven Miers c89d537904 VRFS-3359 : Teacher profile, staged validations and specs. 2015-07-28 14:00:14 -05:00
Steven Miers 98110f68bc VRFS-3359 : Save and test other segments of teacher profile. 2015-07-27 17:00:39 -05:00
Steven Miers 460783a5aa VRFS-3359 : Teacher models, relationships, some validations, and initial tests. 2015-07-27 10:02:37 -05:00
Steven Miers 82aa6bb244 Use scopes to clean up. 2015-07-21 19:14:18 -05:00
Steven Miers 1262dbfcc6 VRFS-3316 : Reviews : routes and api controller 
* Expose review query methods as an API/rest interface.
* Required updates to model
* Spec to verify
 2015-07-21 14:47:35 -05:00
Steven Miers bd4b3380c2 VRFS-3316 : Review query method and spec to verify. 2015-07-20 20:33:20 -05:00
Steven Miers 74b8c81a8a VRFS-3316 : Review query method and spec to verify. 2015-07-20 19:11:52 -05:00
Steven Miers 2c594bf783 VRFS-3316 : Reduce method to roll up reviews 
* Creates review_summaries
* Calculate and store wilson score
* Unit tests
 2015-07-20 16:49:22 -05:00
Steven Miers 4b52d97a64 VRFS-3316 : Review summary uniqueness validation and spec. 2015-07-20 11:35:16 -05:00
Steven Miers 0beb386bea VRFS-3316 : Review Uniqueness validation and spec. 2015-07-20 11:29:19 -05:00
Steven Miers 91a8b4ab9c VRFS-3316 : Reviews/Ratings 
* schemas for reviews and review_summaries
* migrations
* models
* validations
* initial specs to verify creation of reviews and review_summaries with
a jamtrack and subsequently, various validations.
 2015-07-20 11:01:08 -05:00
Steven Miers d999978f84 VRFS-3335 : Conditional validation for hourly rate and daily minimum when editing profile. 
* Use conditional validation on server side
* Don’t always convert empty to 0 on client side
* On view, manipulate visibility of dependent items through classes.
 2015-07-17 13:42:48 -05:00
Seth Call c5033435f2 * fixing feed_spec 2015-07-17 07:18:27 -05:00
Seth Call be26beae09 * fix band_spec intermittent test 2015-07-16 13:12:48 -05:00
Seth Call efe3dea8e3 * updating Rails to 3.2.22 to allow compat with ruby 2.2.2 2015-07-16 10:58:03 -05:00
Steven Miers f389f07b52 VRFS-3338 : Tests for genre validation behavior. 2015-07-15 19:33:10 -05:00
Steven Miers 7f35bab8c7 Fixes VRFS-3338 : Set & validate genres on updates to a valid band. 2015-07-15 18:56:45 -05:00
Seth Call 393696a0f8 * fixing ruby tests and trying to harvest up db deb's better 2015-07-15 11:25:58 -05:00
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
Jonathan Kolyer 4f2f37f7a9 removed latency as search; fixed regressions 2015-06-28 19:49:02 +00:00
Jonathan Kolyer 4f897fc6aa VRFS-3036 fixed typo referencing old constant SKILL_VAL_STRS 2015-06-28 04:00:44 +00:00
Steven Miers cfda14e16e VRFS-3190 : Merge with latest develop branch 2015-06-16 12:23:57 -05:00
Steven Miers 02be103694 VRFS-3190 : Fix band model tests 2015-06-15 19:09:25 -05:00
Steven Miers 8cd3b836ea VRFS-3247 : Band's online presence and performance samples specify foreign key so it won’t default to a nonexistent field name. 2015-06-10 15:31:36 -05:00
Jonathan Kolyer ebe620a3b3 VRFS-3036 fixed performance sample query and test 2015-06-10 16:35:39 +00:00
Seth Call 0dbbfc0ee7 * VRFS-2855 - broadcast notifications done 2015-06-10 08:26:45 -05:00
Jonathan Kolyer 745c448e6b VRFS-3036 CSS tuning and integration testing 2015-06-09 06:46:34 +00:00
Jonathan Kolyer 0691e079af VRFS-3036 description testing 2015-06-04 08:11:41 +00:00
Jonathan Kolyer 965ee2e0bc VRFS-3036 tests for description 2015-06-04 07:38:16 +00:00
Jonathan Kolyer 3eca6aeee5 Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-06-04 05:59:31 +00:00
Jonathan Kolyer 56af10afb3 VRFS-3036 results / builder page swpping 2015-06-04 05:54:02 +00:00
Steven Miers 6c5ffd6644 VRFS-3246 : Cleanup code and style 2015-06-03 16:34:37 -05:00
Steven Miers d5a8959677 Merge with develop. 2015-06-03 14:22:21 -05:00
Jonathan Kolyer dde84587b9 VRFS-3036 syncing ui/json 2015-06-03 06:41:21 +00:00
Steven Miers d60eff50ba VRFS-3246 : Support online presences and performance samples through sub-widget. Incremental. 2015-06-02 15:13:41 -05:00
Steven Miers bd8287b528 VRFS-3246 : Remove references to current_user, change to target_player. 2015-05-31 21:50:04 -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 de4411fbdd * add preview text and preload master on landing page 2015-05-28 13:52:20 -05:00
Seth Call 31a0803019 * VRFS-3226 - default WDM to 48000 on selection. fix bad filter logic for monthly payments (VRFS-3030) 2015-05-28 08:53:24 -05:00
Seth Call d959a17be4 * affiliate program in place VRFS-3030 2015-05-28 08:20:14 -05:00
Jonathan Kolyer 4f5a39db18 VRFS-3036 band results display 2015-05-27 15:08:04 +00:00
Jonathan Kolyer 1bd1794318 VRFS-3036 band web search args 2015-05-27 08:20:46 +00:00
Jonathan Kolyer 8480f582ad VRFS-3036 tuning band search filter spec 2015-05-27 05:08:56 +00:00
Jonathan Kolyer f66cf79cf2 VRFS-3036 band search filter tests 2015-05-27 04:10:05 +00:00
Jonathan Kolyer 9757712977 VRFS-3036 testing filter by key 2015-05-27 02:58:04 +00:00
Jonathan Kolyer 7edee8d494 VRFS-3036 first pass testing 2015-05-26 08:43:11 +00:00
Jonathan Kolyer 2f28d3a342 VRFS-3036 band query 2015-05-26 06:39:43 +00:00
Jonathan Kolyer cb7b48b4ec VRFS-3036 band search querying 2015-05-22 12:09:14 +00:00
Jonathan Kolyer da58ac6eab merging 2015-05-22 08:20:07 +00:00
Jonathan Kolyer 3af55a3c14 VRFS-3036 tohire builder 2015-05-21 05:47:14 +00:00
Seth Call 8a82f86e64 fix the fully redeemed count 2015-05-20 10:17:01 -05:00
Seth Call c96f0a7859 * VRFS-3260 - fraud check code and admin helpers complete 2015-05-20 09:24:17 -05:00
Jonathan Kolyer 8d3247e084 VRFS-3036 to hire builder 2015-05-20 09:24:53 +00:00
Jonathan Kolyer 1a91704532 VRFS-3036 band search filters 2015-05-20 06:25:22 +00:00
Steven Miers f16bd28574 VRFS-3243 : Ability to selectively skip genre validation 2015-05-19 13:32:15 -05:00
Jonathan Kolyer e794ccc7af VRFS-3036 bands to_join builder controls 2015-05-19 05:48:29 +00:00
Jonathan Kolyer d76f54b40e VRFS-3036 fixed broken merge 2015-05-19 00:52:35 +00:00
Jonathan Kolyer 21f90d7352 merging 2015-05-19 00:45:53 +00: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 792212e952 * VRFS-3260 - disable fraud 2015-05-15 23:28:46 -05:00
Seth Call 0264c539b1 *hardcoding https where http is found 2015-05-15 18:25:47 -05:00
Seth Call 8e7ebcf3d6 * VRFS-3236 - update landing pages for jamtracks 2015-05-15 15:02:00 -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 c5ee5a58fd VRFS-3242 : Fix one last reference to user_id. 2015-05-13 23:23:30 -05:00
Steven Miers 11f60b71e4 VRFS-3242 : Schema and model changes required for band profile functionality. 
* Additional attributes for band_type, band_status, concert_count,
add_new_members, play_commitment, touring_option, paid_gigs,
hourly_rate, gig_minimum
* For joined table musician_instruments, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table performance_stamples, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table online_presences, remove the hard requirement that
they be joined to a user, rather a “player” that is polymorphic.
* Change models as appropriate with new attributes and modify
belongs_to / has_many directives as necessary.
* Fix existing usages of user_id to work with polymorphic player_id.
* Fix tests that use user_id
* Add new tests that exercise online_presence, performance_samples, and
instruments that target a band, rather than a user.
 2015-05-13 21:06:14 -05:00
Steven Miers 193888f960 VRFS-3242 : Merge with latest develop 2015-05-13 20:56:58 -05:00
Seth Call 831fdf8c8e * add https to artifact update 2015-05-12 11:55:55 -05:00
Seth Call 64a64e99bb * VRFS-2680 - try out audiomixer/quick mixer without secure PUT 2015-05-12 08:47:26 -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 f2aba1e390 * VRFS-3235 - download helper 2015-05-11 11:15:57 -05:00
Jonathan Kolyer 6fb07d8a31 VRFS-3036 more refactoring 2015-05-07 19:02:21 +00:00
Jonathan Kolyer 13c1c5311e VRFS-3036 more refactoring 2015-05-07 19:02:21 +00:00
Jonathan Kolyer 0b64986766 VRFS-3036 refactoring musician_search into base_search for band_search 2015-05-07 19:02:21 +00:00
Jonathan Kolyer 674d1de2d3 VRFS-3036 refactoring band search 2015-05-07 19:02:21 +00:00
Jonathan Kolyer 7e2e5241bf VRFS-3036 refactoring musician_search into base_search for band_search 2015-05-07 19:02:21 +00:00
Jonathan Kolyer 5a6049c935 VRFS-3036 more refactoring 2015-05-07 18:08:36 +00:00
Jonathan Kolyer 6a23477c4e VRFS-3036 more refactoring 2015-05-07 17:11:24 +00:00
Jonathan Kolyer 4658f72f98 VRFS-3036 refactoring musician_search into base_search for band_search 2015-05-07 14:41:27 +00:00
Seth Call 12eeb460a3 * VRFS-3212 - track counts of concurrent packaging attempts 2015-05-07 08:49:15 -05:00
Jonathan Kolyer 749c58f377 VRFS-3036 refactoring band search 2015-05-07 13:21:53 +00:00
Jonathan Kolyer ce3bf635f0 VRFS-3036 refactoring musician_search into base_search for band_search 2015-05-07 12:55:13 +00:00
Seth Call 05f5cd619a * VRFS-3193 - indicate on jamtrack browse page that 1st jamtrack is free 2015-05-05 16:38:29 -05:00
Seth Call ceb00c1735 * remove jamtrack download ready notification 2015-05-05 14:36:07 -05:00
Seth Call 96df8cbfea * disabling teaspoon gemfile for now, because of weird errors; and also VRFS-3176 (jamtrack preview regen task) 2015-05-05 11:44:28 -05:00
Seth Call d13204336b * VRFS-3189 - don't include master track when checking for instruments 2015-05-04 22:06:35 -05:00
Seth Call f31a40343e * add jmep as warning to onboarding flags column 2015-05-04 21:45:26 -05:00
Seth Call 4d28915381 * VRFS-3177 - add spinner to playback and stop preloading all media on page 2015-05-04 17:48:14 -05:00
Seth Call 9144efb8fa * VRFS-3175 - order filter by band dropdown 2015-05-04 14:50:27 -05:00
Seth Call d77ee8cd23 * VRFS-3173 - stats on active sessions 2015-05-04 14:37:49 -05:00
Steven Miers 4c4121e4d7 Merge with latest develop 2015-05-01 20:00:08 -05:00
Steven Miers 571ae9a3d6 VRFS-3007 : Fix another musician search issue and a few tests. 2015-05-01 13:22:34 -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 5b43688443 VRFS-3007 : Fix failure on musician search spec. 2015-04-29 15:34:28 -05:00
Steven Miers cf515a9cf0 VRFS-3007 : Fix tests and models failing due to PermissionError 2015-04-29 12:56:16 -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 907e2a4552 * fix jamtrack shopping tests for the change in button text 2015-04-27 13:42:03 -05:00
Seth Call 933d56524c * poke downloaded_since_sign on jamtrackright page 2015-04-24 14:58:31 -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 05b4b8f3fa * VRFS-2605 -tested mixer manifest with latest client with jamtrack offsets and all of that 2015-04-22 14:02:44 -05:00
Seth Call 49ef08ff5d * prepare production db for preview URLS, and save jam_track after setting duration in the sync task 2015-04-22 09:44:57 -05:00
Seth Call 1ce41c5a54 * VRFS-2605 - refining jamtrack offset values and manifest for audiomixer, and fixnig bug with jamtrack monitoring applied to playcontrols.js by accident 2015-04-21 16:24:10 -05:00
Seth Call 655f59fc52 * remove puts 2015-04-21 14:08:16 -05:00
Seth Call ed0d69db13 * require tzinfo explicitely 2015-04-21 13:54:08 -05:00
Seth Call 556347f35b * VRFS-2605 compute offset and seeks in manifest 2015-04-21 13:46:33 -05:00
Seth Call 03072b2e8d * VRFS-2605 - compute offset and seek based on client info 2015-04-21 11:26:55 -05:00
Seth Call c29af72938 * fix jamtrack landing page formatting VRFS-3056 2015-04-20 22:13:30 -05:00
Seth Call b60ded91d7 * fix typo in JamTrack download notification VRFS-3064 2015-04-20 13:58:58 -05:00
Seth Call 0236353ee7 VRFS-3048 - resync task for audio updates to existing jamtracks 2015-04-20 13:56:05 -05:00
Seth Call 9480aadaae Conflicts: 
ruby/lib/jam_ruby/models/jam_track_track.rb
 2015-04-20 13:55:33 -05:00
Seth Call 022304c6af * VRFS-3065 - permission error name change 2015-04-20 10:42:09 -05:00
Seth Call 375ec7008d * wip 2015-04-20 10:42:00 -05:00
Seth Call 1763c151bd * VRFS-3061 - deal with shopping cart porting over correctly when user logs in during shopping 2015-04-19 16:40:35 -05:00
Seth Call fc99fbce6c * VRFS-3058 - fix uniqueness constraint on ShoppingCart and test 2015-04-19 11:43:54 -05:00
Seth Call 3c37cbbf59 * VRFS-3042 - remove duplicate registrations on pagination 2015-04-17 14:01:07 -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 005dfdaa91 Merge branch 'feature/jam_track_analytics' into develop 2015-04-16 11:11:07 -05:00
Steven Miers 705e67a810 VRFS-2874 : Clean up code and logic - fixes problem of false positive. 2015-04-16 00:21:45 -05:00
Steven Miers 4db40f6d3b VRFS-2874 : Some prerequisite functionality required for analytics. 2015-04-15 18:22:55 -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 75f1098ca3 Merge branch 'develop' into feature/musician_profile_enhancements 2015-04-14 03:13:27 -04:00
Seth Call 1183d0790c * add default to exiting sales databases 2015-04-13 16:05:43 -05:00
Seth Call eee6be5d0b * VRFS-2978 - give temporary pass to payment screen if you just filled out info 2015-04-13 15:54:23 -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
Brian Smith 5a4157c563 check for nil 2015-04-10 20:19:53 -04: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
Seth Call 974049f204 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-04-08 14:36:48 -05:00
Seth Call 42dac058e1 VRFS-2884 - Update things in session and FTUE for default profile 2015-04-08 14:34:05 -05:00
Steven Miers 3fd659c3df VRFS-3019 : Fix :group_artist option on JamTrack query to not also group by id, like the regular version of the query. 2015-04-08 12:53:09 -05:00
Brian Smith 0a451742ef merge develop 2015-04-06 21:26:54 -04:00
Jonathan Kolyer 086b3bc3c4 VRFS-2795 styling and descriptions 2015-04-04 20:26:41 +00:00
Jonathan Kolyer e0d2feb84d VRFS-2795 pagination 2015-04-04 17:29:15 +00:00
Jonathan Kolyer e4795d9297 VRFS-2795 fixed filter description issue 2015-04-04 15:36:15 +00:00
Jonathan Kolyer e563ad0d8b Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-04-04 14:56:36 +00:00
Brian Smith 91e9e73644 VRFS-2701 adding SoundCloud/YouTube sources fully functional 2015-04-04 21:46:37 -04:00
Jonathan Kolyer 4fbf3e694d VRFS-2795 filter description & spec tests; support for reset, cancel buttons; proper display and update impl 2015-04-04 14:55:41 +00: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 4f7c43b9d8 VRFS-2795 cloning old search code into new musician_search 2015-04-02 14:52:16 +00: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
Steven Miers 4c2d4958fe VRFS-2894 Update email / user info in recurly upon finalize. Test to verify. 2015-03-31 20:25:54 -05:00
Seth Call b1b2d3ad24 * VRFS-2869 - band landing page 2015-03-31 16:17:17 -05:00
Seth Call 47c6b3ec16 * VRFS-2870 - tests add for individual jam track song page 2015-03-31 15:17:43 -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
Seth Call 3d43f123b1 * VRFS-2992 -make mp3 as well as ogg preview 2015-03-29 21:51:14 -05:00
Brian Smith 83c00ea6e4 merge develop 2015-03-29 10:12:42 -04:00
Steven Miers 401fd43849 Merge branch 'feature/jam_track_ui_2' into develop 2015-03-27 15:48:08 -05:00
Steven Miers 4f08f6acad Merge and fix 2015-03-27 09:54:01 -05:00
Seth Call e2957592ea VRFS-2605 - audiomixer manifest updated for volume and offsets 2015-03-26 17:45:23 -05:00
Steven Miers 3f994e3993 Merge branch 'develop' into feature/jam_track_ui_2 2015-03-26 11:59:49 -05:00
Steven Miers bb4ea7cd94 Merge branch 'feature/jam_track_ui_2' of bitbucket.org:jamkazam/jam-cloud into feature/jam_track_ui_2 2015-03-26 11:59:42 -05:00
Seth Call ef78471b59 Merge cherry pick 2015-03-26 11:58:41 -05:00
Seth Call 4a36bc6982 * VRFS-2988 - relax position duplication constraint 2015-03-26 10:16:14 -05:00
Jonathan Kolyer 21322318d8 VRFS-2795 latency ordering 2015-03-26 06:28:38 +00:00
Jonathan Kolyer f3344affaf VRFS-2795 distance sort order 2015-03-26 05:56:43 +00:00
Jonathan Kolyer 9eeb0e454b VRFS-2795 merging with feature/musician_profile_enhancements 2015-03-26 03:31:21 +00:00
Seth Call 0848a59082 * merged develop again 2015-03-25 14:32:03 -05:00
Seth Call f0c4647ef5 * VRFS-2981 - check for create_type = nil in scheduled_rsvp 2015-03-25 11:26:32 -05:00
Seth Call 53ef0f1b4f VRFS-2975 - change jam track Id to varchar(64) 2015-03-25 11:11:10 -05:00
Steven Miers 5f953d1b19 VRFS-2830 : Merge / manual fix 2015-03-25 10:56:24 -05:00
Seth Call 18563ff065 * VRFS-2890 fix infinite scroll as well as bug with limit vs per_page style scrolling 2015-03-24 14:59:20 -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
Seth Call 1c0407cca4 * wip 2015-03-24 10:19:21 -05:00
Brian Smith 9face3b3f9 VRFS-2701 wip presence/sample edit 2015-03-23 16:27:36 -04: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
Seth Call 04aa1a9b3c * wip 2015-03-23 08:52:52 -05:00
Brian Smith 96a816f317 merge develop 2015-03-21 10:06:53 -04:00
Seth Call b137d7586f * VRFS-2973 - fix pagination in jam trackdialog 2015-03-20 21:27:11 -05:00
Seth Call 36b4179492 * VRFS-2972 - adding test purchase feature to jam-admin for buying all JamTracks (admin users only) 2015-03-20 17:26:56 -05:00
Seth Call f29a9d7465 * wip 2015-03-20 16:15:13 -05:00
Seth Call 49368e2e66 Merge branch 'hotfix/recording_fix' into develop 2015-03-20 11:26:50 -05:00
Seth Call 10f25be8c4 * replace old style of volume changes VRFS-2964 2015-03-20 08:53:34 -05:00
Seth Call 661c4ed446 * wip 2015-03-20 08:48:00 -05:00
Steven Miers abb31c4e40 VFFS-2830 : Jam tracks account overview 2015-03-17 13:52:30 -05:00
Seth Call bb35535262 * VRFS-2941 - fix meddling of mount_uplaoder with existing URS 2015-03-17 10:55:16 -05:00
Brian Smith c91fd0cb0e merge develop 2015-03-17 03:10:22 -04:00
Seth Call ab72438a3f * VRFS-2932 - make preview apply to all jam track tracks 2015-03-16 17:50:38 -05:00
Seth Call 97d469cc85 * wip 2015-03-16 13:27:39 -05:00
Steven Miers f4cd225142 VRFS-2823 : Bugfix and cleanup. 2015-03-15 19:45:58 -05:00
Brian Smith b91bc09817 Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-15 11:09:21 -04:00
Seth Call 7c73e2ab5c * VRFS-2922 - show spinner for pending metronome 2015-03-12 21:53:23 -05:00
Brian Smith 948174f19a VRFS-2701 musical experience bug fix 2015-03-12 21:34:20 -04:00
Seth Call f9e02c5707 Merge branch 'develop' into feature/jam_track_ui_2 
Conflicts:
	admin/app/admin/jam_tracks.rb
	admin/app/views/admin/jam_tracks/_form.html.slim
	admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim
	admin/config/initializers/jam_tracks.rb
	db/manifest
	ruby/lib/jam_ruby.rb
	ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
	ruby/lib/jam_ruby/jam_tracks_manager.rb
	ruby/lib/jam_ruby/models/jam_track.rb
	ruby/lib/jam_ruby/models/jam_track_right.rb
	ruby/lib/jam_ruby/models/jam_track_track.rb
	ruby/spec/jam_ruby/models/jam_track_right_spec.rb
	ruby/spec/jam_ruby/models/jam_track_track_spec.rb
	ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb
	web/app/assets/javascripts/download_jamtrack.js.coffee
	web/app/assets/javascripts/globals.js
	web/app/assets/javascripts/jam_rest.js
	web/app/assets/javascripts/order.js
	web/app/assets/javascripts/playbackControls.js
	web/app/assets/javascripts/session.js
	web/app/assets/stylesheets/client/session.css.scss
	web/app/controllers/api_jam_tracks_controller.rb
	web/app/controllers/api_recurly_controller.rb
	web/spec/controllers/api_jam_tracks_controller_spec.rb
 2015-03-12 08:51:52 -05:00
Jonathan Kolyer 41626860a9 VRFS-2795 replacing musician page with new search filter 2015-03-12 04:39:20 +00:00
Seth Call 9c2a0c79f6 * VRFS-2866 - making listing of JamTracks not require a logged in user 2015-03-11 21:30:56 -05:00
Seth Call f2b453ea19 * VRFS-2917 - shopping cart can be anonymous 2015-03-11 20:55:11 -05:00
Steven Miers 4ebbff42cc VRFS-2823 : Jam Tracks shopping page updates 
* Remove individual labels from search and show a “Filter JamTracks”
label.
* Style
* Add filter box for artist & populate
* Bind events in JS and pass through to api
* Tweak api park from “artist_name” to “artist”
 2015-03-11 15:40:12 -05:00
Seth Call 6c82e00d00 * VRFS-2876 cleaning up preview downloadability in jam-admin 2015-03-11 09:20:45 -05: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 882f2267cf * fixing urls getting messed with my mount uploader 2015-03-09 16:35:39 -05:00
Steven Miers e91ee68d58 VRFS-2822 : Add options to query for both filtering on artist and grouping on artist (to get a list of artists through existing query infrastructure). 2015-03-09 10:11:47 -05:00
Seth Call a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Jonathan Kolyer 33f10e3197 VRFS-2795 fixing search specs 2015-03-09 06:13:56 +00:00
Jonathan Kolyer 8bbfdbc013 VRFS-2795 instrument selection; json posting 2015-03-08 06:13:29 +00:00
Jonathan Kolyer 03321a8166 VRFS-2795 instrument json 2015-03-07 06:19:14 +00:00
Jonathan Kolyer 3549ea117c VRFS-2795 generating json from filter settings 2015-03-06 07:20:14 +00:00
Jonathan Kolyer 2b9bebb438 VRFS-2795 generate JSON from filter settings 2015-03-06 07:03:30 +00:00
Jonathan Kolyer 15559f593f VRFS-2795 sortorder, refactoring 2015-03-06 06:33:38 +00:00
Jonathan Kolyer 3810aecb00 merging feature/musician_profile_enhancements 2015-03-06 05:12:13 +00:00
Brian Smith e658e6f4b5 Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-05 02:18:55 -05:00
Jonathan Kolyer d514a67be5 VRFS-2795 changed gig/studio vals to match profile enhancements branch 2015-03-05 05:51:26 +00:00
Steven Miers ead2921e84 VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result. 2015-03-04 16:13:58 -06:00
Steven Miers 63c45e0a6e VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders. 2015-03-04 16:03:57 -06:00
Steven Miers 2004d48fa1 Merge 2015-03-04 16:03:28 -06:00
Brian Smith 12b610d2cb Merge branch 'develop' into feature/musician_profile_enhancements 2015-03-04 02:03:22 -05:00
Seth Call aba4546e44 Squashed commit of the following: 
* VRFS-2881 use backend audio source info in metronome
* VRFS-2832 add metronome play controls with mode control
* VRFS-2873 straighten out metronome names in frontend
* VRFS-2782 use getMyNetworkState for ntp_stable determination
* VRFS-2864 allow 'cluster' test, a new metronome mode
* VRFS-2861 metronome sounds not always matching frontend
* VRFS-2852 relax idea that only one person can open metronome
* VRFS-2865 metronome sounds not always matching frontend(dup)
* VRFS-2847 metronome volume now moves master and personal both
* VRFS-2835 metronome 'prevent' message is now dialog, not notify
* VRFS-2833 anyone can control volume/mute of metronome
* VRFS-2850 don't prevent metronome if solo session
 2015-03-03 19:06:55 -06:00
Jonathan Kolyer 930166b213 Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2 2015-03-02 12:00:39 +00:00
Jonathan Kolyer 0e9f78ccdd VRFS-2795 search filter front end start 2015-03-02 09:41:53 +00:00
Jonathan Kolyer bfd3f3fac6 VRFS-2795 filled out JSON_SCHEMA 2015-02-28 22:45:43 +00:00
Jonathan Kolyer 171dcb04f0 VRFS-2795 interests filter 2015-02-28 21:18:43 +00:00
Jonathan Kolyer 88315fcc40 VRFS-2795 instrument and genre filtering tests 2015-02-28 20:37:15 +00:00
Jonathan Kolyer d95279e694 VRFS-2795 merging feature/musician_profile_enhancements 2015-02-28 20:18:56 +00:00
Brian Smith 4d133e0043 merge develop 2015-02-28 02:24:23 -05:00
Jonathan Kolyer 2d8748d4ee VRFS-2795 iterating on tests 2015-02-28 04:24:53 +00: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
Steven Miers 2823645a60 Merge with develop & fix manifest. 2015-02-26 17:49:10 -06:00
Steven Miers 030fa1a351 VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result. 2015-02-26 17:43:22 -06:00
Steven Miers bd08b40e71 VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders. 2015-02-26 17:00:01 -06:00
Brian Smith 0c599ca023 Merge branch 'develop' into feature/musician_profile_enhancements 2015-02-25 21:55:57 -05:00
Seth Call 4a7d6925da * wip 2015-02-25 19:56:26 -06:00
Steven Miers ef287187ba VRFS-2782 : Support multiple bit rates for jam tracks: migration, model and test updates. 2015-02-25 17:19:03 -06:00
Seth Call ca9e3706c7 * wip 2015-02-25 16:13:04 -06:00
Seth Call dbaeb8d996 merged 2015-02-25 10:43:21 -06:00
Seth Call 947d649f5f * VRFS-2831 - metronome showing 2015-02-24 17:16:12 -06:00
Steven Miers 9c9c01b2fd VRFS-2785 : Make id fields accessible for admin UI. 2015-02-25 09:41:51 -06:00
Jonathan Kolyer 2ea1259060 merging feature/musician_profile_enhancements 2015-02-24 06:08:33 +00:00
Jonathan Kolyer a2ef5e9859 VRFS-2795 gig and studio tests 2015-02-24 06:06:40 +00:00
Seth Call 9dbf1a3e56 * VRFS-2634 adding version to jamtrack 2015-02-23 09:12:34 -06:00
Jonathan Kolyer 83f3d56238 VRFS-2795 musician search first draft 2015-02-23 06:21:36 +00:00
Brian Smith 20baeb8bd3 VRFS-2701 wip UI changes for musician profile enhancements 2015-02-21 09:20:11 -05: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
Seth Call b09825d188 * VRFS-2791 - unique-ify recorded backing track and backing track IDs 2015-02-18 10:16:47 -06:00
Seth Call 39415cdf22 * remove BPM from jam_tracks 2015-02-17 10:41:49 -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
Brian Smith 09b4ed09a4 VRFS-2696 edit musician profile API enhancements 2015-02-15 08:23:26 -05:00
Brian Smith 4b97807fc8 fix syntax error 2015-02-14 21:14:13 -05:00
Brian Smith 0a1837c4e6 VRFS-2695 VRFS-2696 wip get/update musician profile API changes 2015-02-14 21:02:26 -05:00
Brian Smith 28ff54b000 VRFS-2695 wip new profile API 2015-02-13 03:16:48 -05:00
Brian Smith 8bd311647a VRFS-2693 performance model/tests 2015-02-13 01:32:55 -05:00
Brian Smith 895fb92365 VRFS-2693 VRFS-2694 performance sample model wip 2015-02-11 22:33:10 -05:00
Brian Smith e3f27eeebc VRFS-2694 user presence model tests 2015-02-10 02:44:16 -05:00
Brian Smith 33aef8a380 VRFS-2694 user presence model 2015-02-05 03:34:25 -05:00
Brian Smith 05ba1ea5d3 VRFS-2694 wip user presence model and spec 2015-02-03 23:37:20 -05:00
Brian Smith cce2ce2ffc minor change to ensure current instance session id is used 2015-02-01 17:15:01 -05:00
Brian Smith 79507f5f06 VRFS-2693 VRFS-2694 wip new musician profile models and specs 2015-02-01 08:42:44 -05:00
Seth Call ac1271634d * VRFS-2716 - changes to deal with new getBackingList format, VRFS-2661 - accepting backing_track info in Track.sync (wip) 2015-01-31 15:20:48 -06:00
Brian Smith 8d19e4510e VRFS-2693 VRFS-2694 wip new musician profile models 2015-01-31 16:07:34 -05:00
Steven Miers 33177ddae6 Merge with develop. 2015-01-29 10:55:10 -06:00
Steven Miers 5ed67cc8f6 VRFS-2667, VRFS-2668 : Fix broken spec. 2015-01-29 09:50:13 -06:00
Brian Smith f521f3ba4c VRFS-2689 new ruby models supporting db schema updates 2015-01-29 00:48:24 -05:00
Brian Smith 5a2fbab21c VRFS-2689 user model changes for musician profile enhancements 2015-01-29 00:45:47 -05:00
Steven Miers 63574f5a25 VRFS-2667, VRFS-2668 : list_uploads and list_downloads implementation and tests. 2015-01-28 19:22:36 -06:00
Steven Miers d7fc313d5f VRFS-2665, VRFS-2666 : Create models and relationships for two new tables: backing_tracks and recorded_backing_tracks 2015-01-28 19:22:36 -06:00
Steven Miers 6f8113b374 Merge branch 'develop' into feature/backing_tracks 2015-01-26 12:11:57 -06:00
Seth Call 9c9a42c2a5 * merged 2015-01-23 13:56:10 -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 c70a5ee2bb Merge branch 'develop' into feature/backing_tracks 2015-01-21 14:16:04 -06:00
Brian Smith f80b0e4f66 VRFS-2193 show only active musicians in each feed item detail view for in-progress sessions 2015-01-20 02:21:25 -05:00
Steven Miers cefce67e89 Merge branch 'develop' into feature/backing_tracks 2015-01-19 15:21:13 -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 c5af644a38 * do not accept latency above 10000ms on user model 2015-01-16 17:20:07 -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
Steven Miers c6f03a91b8 VRFS-2498, VRFS-2618 More coherent data model and logic for backing tracks and metronome re: active_music_session_spec. 2015-01-12 17:44:20 -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 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 4d8a7a9bc1 * wip 2015-01-11 15:42:12 -06:00
Steven Miers d0c0c6d01e VRFS-2498, VRFS-2499 : Validations. 2015-01-11 14:15:47 -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 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
Seth Call e28db48e94 * resolving VRFS-2624 - if nil recording_ids, just exit early 2015-01-08 10:25:54 -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
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
Seth Call 405c155c71 * VRFS-2606 get offset time into MM:SS:MLS format 2015-01-07 11:07:26 -06:00
Seth Call 2ff30946e8 * VRFS-2606 - add new tap in fields, support them in activeadmin 2015-01-07 09:30:05 -06:00
Brian Smith 67b1132d24 VRFS-2554 fixed notification for scheduled session with TBD date/time 2015-01-06 21:20:41 -05:00
Steven Miers 18d06096b5 Revert "Fix spec that was magically passing sporadically." 
This reverts commit 4cc70f2082.
 2015-01-05 19:04:08 -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 4cc70f2082 Fix spec that was magically passing sporadically. 2015-01-05 17:47:27 -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 aabbd90b02 * VRFS-2602 change jka to jkz 2015-01-05 14:39:55 -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
Steven Miers 8eb7430d9a One more stray puts. 2015-01-03 11:47:28 -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 5758096f33 * fix bug in connection stats 2015-01-01 21:45:07 -06:00
Jonathan Kolyer 559d2d720d VRFS-2552 update query to include users started scheduled sessions not yet finished 2015-01-01 19:29:18 +00:00
Seth Call 786486026b * wip 2014-12-30 17:10:16 -06:00
Steven Miers bbee617c4b VRFS-1960 : Jam Track Signed Notification, usage in notificationPanel, and spec. 2014-12-22 14:23:05 -06:00
Seth Call 7ca3acb676 * wip 2014-12-22 09:50:59 -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 795cb6f536 Dedicated spec for testing cleaner. Some cleanup/renaming. 2014-12-15 23:57:57 -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
Steven Miers 8ac9d19e73 VRFS-2481 : Use jam_tracks object hierarchy to create jkz file, and upload to AWS. Meshed out spec to verify creation and upload, including a real ogg file (required by the python tool). 2014-12-15 18:02:51 -06:00
Steven Miers ac2daed4da VRFS-2481 : Jam Tracks python layer and source. 2014-12-15 12:16:19 -06:00
Steven Miers f6fef00ea5 VRFS-1952 : Schema changes for proper type and incremental code changes. WIP. 2014-12-15 12:16:19 -06:00
Jonathan Kolyer 93672844f2 VRFS-2529 remove quick-start scheduled sessions from account tab 2014-12-08 06:26:06 +00:00
Brian Smith 937695e829 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-12-07 21:35:36 -05:00
Brian Smith 605bdbcbf6 VRFS-2463 added tests for excluding currently viewed sessions/recordings 2014-12-07 21:35:30 -05:00
Seth Call 53ce955838 * VRFS-2530 - denormalize online for performance reasons 2014-12-07 16:04:10 -06:00
Steven Miers 207b7b9e20 VRFS-1890 : Mechanism to move track up/down, hook up in admin UI. 2014-12-06 14:04:31 -06:00
Brian Smith 354f6320fc VRFS-2463 (1) prevent duplicate claimed recordings from showing in sidebar, (2) only show public recordings and sessions with fan_access=true, (3) exclude recording / session being shown on landing page in the sidebar 2014-12-06 09:34:30 -05: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 9bdddc22ff VRFS-1442 band deletion; band member layout; invitations; band admin support 2014-12-03 08:22:35 +00:00
Jonathan Kolyer 465fd6fa94 VRFS-1442 prepend users bands to band search results 2014-12-03 08:22:34 +00:00
Seth Call 589a2f6cc6 * VRFS-2520 - recordings can be cleaned up now 2014-12-02 17:13:34 -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
Seth Call 6ad844035d Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-21 17:16:21 -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
Brian Smith f0b60f28e4 VRFS-2467 dedup users and instruments on session hover bubble 2014-11-21 01:20:27 -05:00
Seth Call 76adc44a50 * wip 2014-11-17 17:16:30 -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
Brian Smith d65358cea6 VRFS-2442 suppress "Recurs once..." text for non-recurring sessions 2014-11-15 13:01:28 -05:00
Brian Smith 118ed7c39c undo last change re: other instrument id 2014-11-15 11:59:51 -05:00
Brian Smith 12ca12f3cf Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-11-15 11:33:43 -05:00
Brian Smith 8707bb2f16 set instrument ID for unstructured rsvp 2014-11-15 11:33:26 -05: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 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 4e00863de6 * merged 2014-11-07 16:16:25 -06:00
Seth Call 8cad33a303 * recording file/manager fixes and aging of recordings 2014-11-07 16:12:36 -06:00
Brian Smith c6bfd59999 VRFS-2462 fixed session count on musician hover bubble 2014-11-07 13:05:07 -05:00
Seth Call 164fe8db61 * recording cleanup logic VRFS-2393 2014-11-06 11:26:13 -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 4f9bdb2c5c * VRFS-2404 There are cases where a session can incorrectly get stuck in a 'I'm still recording' state 2014-11-03 15:24:46 -06:00
Seth Call ace7ac15c8 * VRFS-2432 notify when stream mix is done 2014-11-03 10:00:42 -06:00
Brian Smith 33a431f822 VRFS-2427 fixed broken test 2014-11-02 14:26:56 -05:00
Brian Smith eb56be97dd VRFS-2427 fix sorting / paging issue on Feeds screen 2014-11-02 12:57:43 -05:00
Brian Smith a310c46288 Merge branch 'develop' into feature/rsvp_slot_conflict 2014-10-29 20:41:05 -04:00
Seth Call 149967f877 * VRFS-2375 - share button works now in master mix complete msg 2014-10-29 10:27:29 -05:00
Seth Call bbff3ccab5 * remove debug print 2014-10-27 13:50:44 -05:00
Seth Call 970401374b * VRFS-2399 - fixed recording sync track issue 2014-10-27 12:42:30 -05:00
Brian Smith c57ea372ac VRFS-2311 allow session creator to add and approve slots on the fly when there are no available slots 2014-10-25 22:23:52 -04:00
Seth Call 58d96fc171 * VRFS-2192 - export recording button added to file sync dialog 2014-10-23 16:45:25 -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
Jonathan Kolyer af2159fe72 VRFS-1945 added create_type to music_sessions; filtering session search based on create_type 2014-10-21 07:27:26 +00:00
Brian Smith a8987efaa1 VRFS-2337 added latency badge to musician hover bubble 2014-10-19 21:18:05 -04:00
Steven Miers cce9fc1577 VRFS-2029 : Fix issue where a nil (instead of false) 
is causing claimed_recording not to save properly.
 2014-10-15 17:59:59 -05:00
Steven Miers c1f2a2083f VRFS-2029 : Update REST API ApiRecordingsController#claim 
to accept and distribute upload_to_youtube flag as appropriate.  Spec
to verify.
 2014-10-15 13:54:10 -05:00
Steven Miers d95a063648 VRFS-2029 : Rails model attribute for upload_to_youtube flag 
Also includes Rails validation.
 2014-10-15 13:45:30 -05:00
Brian Smith 3641521740 VRFS-2244 handle duplicate friend requests better 2014-10-14 02:12:33 -04:00
Jonathan Kolyer 649027cda7 VRFS-2282 tests and music session time queries 2014-10-14 03:54:58 +00:00
Jonathan Kolyer 6f27455b02 Merge branch 'develop' into VRFS-2282 2014-10-13 16:18:47 +00:00
Brian Smith ab66504532 VRFS-2344 show musician hover on pages 2-n on Find Session screen 2014-10-13 20:58:30 -04:00
Brian Smith 257421a1d0 VRFS-2318 show JOIN button for non-scheduled (future) session 2014-10-13 08:40:10 -04:00
Jonathan Kolyer 95b26e9c00 Merge branch 'develop' into VRFS-2282 2014-10-13 02:15:01 +00:00
Jonathan Kolyer 26b124dde8 VRFS-2282 first pass purging stale sessions 2014-10-12 07:49:31 +00:00
Brian Smith c2c157a0ba VRFS-2124 fix feed issue when session switches from fan_access=true to fan_access=false 2014-10-11 13:57:05 -04:00
Brian Smith bdd8c6db5a VRFS-2219 activate session in feed when the active_music_session record is created 2014-10-11 08:53:26 -04:00
Steven Miers 4d08359ef1 Fixes VRFS-2334 : re-add filter for users 
Includes spec to reproduce, and additional specs that uncovered a
problem with setting the client_video_source_id.
 2014-10-10 11:07:36 -05:00
Brian Smith d08475c34e VRFS-2321 comment out session join email notification 2014-10-08 20:27:28 -04:00
Brian Smith eddd8a526c VRFS-2320 include from user info in session comment emails 2014-10-07 20:39:13 -04:00
Steven Miers 9473ffa352 Merge branch 'feature/video_mvp' into develop 2014-10-07 17:37:06 -05:00
Steven Miers 94963f2ad1 VRFS-2028 : Add videos to list_uploads, in addition to tracks. 
This is accomplished using a SQL union via arel.
 2014-10-07 15:34:05 -05:00
Steven Miers 160108a217 Merge video_mvp branch 2014-10-07 11:33:34 -05:00
Brian Smith bffba5fcbc VRFS-2219 changes based on Seth code review 2014-10-06 21:03:19 -04:00
Steven Miers e25e3b16a9 VRFS-2027: Create video recordings from source in ApiRecordingsController#start 
Also includes spec.
 2014-10-06 18:17:08 -05:00
Steven Miers 1ce0ac34ef VRFS-2025 : Add video_sources to join_the_session and its callers. 
Creates and attaches video_sources just as it does tracks.
 2014-10-06 17:02:10 -05:00
Seth Call 71f6b7edc6 * VRFS-2304 - create scoring timeout when doing a network test 2014-10-06 16:44:30 -05:00
Steven Miers 47490ea3d9 VRFS-2025 Incremental 2014-10-06 16:17:46 -05:00
Steven Miers dffdb78f71 Merge develop into this branch. 2014-10-06 16:17:36 -05:00
Brian Smith 7856e43f1e VRFS-2219 active sessions should sort to top of Feed 2014-10-06 09:20:31 -04:00
Brian Smith 14c9a5b469 VRFS-2278 show tooltip for instrument icons on Find Session and Session Detail screens, show user friendly error when unable to approve RSVP 2014-10-05 22:12:50 -04:00
Steven Miers 66feb39de8 VRFS-2023 - Migration, models and spec for recorded_video, a video analog to recorded_track. 2014-10-03 14:12:09 -05:00
Steven Miers 5135fe7faf VRFS-2024 - Migration, model and spec for video source. 2014-10-03 13:36:51 -05:00
Jonathan Kolyer 5d524cd7b0 VRFS-1430 added email from alias to JamKazam <{noreply,support}@jamkazam.com>; updated link colors to be 588C98 2014-10-01 22:10:54 +00:00
Seth Call 8889b8ce42 * merge in faster score searches (VRFS-2202) 2014-09-30 10:51:23 -05:00
Brian Smith 6442674c91 VRFS-2216 fix tests; include pending RSVPs and invites for session details screen 2014-09-28 22:37:52 -04:00
Brian Smith a07fdfe2a8 Merge branch 'develop' into feature/sprint_12_work 2014-09-28 12:00:32 -04:00
Seth Call 39ed460d14 * VRFS-2280 - fix locations getting invalidated, and VRFS-1806 fixed by detecting no login data 2014-09-25 23:13:34 -05:00
Brian Smith da771acdaf merge develop 2014-09-25 09:09:44 -04:00
Seth Call b87ff571ce * VRFS-1073 - support multiple websocket gateways 2014-09-24 14:27:56 -05:00
Brian Smith 3f1eb86684 Merge branch 'develop' into feature/sprint_12_work 2014-09-23 21:27:52 -04:00
Seth Call 51b5923022 * fix broken tests 2014-09-22 15:55:02 -05:00
Seth Call 61f0bd2aa0 * merged 2014-09-22 14:20:58 -05:00
Brian Smith 096c43c0e4 Merge branch 'develop' into feature/sprint_12_work 2014-09-19 00:25:20 -04:00
Brian Smith 1858e0da49 VRFS-2218 VRFS-2197 allow unstarted scheduled sessions to be listed up to 12 hours after start time; allow completed sessions to be listed up 2 to hours after completion time 2014-09-19 00:24:38 -04:00
Seth Call a396671f8b * VRFS-2223 typo in music_session 2014-09-17 20:38:33 -05:00
Brian Smith 1203a26271 Merge branch 'develop' into feature/opt_out_notification_fix 2014-09-15 23:02:53 -04:00
Brian Smith 4ddd4e4c13 VRFS-2066 fixed some issues with session landing and feed 2014-09-14 19:17:16 -04:00
Brian Smith 03fe5e8a1e VRFS-2066 consolidate users if they are listed multiple times in MSUH for the same session 2014-09-14 15:52:17 -04:00
Brian Smith f296932f27 fix more session join/leave bugs 2014-09-14 15:12:25 -04:00
Brian Smith e5a6ad862b fix notification bugs - active_music_session vs. music_session confusion 2014-09-14 14:41:32 -04:00
Brian Smith 072f3101c7 VRFS-2179 minor refactor of offline notifications to prevent a second loop from executing 2014-09-13 08:04:40 -04:00
Seth Call 2bd189b697 * VRFS-2159 merge 2014-09-12 22:30:51 -05:00
Brian Smith d8d987e21f VRFS-2179 send email to friends/followers when user joins a session 2014-09-12 22:57:03 -04:00
Brian Smith 4bdcf103ce VRFS-2136 only return recordings that have at least 1 claimed recording 2014-09-11 21:52:26 -04:00
Brian Smith c55413d349 added more tests, minor refactor, only send scheduled session notifications if target user is online 2014-09-11 21:29:48 -04:00
Brian Smith 632d806825 remove debug statement 2014-09-11 09:04:14 -04:00
Brian Smith abc8f18c00 VRFS-2140 added more tests, fixed bug in band recording notification 2014-09-11 09:03:32 -04:00
Brian Smith 71487d989b Merge branch 'develop' into feature/opt_out_notification_fix 2014-09-11 08:38:56 -04:00
Brian Smith 0b1f9d0c97 VRFS-2140 added more tests, fixed bug found in recording notification 2014-09-11 08:38:26 -04:00
Seth Call 7761c2e9a8 * VRFS-2155 fix passing of yellow 2014-09-10 09:25:43 -05:00
Seth Call 5b9987aa17 * fix broken artifacts path: VRFS-2153 2014-09-10 09:13:02 -05:00
Brian Smith a7623aac26 VRFS-2140 do not send any email notifications if the user has opted out of receiving emails 2014-09-10 03:04:35 -04:00
Seth Call 8c22d68b60 * sort by date, not the array VRFS-2130 2014-09-08 21:50:51 -05:00
Seth Call 406c86be29 * VRFS-2098 - protect against dup sessions showing up in daily email 2014-09-08 21:38:35 -05:00
Brian Smith 850709e51a VRFS-2094 include hour, minutes, seconds in filename to avoid overwriting files in S3 added on the same day for different sessions 2014-09-08 21:13:08 -04:00
Seth Call 75d50b8286 * make notations private bucket; only allow access if user has can_join? permissions for session 2014-09-08 16:51:28 -05:00
Brian Smith 07024a44a6 VRFS-2094 wip notation upload bug fixes 2014-09-08 09:13:20 -04:00
Brian Smith 74763d53f3 VRFS-2094 fixed issue with notation file upload and tying it to music session; still need to fix download issue 2014-09-06 03:30:29 -04:00
Seth Call c35cfcf0f9 * VRFS-2104 make sure APP_CONFIG exists in websocket-gateway 2014-08-31 14:45:48 -05:00
Seth Call 5f85908c79 * VRFS-2104 - client update dialog happens when it needs to; not just on startup 2014-08-31 10:30:59 -05:00
Brian Smith f39312662d VRFS-2091 modified email regular expression to prevent 2 consecutive periods after the @ 2014-08-27 23:36:57 -04:00
Brian Smith 82090f5f55 VRFS-2072 copy all 1-time cancellations instead of just the first 2014-08-24 15:12:38 -04:00
Brian Smith b1f4ede997 VRFS-2072 fix session scheduler bug where RSVP requests were not being carried forward 2014-08-22 02:14:07 -04:00
Seth Call 6a01a1c2d6 * VRFS-2076, VRFS-2071 - musicians only listed once, and added spinner to find musician page 2014-08-21 14:58:14 -05:00
Seth Call 9d46f07153 * VRFS-2070 - work current_scores into a better query, and update the entire site to use it correctly 2014-08-20 17:06:57 -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 9c4ab6418c * wip 2014-08-19 14:23:41 -05:00
Seth Call 8f49a9ab66 Merge branch 'develop' into feature/latency_hover 2014-08-19 12:49:54 -05:00
Seth Call 27f4adf772 * VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs 2014-08-18 20:41:44 -05:00
Seth Call 0c3a43a177 * wip 2014-08-18 10:37:55 -05:00
Brian Smith 25e3f23dcf VRFS-1891 VRFS-2022 bug fixes / test additions 2014-08-15 00:32:45 -04:00
Brian Smith af1a4596e0 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-08-14 23:57:51 -04:00
Seth Call d34929d70b * landing pages in VRFS-2037 2014-08-14 22:23:22 -05:00
Seth Call b9a5c75ec5 * VRFS-2055 - escape keyword in hand-crafted SQL query\! 2014-08-14 21:28:30 -05:00
Brian Smith 5691e6092f VRFS-2022 show private sessions/recordings in the feed 2014-08-14 01:45:37 -04:00
Seth Call 4c85740597 * wip 2014-08-13 11:09:52 -05:00
Brian Smith e8847280bc VRFS-1995 do not send notifications to users with canceled RSVPs 2014-08-12 02:20:25 -04:00
Brian Smith dece2afc1b VRFS-1478 fix bugs 2014-08-12 00:24:57 -04:00
Brian Smith cc26969f8a VRFS-1891 cancel RSVP flow fix 2014-08-09 23:22:17 -04:00
Brian Smith fd9893ca42 Merge branch 'develop' into hotfix/cancel_rsvp_flow 2014-08-09 18:35:23 -04:00
Brian Smith f97a416867 VRFS-1891 VRFS-2011 cancel RSVP flow / show proficiency in RSVP dialog 2014-08-08 02:22:32 -04:00
Jonathan Kolyer 9249e99581 added method min_create_date 2014-08-05 12:09:12 +00:00
Seth Call aa863240b9 * VRFS-1992 finished (daily session email improvements) 2014-08-01 16:17:04 -05:00
Seth Call 8048c5012d * wip 2014-07-31 21:06:06 -05:00
Seth Call 00dee99e17 * wip 2014-07-31 20:16:38 -05:00
Seth Call 9544e3d075 * rename new column because it's not working for reasons I can't understand on the build server 2014-07-30 21:05:59 -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 8966a3fc2f * VRFS-1992 - check open_rsvps for daily session email, VRFS-1991 - remove hardcoded 10 in audio latency on create/join, VRFS-1990 - only send update rsvp notification if scheduled start time changes 2014-07-30 15:11:03 -05:00
root 915bb4ad13 Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop 2014-07-30 07:13:19 +02:00
Seth Call dd318a9b8a Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-29 21:43:44 -05:00
Seth Call 9013ff2e94 * VRFS-1987 fix stupid typo caused by refactor of MusicSession to ActiveMusicSession 2014-07-29 21:42:35 -05:00
Brian Smith 0a075da783 VRFS-1983 session organizer cancelling RSVP should send notification to RSVP requester 2014-07-29 22:07:46 -04:00
Brian Smith 19f36b7d1b copy is_unstructured_rsvp flag on RsvpSlot 2014-07-29 21:52:08 -04:00
Seth Call 027456105b * VRFS-1968 - locids are now in score history 2014-07-29 18:11:00 -05:00
Seth Call c3461e82a7 * VRFS-1976 - fixed issue where UI always picks 1st scheduled session; VRFS-1962 - use 'full latency' instead of just internet latency in musician search, find session, and new musicians email 2014-07-29 17:52:20 -05:00
root 95dcea9ca7 fixed issue #1632 #1954 2014-07-29 18:15:23 +02:00
Seth Call 1e6524e534 * VRFS-1956 - fixes for musicians page 2014-07-28 23:04:56 -05:00
Seth Call e9a4f33420 * VRFS-1957 - use median instead of just most recent for current_scores 2014-07-28 17:37:47 -05:00
Seth Call 4f7c1ef22e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-27 11:46:38 -05:00
Seth Call 2dd6153ed8 * wip on score export 2014-07-26 14:18:17 -05:00
Jonathan Kolyer e87ae50dfe VRFS-1942 tuning admin view 2014-07-26 04:10:40 +00:00
Jonathan Kolyer d28a65c5ff Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2014-07-26 03:59:11 +00:00
Jonathan Kolyer ff73c170bd VRFS-1942 refactoring scheduled session emails; new admin view into batch email data queries 2014-07-26 03:58:58 +00:00
Seth Call adb0b15555 * fixing bad schedules on scheduler.yml, and wip on admin web reporting 2014-07-25 15:01:14 -05:00