Commit Graph

6093 Commits

Author SHA1 Message Date
Seth Call cd37c85c68 * fix more tests and disable autorun of test-unit now that we have to include it as a dependency 2015-07-16 13:55:00 -05:00
Seth Call be26beae09 * fix band_spec intermittent test 2015-07-16 13:12:48 -05:00
Seth Call 55c1d2fb41 * trying to fix transition to 2.2.2 2015-07-16 11:48:17 -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
Seth Call db3ffafd38 * adding SHOULD BE unnecessary before-all rspec blocks to clean db state for tests that tend to fail intermittently. (workaround for some real problem) 2015-07-15 21:00:35 -05:00
Seth Call 921c2ddd5e Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-07-15 20:42:44 -05:00
Seth Call 3e11f7a5eb * VRFS-3339 - small aesthetic tweaks to session screen 2015-07-15 20:42:34 -05:00
Steven Miers bbcfd3336e VRFS-3332 : Band setup : validate genres only when on the correct step AND the next button is used. 2015-07-15 20:05:24 -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
Steven Miers ef949590fe Remove stray log. 2015-07-15 17:07:24 -05:00
Steven Miers 2f5e7a71e6 Fixes VRFS-3337 : Fixes youtube spec / google login to match new behavior. 2015-07-15 17:05:11 -05:00
Steven Miers 42d4e9723c VRFS-3336 : Fix final save button on edit account profile.
* Only bind the screen to ‘account/profile/samples’ if it is the user
version
* Parent parameter was being overwritten; change to use the provided
argument.
2015-07-15 17:05:11 -05:00
Seth Call 946313d56b * more clean up to ensure clean start on test 2015-07-15 15:13:44 -05:00
Seth Call c7dd8fe095 * whack bands created in 'shared_example' manually 2015-07-15 14:57:24 -05:00
Seth Call 6b70483743 * restoring admin packaging phase, debugging ruby test problem 2015-07-15 12:12:29 -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 f2ce59005a VRFS-3321 : Disable create account submit button until successful recaptcha callback. Re-disable if captcha expires. 2015-07-10 15:46:49 -05:00
Steven Miers a467388ac8 Merge test fix 2015-07-10 11:09:16 -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
Seth Call 5c79bdab5c * make unsubscribed work, and only dump first_name 2015-06-20 14:49:11 -05:00
Seth Call c5bc95c562 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-06-20 14:04:13 -05:00
Seth Call 53d62f1087 * synchronize jam-admin and jam-web secret token 2015-06-20 14:03:24 -05:00
Steven Miers 0d8beef0e2 VRFS-3190 : Last band test fixed 2015-06-17 15:56:29 -05:00
Steven Miers 75779da846 VRFS-3190 : Fix saveInvitations method 2015-06-17 15:05:19 -05:00
Steven Miers d37383a578 VRFS-3190 : Fix more band tests. 2015-06-17 15:04:27 -05:00
Steven Miers 104a0c015a VRFS-3190 : Fix another band test, add constant, more cleanup. 2015-06-17 08:24:57 -05:00
Steven Miers e6d1980495 VRFS-3190 : Fix band tests, add new tests for new tabs / cleanup 2015-06-16 17:55:55 -05:00
Steven Miers cfda14e16e VRFS-3190 : Merge with latest develop branch 2015-06-16 12:23:57 -05:00
Seth Call 2da5b3804e * * delete broadcast views when user is deleted (for tests) 2015-06-16 08:21:41 -05:00
Seth Call 5af9d759f2 * delete broadcast views when user is deleted (for tests) 2015-06-15 20:54:40 -05:00
Steven Miers 02be103694 VRFS-3190 : Fix band model tests 2015-06-15 19:09:25 -05:00
Steven Miers bd0c931df0 VRFS-3270 : Fix submit button on edit musician profile screen.
This was broken when changing from ids to classes on screens common to
band and user profiles.
2015-06-15 18:23:31 -05:00
Steven Miers c5285002e4 VRFS-3247 : Hide online presence and performance sample icons by default. Avoids flash at page load time. 2015-06-15 18:11:27 -05:00
Steven Miers e72980a32e VRFS-3248 : Band profile - history
* Allow context.JK.Feed to be attached to band, passing through to jam
rest as necessary.  Hook up from band profile JS.
* Markup and styling for feed on band profile history tab.
2015-06-15 18:10:17 -05:00
Seth Call 9ff44a21ac * deal with changed ChannelGroupIds enum in backend 2015-06-15 13:58:21 -05:00
Steven Miers 9b24e0c05b VRFS-3247 : Band profile - use classes instead of ids for embedded partials. 2015-06-11 17:33:04 -05:00
Seth Call 6afcc84088 * only list users who have opted into email 2015-06-10 16:41:52 -05:00
Steven Miers 4e8d563184 VRFS-3247 : JS rendering of band instruments, current interests and experience. 2015-06-10 15:34:43 -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
Seth Call 622f750b2d * VRFS-3261 add link to let sendgrid pull our users email info down for emailing out good unsubscribe links 2015-06-10 15:14:15 -05:00
Jonathan Kolyer 5d8ba22172 VRFS-3036 added performance sample test case 2015-06-10 16:36:58 +00:00
Jonathan Kolyer ebe620a3b3 VRFS-3036 fixed performance sample query and test 2015-06-10 16:35:39 +00:00
Jonathan Kolyer 1ad3f6a79f VRFS-3036 css tuning 2015-06-10 16:07:49 +00:00
Seth Call 0dbbfc0ee7 * VRFS-2855 - broadcast notifications done 2015-06-10 08:26:45 -05:00