168d1e77f1
VRFS-2874 : Developer tracking
2015-04-15 18:37:07 -05:00
946640e724
VRFS-2874 : Jam Track Analytics : Hook up broadcast listen.
2015-04-15 18:27:00 -05:00
280496af78
VRFS-2874 : JamTrack analytic core tracking functionality
2015-04-15 18:23:51 -05:00
4db40f6d3b
VRFS-2874 : Some prerequisite functionality required for analytics.
2015-04-15 18:22:55 -05:00
ae050590f6
Whack extraneous logging.
2015-04-15 18:17:02 -05:00
Seth Call
42b58a97e8
* VRFS-3034 - workaround QtWebkit crash by conditionalizing the 'crashy' rule
2015-04-15 15:14:41 -05:00
Seth Call
ab1fadaea4
* VRFS-3031 - jamtrackBrowse is new URL
2015-04-14 15:16:37 -05:00
Seth Call
06c964a151
* VRFS-2977 - make facebook signup work with checkout flow
2015-04-14 14:12:24 -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
0e0ea46771
Merge branch 'develop' into feature/jam_track_analytics
2015-04-13 13:10:43 -05:00
f56cf339e9
VRFS-2874 : Incremental hookup of ga for jam tracks.
2015-04-13 13:08:34 -05:00
1d6f690f82
VRFS-2874 : Jam Track Analytics JS tracking method implementation.
2015-04-13 13:07:50 -05:00
Seth Call
fa725af5e4
* VRFS-2945 - jamtrack countin spinner and text now showing
2015-04-13 09:56:48 -05:00
Seth Call
0dc77b400a
* VRFS-3006 - remove 'No audio loaded' when jamtrack is loading, and VRFS-3016 - no more text wrapping in error msg
2015-04-12 16:22:01 -05:00
Seth Call
b1b6686d3a
* VRFS-2976 - change default to 10/2/2 for WDM
2015-04-12 15:55:48 -05:00
Seth Call
ab2925ef88
VRFS-2821 - payment history screen added
2015-04-12 13:46:22 -05:00
Seth Call
e42b926a5e
* VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases
2015-04-10 15:19:08 -05:00
Seth Call
fd02e23572
* updated home page VRFS-2868
2015-04-08 22:44:21 -05:00
6110bc736f
Merge branch 'develop' into feature/jam_track_analytics
2015-04-08 15:54:41 -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
1b463c02d9
VRFS-3018 : Account JamTracks empty state - show "no jam tracks" message and provide a link to the shopping page. Also remove stray debug logs.
2015-04-08 12:51:40 -05:00
6784c750ce
VRFS-2874 : Initial analytics for playing JamTracks in a session attended by multiple participants.
2015-04-07 14:04:29 -05:00
34edd24972
Merge branch 'feature/VRFS-2998' into develop
2015-04-07 12:08:03 -05:00
6e971b159c
Fix bug found in spec.
2015-04-06 15:52:34 -05:00
31a8729f71
VRFS-2998 : Fix runaway previews by only allowing one expanded item at a time.
2015-04-10 15:56:33 -05:00
Seth Call
c276d97e42
* pass in data with metronome open stat
2015-04-01 09:04:52 -05:00
Seth Call
80a48c60c6
* VRFS-2879 - adding 3 product pages (jamblaster, platform, jamtracks)
2015-03-31 21:08:09 -05:00
d21a88a5de
VRFS-2998 : Hooking up preview widget - incremental.
2015-03-31 19:55:26 -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
Seth Call
398f7e04ad
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-03-28 10:10:29 -05:00
Seth Call
260a80ee37
* VRFS-2987 - remote participants can see opened JamTracks
2015-03-28 10:10:18 -05:00
401fd43849
Merge branch 'feature/jam_track_ui_2' into develop
2015-03-27 15:48:08 -05:00
Seth Call
23fdf51110
* resize session based on track content VRFS-2819
2015-03-27 15:36:09 -05:00
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
3f994e3993
Merge branch 'develop' into feature/jam_track_ui_2
2015-03-26 11:59:49 -05:00
Seth Call
1e1e6222bb
* VRFS-2686 - if user seeks to 0, then offest it back to beginning of JamTrack (before prelude)
2015-03-25 15:01:22 -05:00
Seth Call
31e4fbfdf8
* suppress metronome logic when JamTrack is open VRFS-2971
2015-03-25 14:45:51 -05:00
5f953d1b19
VRFS-2830 : Merge / manual fix
2015-03-25 10:56:24 -05:00
adef8c8c45
VRFS-2830 : Payment History
...
API, client, view, styles and test
2015-03-24 17:13:09 -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
5e2d860bf7
VRFS-2830 : License dialog and hookup
2015-03-23 15:38:55 -05:00
98ea77a5e0
Merge branch 'develop' into feature/cohort_data
2015-03-23 20:07:24 +00:00
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
3ae34fc426
VRFS-2974 fixed broadcast widget bug when session is private
2015-03-22 21:30:08 -04:00
Seth Call
128a8119cf
* VRFS-2942 - show correct instrument and show correct part info
2015-03-20 22:04:03 -05:00
Seth Call
b137d7586f
* VRFS-2973 - fix pagination in jam trackdialog
2015-03-20 21:27:11 -05:00
Seth Call
f29a9d7465
* wip
2015-03-20 16:15:13 -05:00
e3d1a80a6f
VRFS-2830 : Mesh out purchased jam tracks view and behavior.
2015-03-20 15:26:06 -05:00
Seth Call
49368e2e66
Merge branch 'hotfix/recording_fix' into develop
2015-03-20 11:26:50 -05:00
Seth Call
3cb706495e
* wip
2015-03-20 11:25:42 -05:00
Seth Call
6df6165bb7
remove jamblaster notice from site
2015-03-20 09:55:35 -05:00
Seth Call
393f05f9b0
* wip
2015-03-20 09:21:29 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
abb31c4e40
VFFS-2830 : Jam tracks account overview
2015-03-17 13:52:30 -05:00
Seth Call
137c6faedc
* wip
2015-03-17 10:15:00 -05:00
Seth Call
9dd3984d07
* VRFS-2936 - ugly button for Peter testing
2015-03-16 13:36:02 -05:00
Seth Call
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
07b74cc3e7
VRFS-2823 : Enable proper back button behavior.
2015-03-16 00:29:57 -05:00
e6b09e5728
VRFS-2892 : Reset main form error to hidden upon re-entering purchase flow.
2015-03-15 20:30:39 -05:00
f4cd225142
VRFS-2823 : Bugfix and cleanup.
2015-03-15 19:45:58 -05:00
9a38b63376
VRFS-2823:Update link on landing page to properly set filter parameters.
2015-03-15 18:43:08 -05:00
782357ce4e
VRFS-2823 : Accomplishes a number of items
...
* Ability to set filter settings from URL
* Ability to expand and collapse; hiding the items mentioned in spec.
* Misc styling and code cleanup.
2015-03-15 18:42:22 -05:00
Seth Call
e82da2161d
* VRFS-2927 - mute both master/personal for own tracks
2015-03-14 15:00:11 -05:00
Seth Call
23488f8f7f
* wip
2015-03-14 14:36:34 -05:00
63544de145
VRFS-2822 : Cleanup
2015-03-13 14:45:57 -05:00
40a1ad137d
VRFS-2823 : Convert to coffee and clean up.
2015-03-13 14:45:38 -05:00
Seth Call
b0aac73732
* VRFS-2924 - show visual metronome option
2015-03-13 10:44:24 -05:00
Seth Call
1cd8288cc3
* wip
2015-03-13 10:28:27 -05:00
Seth Call
1b36fb812f
wip
2015-03-13 09:12:33 -05:00
Seth Call
7c73e2ab5c
* VRFS-2922 - show spinner for pending metronome
2015-03-12 21:53:23 -05:00
Seth Call
a1c929aeb1
* wip
2015-03-12 18:15:32 -05: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
Seth Call
d6df68a8ff
* VRFS-2913 - allow /client to be accessed without being logged in
2015-03-11 16:53:37 -05:00
Seth Call
477df086b0
Revert "* VRFS-2913 - allow /client to be accessed without being logged in"
...
This reverts commit 0a869e91e3
2015-03-11 16:53:12 -05:00
Seth Call
0a869e91e3
* VRFS-2913 - allow /client to be accessed without being logged in
2015-03-11 16:44:22 -05:00
fae67907b1
VRFS-2823 : Fix availability filtering
2015-03-11 16:36:42 -05:00
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
631491c4a2
* VRFS-2829 - signup and downoad page changes for jam tracks release
2015-03-10 10:29:40 -05:00
Seth Call
28ebbe893c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-03-09 09:49:21 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
fb3ed71957
VRFS-2854 more session widget feed fixes
2015-03-06 23:18:29 -05:00
Seth Call
be97555f1a
* VRFS-2885 - check mixers from both modes
2015-03-05 09:47:33 -06:00
6fa59bf76f
VRFS-2854 fixed bug with hovering over private sessions in feed
2015-03-05 02:18:05 -05:00
c8059e9c00
VRFS-2822 : Create a jam track landing page, a coffee script to control it, and styles.
...
Link from main client view. Link TO current (browse) page.
2015-03-03 23:14:24 -06: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
c8ad1d3856
VRFS-2805 : Use jquery.payment to make the credit card and verification more user-friendly. Also use jquery.payment for validation.
2015-03-02 13:30:45 -06:00
5396e66c67
Merge with develop
2015-02-27 11:51:45 -06:00
Seth Call
9415593244
* merged
2015-02-27 08:41:49 -06:00
Seth Call
8205b5ea58
* VRFS-2841 - load jmep into the backend
2015-02-27 08:37:12 -06:00
Seth Call
4a7d6925da
* wip
2015-02-25 19:56:26 -06:00
Seth Call
6b795695ee
* VRFS-2753 - assign volume left over volume right to ensure both mono and stereo backend inputs get the data they need
2015-02-25 16:15:41 -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
Seth Call
a7824249a8
* VRFS-2826 - fix regression where remote peers couldn't see tracks
2015-02-23 22:29:28 -06:00
Seth Call
c5b77a02fa
* check shopping cart on leave of shopping cart screen
2015-02-23 17:30:06 -06:00
Seth Call
4841e56dce
* VRFS-2634 - add version check to jamtrack packages
2015-02-23 16:56:21 -06:00
Seth Call
c8752fd830
* VRFS-2634 - add version check to jamtrack packages
2015-02-23 16:55:19 -06:00
Seth Call
0795791909
* move displayCartIcon method to init logic
2015-02-23 16:03:44 -06:00
Seth Call
78ed25ea82
* actually init the shopping cart
2015-02-23 16:00:30 -06:00
Seth Call
be4627d51f
* move around shopping cart init
2015-02-23 15:55:02 -06:00
Seth Call
d89e2f8e56
* VRFS-2818 - mute and volume faders control both mixer/personal simultaneously. more work required for moving of input tracks affecting backing tracks personal mix
2015-02-23 15:00:57 -06:00
Seth Call
ae920c5a1a
* stop play issued before close of backing track
2015-02-23 10:56:22 -06:00
Seth Call
1dbfdf0546
* VRFS-2811 - read loop state when drawing track
2015-02-23 10:45:10 -06:00
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
dcf3706099
VRFS-2798 : Hide/show shopping cart icon depending on contents.
2015-02-20 17:53:18 -06:00
Seth Call
0472d6bc79
* VRFS-2686 - jamtrack sliders work
2015-02-20 11:55:49 -06:00
Seth Call
ea482da0dc
* VRFS-2808 - prevent duplicate attempt to open recording
2015-02-20 10:01:11 -06:00
Seth Call
9d70400e91
* VRFS-2806 - disallow concurrent open of dialog
2015-02-20 09:50:03 -06:00
Seth Call
38849a1c44
VRFS-2804 - fix code to find the jamtrack ID correctly based on recent client changes
2015-02-19 15:56:42 -06:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
Seth Call
2b227912cb
* take out hard-coded jamtrack id
2015-02-19 11:29:13 -06:00
Seth Call
85ffa2ec21
* VRFS-2802 - moving media files mixers in personal mode actually affect master mode now
2015-02-19 09:31:30 -06:00
Seth Call
23c7307c6f
* VRFS-2796 - hide X for non openers
2015-02-18 15:41:51 -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
bf0f1345ed
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-18 03:44:38 -06:00
Seth Call
c30d42c9dd
* VRFS-2777 use SetSessionControlState to update loop info
2015-02-18 03:43:33 -06:00
232873819e
VRFS-2700 cleaned up broken tests
2015-02-18 06:33:06 +00:00
Seth Call
6d839f8efa
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-17 09:45:44 -06:00
Seth Call
2b7ebe1ce1
* use preview recording
2015-02-17 09:45:18 -06:00
Seth Call
b46dce5c29
Merge branch 'feature/backing_tracks' into develop
2015-02-16 10:35:46 -06:00
Seth Call
bfc03fba48
* VRFS-2780 - finish styling loop checkbox
2015-02-16 10:32:23 -06:00
Seth Call
bdc1b898b4
* VRFS-2780 - styling complete; needs testing
2015-02-15 22:15:41 -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
Seth Call
503e46ed74
*wip
2015-02-15 21:52:28 -06:00
Seth Call
c4c05c67d6
* working on sync rework VRFS-2661
2015-02-15 21:52:28 -06:00
6a46ad5910
Merge branch 'develop' into feature/recording_selector
2015-02-16 02:20:38 +00:00
c44c94671a
VRFS-2700 refactored attemptAdd
2015-02-16 01:59:16 +00:00
366ba06e89
VRFS-1845 : Webcam settings included in account page. Script uses same WebcamViewer object as the flue.
2015-02-15 19:28:13 -06:00
6ff4d197ef
VRFS-2700 recording source jasmine tests
2015-02-15 23:10:29 +00:00
a35874fa23
VRFS-1844 : Video gear - refactor to allow for non-embedded webcam preview. Add reusable view to a _webcam partial and reference where necessary.
2015-02-15 16:23:47 -06:00
8a737b3556
VRFS-2473 : Add metronome feature tests.
2015-02-15 14:44:38 -06:00
c52c429e96
VRFS-2473 : Check ntp clock stability of all session participants before opening metronome.
2015-02-15 14:00:36 -06:00
40b4537b04
Merge branch 'develop' into feature/recording_selector
2015-02-15 13:57:16 +00:00
708e842bcc
VRFS-2700 refactored url site test; added deferred state() test
2015-02-15 13:31:45 +00:00
f533e4273d
VRFS-2700 url site type tests with ajax mock
2015-02-15 12:51:16 +00:00
78321ce374
VRFS-2700 added state deferred call; RecordingSource subclass
2015-02-15 12:27:48 +00:00
4aa845cfc8
VRFS-2700 fixed spec stylesheet fixture loading within teaspoon; minor refactoring in site_validator.js
2015-02-15 07:50:04 +00:00
bbce83984b
VRFS-2498 : Fix spec.
2015-02-13 11:36:03 -06:00
Seth Call
6007033a15
* explain comment out
2015-02-13 00:00:45 -06:00
Steven Miers
Seth Call
Jonathan Kolyer
Brian Smith