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
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
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
3cb706495e
* wip
2015-03-20 11:25:42 -05:00
Seth Call
d44236abc4
remove jamblaster notice from site
2015-03-20 09:58:58 -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
Seth Call
137c6faedc
* wip
2015-03-17 10:15:00 -05:00
Seth Call
b4d581dbc1
* VRFS-2936 - ugly button for Peter testing
2015-03-16 16:04:44 -05:00
Seth Call
c2abab8982
* VRFS-2936 - ugly button for Peter testing
2015-03-16 16:04:29 -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
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
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
3c62d61aed
* bump for build
2015-03-13 09:12:52 -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
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
Seth Call
972c25c69d
* fix path to shopping for JamTracks
2015-03-11 16:59:09 -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
Seth Call
9279d88d8d
* VRFS-2876 - pro licensing added and 20 second snippet
2015-03-10 22:10:22 -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
882f2267cf
* fixing urls getting messed with my mount uploader
2015-03-09 16:35:39 -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
07f688fc91
Fix test: make rabl file match controller action name.
2015-03-04 17:27:43 -06:00
ead2921e84
VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.
2015-03-04 16:13:58 -06:00
ff6848430f
Merge
2015-03-04 16:13:36 -06:00
2004d48fa1
Merge
2015-03-04 16:03:28 -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
Seth Call
Jonathan Kolyer
Brian Smith
Steven Miers