4e0d2cd1cf
Merge branch 'develop' into feature/find_session_start_session
2015-01-09 07:08:41 -05:00
34d7985762
VRFS-2498, VRFS-2499 : Incremental
2015-01-09 02:47:46 -06:00
aeabfcafc8
VRFS-1985 VRFS-2252 only show start button for RSVP / invited user if there is less than 15 minutes left to sesession start time
2015-01-09 03:08:03 -05:00
9643fe1187
fixed javascript error on session detail screen
2015-01-09 02:38:38 -05:00
47293afee4
VRFS-1985 VRFS-2252 allow RSVP and invited users to start session from Find Session screen
2015-01-09 02:10:44 -05: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
9dc364ea20
VRFS-2498 : Metronome graphic, made transparent. Session UI for metronome.
2015-01-08 11:14:02 -06:00
Seth Call
e28db48e94
* resolving VRFS-2624 - if nil recording_ids, just exit early
2015-01-08 10:25:54 -06:00
79eec652d1
VRFS-1985 wip start session from Find Session screen
2015-01-07 23:18:07 -05: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
99f5e46ff6
* another quick fix for broken databasecleaner transaction cleanup
2015-01-07 16:57:25 -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
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
81ad2c89b5
VRFS-2610 : Fix bad API call that was throwing exception in console.
2015-01-07 11:27:21 -06:00
Seth Call
2ff30946e8
* VRFS-2606 - add new tap in fields, support them in activeadmin
2015-01-07 09:30:05 -06:00
Seth Call
585f307747
* add missing icon_folder.png
2015-01-07 08:54:28 -06:00
Seth Call
98c99c9a12
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-06 16:52:24 -06:00
Seth Call
af83a4f6a1
* VRFS-2608 - refactor and slight cleanup of UI towards new spec
2015-01-06 16:51:19 -06:00
7a9e5ec9a9
VRFS-2609 : Put cancel button next to create account button.
2015-01-06 12:14:30 -06:00
32dd3f272f
Touch
2015-01-06 03:45:39 +00:00
9047e26aba
Bypass recaptcha for feature specs exercising the signup mechanism.
2015-01-05 21:29:23 -06:00
f677714e9a
Revert change.
2015-01-05 19:03:28 -06:00
eb990dd930
One more foxy
2015-01-05 18:27:14 -06:00
16667a9ce3
Fix typo.
2015-01-05 17:25:43 -06:00
6cfe5decbf
Merge branch 'develop' into feature/nocaptcha
2015-01-05 17:04:13 -06:00
4d5b1c0ee1
VRFS-2540 : Add recaptcha tests to user manager spec that verify that system behaves properly for both the passed-in recaptcha flag AND the "recaptcha_enable" application config value.
2015-01-05 17:02:55 -06:00
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
13e6f226ea
VRFS-2540 : Recaptcha UI components
2015-01-05 16:57:49 -06:00
Seth Call
6906e4454a
* VRFS-2601 - REST API to return keys
2015-01-05 16:53:43 -06:00
Seth Call
d677b43c28
* VRFS-2603 private key now stored
2015-01-05 15:19:20 -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
Seth Call
356e9c657a
* bump to get a develop build out
2015-01-04 22:45:13 -06:00
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
77d62a4744
Merge branch 'feature/jam_tracks' of bitbucket.org:jamkazam/jam-cloud into feature/jam_tracks
...
Conflicts:
web/jt_metadata.json
web/spec/controllers/api_recurly_spec.rb
2015-01-04 09:02:04 -06:00
Seth Call
1f72d1cca4
* debug test that messes with websocket gateway
2015-01-04 09:00:50 -06:00
3c719e3f97
Another puts.
2015-01-03 11:51:42 -06:00
94480e1d88
Don't commit transient file.
2015-01-03 11:45:24 -06:00
2c2a32e140
Remove stray puts.
2015-01-03 11:45:24 -06:00
Seth Call
3c1816492c
* fix event_spec test for the rename of broadcast wixget on session landing page
2015-01-02 16:32:33 -06:00
Seth Call
4873da6448
* make test not break randomly
2015-01-02 16:00:53 -06:00
Seth Call
5f14f73322
* some more fixes for broadcasting - VRFS-2523
2015-01-02 15:29:31 -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
0f288539cd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-01 14:23:00 -06:00
Seth Call
9b1525715e
* fix a bug in broadcasting and also fix bad log refernce
2015-01-01 14:22:42 -06:00
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
83396675e6
* remove a diagnostic from javascript
2014-12-31 20:44:51 -06:00
Seth Call
116cf8cfce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-31 20:39:27 -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
83bd5b6c6e
VRFS-2588 : YouTube client, remove logging
...
Also, do some misc cleanup.
2014-12-31 19:35:20 -06:00
Seth Call
d901c3a498
* try to fix test again
2014-12-31 12:34:17 -06:00
Seth Call
2fc6edf579
* fix broken test
2014-12-30 21:14:36 -06:00
Seth Call
ed15eef3ac
* I'm not sure how I typo'ed this...
2014-12-30 21:06:56 -06:00
Seth Call
a3f40b2f99
* fix typo in write_point /write VRFS-2569
2014-12-30 17:15:28 -06:00
Seth Call
6058b1770a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-30 17:12:44 -06:00
Seth Call
6fc32f1624
add influxdb support to Ruby/Javascript code, and instrument code as a starting point VRFS-2569
2014-12-30 17:12:24 -06:00
Seth Call
786486026b
* wip
2014-12-30 17:10:16 -06:00
bb298dd6b9
VRFS-2548 : Config-ize location of jamtracks python tool
2014-12-29 15:05:19 -06:00
a402e31633
VRFS-2102 dedup instruments for in session users
2014-12-28 00:19:25 -05:00
9eb6870502
VRFS-2359 warn user when starting a TBD session
2014-12-23 01:50:07 -05:00
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
3edd37242b
* VRFS-2574 bring back public/private on recording if jamtracks is disabled
2014-12-20 14:11:36 -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
08a266a203
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-18 16:08:29 -06:00
Seth Call
01808e6dac
* VRFS-2523 - broadcast fixes
2014-12-18 15:14:23 -06:00
Seth Call
d83a632d0b
Conflicts:
...
db/manifest
web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
16fb200a2e
VRFS-2162 clear out friend text entry box after selection is made (fixes bug when tabbing out of friend selector list)
2014-12-17 22:43:36 -05:00
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
Seth Call
566035348b
* VRFS-2562, VRFS-2561, VRFS-2560 - fixes for mute state and behavior for voice chat and my tracks
2014-12-17 09:08:45 -06:00
08842ae243
VRFS-2426 do not divide by 2 when calculating full score for latency badge
2014-12-17 01:14:37 -05:00
39cae7e0a0
VRFS-2559 - button spacing
2014-12-16 21:35:52 -06:00
ff42a84598
VRFS-2482 : Jam Tracks cleanup and initial spec.
2014-12-15 20:30:46 -06:00
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
f6fef00ea5
VRFS-1952 : Schema changes for proper type and incremental code changes. WIP.
2014-12-15 12:16:19 -06:00
c71b9c8f0f
VRFS-2441 prevent long notation file names from overlaying buttons
2014-12-14 22:25:08 -05:00
831fe68138
VRFS-2529 fixed broken test
2014-12-09 02:57:15 +00:00
Seth Call
977a83277d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-08 15:37:38 -06:00
Seth Call
566598fffc
* fix for failing tests
2014-12-08 15:37:31 -06:00
93672844f2
VRFS-2529 remove quick-start scheduled sessions from account tab
2014-12-08 06:26:06 +00:00
937695e829
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-07 21:35:36 -05:00
70d58a53ec
Bump
2014-12-07 22:35:16 +00:00
d4055b7a1c
fixed broken band_spec tests
2014-12-07 17:10:25 +00:00
8634d4f726
VRFS-1959 : change the primary key (id) to be a big int and to share the sequence used by mixes.id and recorded_tracks.id
...
Also modify references as necessary, both from other tables and various
code usages.
2014-12-06 19:55:59 -06:00
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
e53b9b3df8
VRFS-2424 added user genres
2014-12-05 08:16:49 +00:00
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
bac1f69c88
README.md edited online with Bitbucket
2014-12-04 00:32:46 +00:00
0808ce04f9
Address test failure by actually creating the jam_track_right.
2014-12-03 13:48:14 -06:00
e4e3121b31
VRFS-1442 cosmetic updates
2014-12-03 08:22:35 +00:00
e834a1dfd6
VRFS-1442 refresh session band list each time entering step3
2014-12-03 08:22:35 +00:00
868ca0b476
VRFS-1442 sessions band selection
2014-12-03 08:22:35 +00:00
9bdddc22ff
VRFS-1442 band deletion; band member layout; invitations; band admin support
2014-12-03 08:22:35 +00:00
220fd639e0
VRFS-1442 fixed layout of band social tab
2014-12-03 08:22:35 +00:00
45542b7a1d
VRFS-1442 band profile, members editing; change notifyAlert to default to 1 button; added band_admin attribute to band members
2014-12-03 08:22:35 +00:00
588f03a199
VRFS-1442 bands page updates
2014-12-03 08:22:35 +00:00
Seth Call
069fc6a664
* removing trailing close comment
2014-12-02 17:29:29 -06:00
e85be7f0d5
README.md edited online with Bitbucket
2014-12-02 20:01:20 +00:00
Seth Call
0601e85e9d
* configurable hiding for tests of jamtracks
2014-12-02 07:49:18 -06:00
Seth Call
f6e0ebe910
* disabling shopping cart in view for now
2014-12-01 20:31:52 -06:00
2e5b3add3c
VRFS-2480: Recurly specs to verify placing an order.
2014-12-01 18:46:05 -06:00
41096f08ad
VRFS-2480: Additional back-end and UI functionality required for checking out.
2014-12-01 18:45:41 -06:00
0ec65738f1
Kill another puts.
2014-12-01 11:59:15 -06:00
a77cc46b4c
Remove puts. Disable tracing for billing test.
2014-12-01 11:52:13 -06:00
76548b1af1
Merge branch 'develop' into feature/jam_tracks_merge
2014-12-01 11:45:54 -06:00
adecb2c9ad
Remove stray puts.
2014-12-01 11:45:44 -06:00
7f59067226
VRFS-2480 : Refactor and cleanup, incremental.
2014-11-25 14:35:05 -06:00
300426e2c9
VRFS-2480 : Additional recurly config
2014-11-25 14:34:07 -06:00
09163d2778
Fix javascript to get credit card expiration year from correct field.
2014-11-25 13:59:24 -06:00
b3d80b3be6
VRFS-2480 : Fix UI problem where checkout button was obscured.
2014-11-24 15:07:55 -06:00
9e95f75e2e
VRFS-2480 : Card number was getting whacked from submittal due to a bad javascript assignment.
2014-11-24 15:06:45 -06:00
b35f3ef9ef
Fix fat finger.
2014-11-24 15:05:38 -06:00
Seth Call
4c6d95d4fe
* move comment out of unused tests causing failures on build server
2014-11-23 09:17:50 -06:00
Seth Call
4cc10631dd
* commit out unused tests
2014-11-23 08:13:36 -06:00
0b5d85f4f2
VRFS-2480 : Extract recurly logic from controller for cleaner, easier-to-test code.
2014-11-21 17:34:30 -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
55c5167e36
fix bug with deduping instruments in recording hover
2014-11-21 08:15:59 -05:00
f0b60f28e4
VRFS-2467 dedup users and instruments on session hover bubble
2014-11-21 01:20:27 -05:00
7f88a7550c
VRFS-2480 : Incremental
2014-11-17 21:24:39 -06: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
Seth Call
d1d059b4c5
* disable score_histories for now
2014-11-17 13:28:43 -06:00
Seth Call
6ea19f35aa
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-16 21:40:50 -06:00
Seth Call
6b5cd42432
* VRFS-2097 - move around hover hookups
2014-11-16 21:40:21 -06:00
2d3bbd2a47
VRFS-2480 : Recurly specs, fixes and new implementation.
2014-11-16 20:20:54 -06:00
b01b3ecd7d
VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge.
2014-11-16 16:23:31 -06:00
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
38bf21ad6b
VRFS-2125 prevent duplicate clicks from create band button
2014-11-16 05:40:24 +00:00
da4dfda654
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-15 22:59:43 +00:00
aac1b3d4f1
VRFS-2132 added :crash_dump to skip api_signed_in_user, allowing unauthenicated dump uploads
2014-11-15 22:59:35 +00:00
Seth Call
f27673eb31
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-15 15:10:43 -06:00
Seth Call
94efaf8a8e
* use hover events (js) instead of CSS to detect if hovering VRFS-2097
2014-11-15 15:07:13 -06:00
719aa2b411
fix getInstrumentId logic
2014-11-15 13:05:01 -05:00
d65358cea6
VRFS-2442 suppress "Recurs once..." text for non-recurring sessions
2014-11-15 13:01:28 -05:00
1c23f095ab
fix null instrument tooltips
2014-11-15 13:00:13 -05:00
3c18d7cf65
VRFS-2442 suppress "Recurs once..." text for non-recurring sessions
2014-11-15 12:24:37 -05:00
12ca12f3cf
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-15 11:33:43 -05:00
a46664acfe
VRFS-2489 scheduled session with is_unstructured_rsvp=true should not prompt user to add slots when approving
2014-11-15 11:05:12 -05:00
e87ab392e6
fix instrument icon wrapping on session and recording landing pages
2014-11-15 10:59:04 -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
3d654a063e
VRFS-2352 : Fix another intermittent test failure.
2014-11-14 19:56:26 -06:00
6b206cfa4a
VRFS-2478 : Fix JS timing error causing intermittent test failure.
2014-11-14 16:25:58 -06:00
c068619d4d
Lock guard gem version to avoid warning.
2014-11-13 11:06:03 -06:00
9cd9f5d58a
VRFS-2478 : Fix a few more tests.
2014-11-13 11:05:29 -06:00
Seth Call
3fc0329e79
* wip
2014-11-13 09:20:08 -06:00
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
Brian Smith
Steven Miers
Seth Call
Jonathan Kolyer
Anthony Davis