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

1533 Commits

Author SHA1 Message Date
Steven Miers a7fd314683 Squashed commit of the following: commit 900400f053 Author: Steven Miers <steven.miers@gmail.com> Date: Thu Sep 3 03:53:06 2015 -0500 VRFS-3359 : Styling, cleanup, more idiomatic react state management for input fields. commit 766842f4e7 Author: Steven Miers <steven.miers@gmail.com> Date: Thu Sep 3 03:52:04 2015 -0500 VRFS-3359 : Teacher pricing * Currency fields only appear when both the appropriate pricing option (column) AND the time range (row). * Currency fields set state and format on blur commit dace5dd08a Author: Steven Miers <steven.miers@gmail.com> Date: Thu Sep 3 02:00:18 2015 -0500 VRFS-3359 : New fields in API output and controller spec. commit 3f2fd94c58 Author: Steven Miers <steven.miers@gmail.com> Date: Thu Sep 3 01:53:28 2015 -0500 VRFS-3359 : Update schema and models with per-month and per-lesson price for each interval. Update tests to match. commit 8ce313f5c7 Author: Steven Miers <steven.miers@gmail.com> Date: Mon Aug 31 23:02:44 2015 -0500 VRFS-3359 : Teacher pricing Display or hide fields depending on checkboxes. commit 005ee8aabd Author: Steven Miers <steven.miers@gmail.com> Date: Mon Aug 31 14:56:25 2015 -0500 VRFS-3359 : Validate end year greater or equal start year. commit 69bb4e469a Author: Steven Miers <steven.miers@gmail.com> Date: Mon Aug 31 13:12:36 2015 -0500 VRFS-3359 : Teacher Experience List Component * Add field label properties to experience list component. Each of the three lists can set labels for title and organization. Date label is inferred from showEndDate property * Update usages of this list * Sort by start_date * List display uses available fields (e.g., date range when available) commit 0878c5fd3f Author: Steven Miers <steven.miers@gmail.com> Date: Mon Aug 31 11:32:20 2015 -0500 VRFS-3359 : Proper setting of experience keys and saving. 2015-09-03 13:25:29 -05:00
Steven Miers 4e40da594c Merge with develop again 2015-08-31 10:12:18 -05:00
Steven Miers f0c22433c3 Merge with develop 
commit c3f81a4d23
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 10:35:43 2015 -0500

    * build bump

commit e782d5f9bb
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 09:43:40 2015 -0500

    * VRFS-3419 - check better for window opener

commit 36b6699cde
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 08:12:47 2015 -0500

    * validate popup VRFS-3419

commit 8948f0498f
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 07:59:21 2015 -0500

    * fix changed path

commit 2bce35d604
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:38:34 2015 -0500

    * fix jamtrack test

commit 63ef63c20d
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:34:40 2015 -0500

    * fix typo again in webcamViewer. need to go to bed

commit 8566cc5bc9
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:31:34 2015 -0500

    * fix typo added in webcamViewer

commit 22ea6e89fd
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:26:39 2015 -0500

    * VRFS-3488 - jamtrack search by artist and song need to pin to the
match, not do a sloppy search

commit a4bd28e168
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 16:43:34 2015 -0500

     VRFS-3474 - watch for USB events and refresh video pages

commit d2edfd22c5
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 12:01:52 2015 -0500

    * VRFS-3467 - previews are 20 seconds long indicator on jamtracks

commit defdfa8ce9
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 06:04:53 2015 -0500

    * VRFS-3473 - fix 'videoShared' state in webcamViewer

commit 090cfa17c0
Merge: 7560b34 818596a
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 14:53:35 2015 -0500

    Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into
develop

commit 7560b340c7
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 14:52:05 2015 -0500

    * VRFS-3466 - updated frontend to pass in GUIDs

commit 1252dbe178
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 05:28:15 2015 -0500

    * use new bridge calls to handle current FPS and resolution
VRFS-3428

commit 818596ae36
Author: Jonathan Kolyer <jonathan@jamkazam.com>
Date:   Tue Aug 25 08:23:52 2015 +0000

    VRFS-3451 musician_search verifying instrument and genres inputs

commit 6918eaf095
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 17:55:06 2015 -0500

     more UI tweaks for video settup in account screen VRFS-3428

commit fc69242578
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 16:18:31 2015 -0500

    * VRFS-3427 - update FTUE to test video, not just audio

commit 729974013a
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 16:17:53 2015 -0500

    * VRFS-3428 - fix button text

commit db1f1d60d5
Merge: 04825d2 90c8d05
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 15:56:42 2015 -0500

    Merge branch 'feature/video_frontend' into develop

commit 04825d2659
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 15:54:59 2015 -0500

    * VRFS-3428 - update how we query backend for frame rates

commit 39d0731d74
Author: Seth Call <sethcall@gmail.com>
Date:   Sat Aug 22 05:44:59 2015 -0500

    * VRFS-3456 - remove special chars from search

commit 1874720ee8
Author: Seth Call <sethcall@gmail.com>
Date:   Sat Aug 22 05:32:28 2015 -0500

    * VRFS-3456 - protect special chars from tsquery

commit 29104ff09b
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Aug 21 05:02:48 2015 -0500

    * VRFS-3446 - bug fix for no genre specified on join of session;
also fix search bar in jamtrack dialog

commit 3b6d1febdb
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 15:44:21 2015 -0500

    * forget cta image

commit 6ac622853c
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 15:02:55 2015 -0500

    * VRFS-3449 - a little more tweaking of JamTrack landing page

commit d7fcadcd0d
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 14:49:07 2015 -0500

    * VRFS-3450 - fix 'show all tracks' when pagination occurs by not
doubleregistering

commit e7b50ca4a8
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 14:19:07 2015 -0500

    * VRFS-3449 - updates for direct landing pages

commit 0d075a9568
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:19:17 2015 -0500

    * fix spacing issue

commit 9c17d9a024
Merge: 9873450 0b67ef5
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:06:48 2015 -0500

    Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into
develop

commit 98734506df
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:06:36 2015 -0500

    * VRFS-3448 - fix invisible downloader

commit 90c8d05d00
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 14:17:10 2015 -0500

    * wip

commit bf4044d92e
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 09:24:14 2015 -0500

    * VRFS-3422 - don't die if the user has on sale_line_items

commit 87c62b4db2
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 08:29:22 2015 -0500

    * a fix for linux? hfa code

commit 3fa58715fc
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:36:04 2015 -0500

    * fix open jamtrack dialog for people with less than 10 jamtracks

commit d045c94f54
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:17:37 2015 -0500

    * more HFA request polish

commit dc343f10e3
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:01:47 2015 -0500

    * don't show free jamtrack notice on landing page if
redeemed_jamtrack cookie is set

commit e6618da456
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 21:29:15 2015 -0500

    * fix a bug in figuring out if the user should be show GET IT FREE

commit 5ba03a2755
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 20:41:37 2015 -0500

    * VRFS-3431 - better response when creating HFA request

commit 37d6c3e57c
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 15:19:40 2015 -0500

    * add csv to dump released JamTracks

commit f6101f3621
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 14:26:41 2015 -0500

    VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing

commit 0b67ef5f52
Author: Jonathan Kolyer <jonathan@jamkazam.com>
Date:   Sat Aug 15 15:03:00 2015 +0000

    fixed test for instruments in musician search
 2015-08-29 12:56:27 -05:00
Steven Miers 67696a72d7 VRFS-3359 : Teacher API work 
* Return distinct experience collections for teaching, education, and
awards.
* Update tests for new behavior.
* Responders for language and subject APIs.
 2015-08-28 15:11:52 -05:00
Steven Miers 2558c03f3d VRFS-3359 : Updates to teacher models and tests 
* Scope experience based on type: teaching, education, awards
* Save experience using these different types
* Add new tests to verify
 2015-08-25 19:21:48 -05:00
Steven Miers 7c95e526e4 Merge branch 'develop' into feature/profile-teacher 2015-08-17 14:11:41 -05:00
Steven Miers fea9d1e25a Fix unit test (build instead of create). 2015-08-17 14:10:32 -05:00
Steven Miers 6edb4b6012 Merge with develop 2015-08-15 17:18:15 -05:00
Steven Miers b4018e0124 VRFS-3359 : Teacher lookup 
* Fix a problem with teacher query
* Addresses a few test failures
* Cleanup logging output
 2015-08-15 17:11:47 -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 efbecded54 * fix importer on oriental/asian 2015-08-15 14:26:54 -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 40f3b7d83e * correct part deduplicator 2015-08-12 10:14:54 -05:00
Seth Call 03f5407727 * deal with duplicate instrument/parts better than failing 2015-08-12 09:36:42 -05:00
Seth Call 5300f62063 * don't eat up horns part if specified 2015-08-11 05:51:58 -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 da726a574b * remove unique constraint on jamtrack name 2015-08-09 14:20:21 -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
Seth Call 6fede36b04 * protect against double-activation of search of find session screen 2015-07-22 08:16:00 -05:00
Seth Call bade8884f3 * stop influxdb prints in web tests 2015-07-22 07:52:41 -05:00
Seth Call 131c2dc95b * mark another test intermittent 2015-07-20 14:10:01 -05:00
Seth Call b11c707155 * add intermittent:true to avoid certain tests 2015-07-20 12:56:47 -05:00
Seth Call 2171f06685 * VRFS-3347 - disable metronome in master mix view (still can't get helpbubble to show), update password of google account 2015-07-20 11:38:04 -05:00
Seth Call e53af19dc6 * fixing more tests 2015-07-20 08:59:24 -05:00
Seth Call f6d54a57f5 * test fixes 2015-07-19 09:57:40 -05:00
Seth Call 35e07c3d7f * trying to protect against leaky data in ruby tests 2015-07-18 14:41:29 -05:00
Seth Call a9dc1c92b7 * VRFS-3344 - ensure popups are all removed when you leave a session 2015-07-18 14:26:50 -05:00
Seth Call 2a2ad4a378 * test fix 2015-07-17 19:32:58 -05:00
Seth Call 1cec394698 Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop 2015-07-17 16:02:45 -05:00
Seth Call d280a53e48 * fix metronome personal/master bug; try to fix intermittent fail 2015-07-17 16:02:36 -05:00
Steven Miers 339c681900 Fix musician search spec to pass updated user validation logic. 2015-07-17 16:01:43 -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 40d5e2bc17 * delete all music sessions before ruby test (uncessary until figure out root cause) 2015-07-17 09:50: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
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
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 946313d56b * more clean up to ensure clean start on test 2015-07-15 15:13:44 -05:00