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

54 Commits

Author SHA1 Message Date
Seth Call 4709622546 * VRFS-2680 - adding redirect logic for ssl 2015-05-11 16:52:58 -05:00
Seth Call 1cd57cb4e8 * VRFS-3118 - check for high latency while in session, VRFS-3138 - fix tons of issues with user downloading both sample rates 2015-05-01 12:09:18 -05:00
Seth Call ccd60aa631 * merged develop 2015-03-24 11:27:26 -05:00
Seth Call bb35535262 * VRFS-2941 - fix meddling of mount_uplaoder with existing URS 2015-03-17 10:55:16 -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 a10705c163 * VRFS-2909 - jam tracks importer 2015-03-09 09:44:12 -05:00
Steven Miers d526f98367 VRFS-2782 : Add a jam tracks builder spec to more directly exercise building, in addition to specific tests for 48kHz vs 44kHz 2015-03-04 16:13:45 -06:00
Steven Miers 2004d48fa1 Merge 2015-03-04 16:03:28 -06:00
Steven Miers e6c49a18b2 VRFS-2782 : Add a jam tracks builder spec to more directly exercise building, in addition to specific tests for 48kHz vs 44kHz 2015-02-26 17:01:44 -06:00
Steven Miers ef287187ba VRFS-2782 : Support multiple bit rates for jam tracks: migration, model and test updates. 2015-02-25 17:19:03 -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 d83a632d0b Conflicts: 
db/manifest
	web/app/assets/javascripts/jam_rest.js
 2014-12-18 15:13:55 -06:00
Steven Miers 795cb6f536 Dedicated spec for testing cleaner. Some cleanup/renaming. 2014-12-15 23:57:57 -06:00
Steven Miers 433fe0be74 Initial merge and manual conflict and fix for tests. 2014-11-04 14:55:12 -06:00
Seth Call 48dea5688e * commit out fault audiomixer tests 2014-10-25 09:07:20 -05:00
Seth Call fe7edbba5d * many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181 2014-10-22 23:10:49 -05:00
Jonathan Kolyer 649027cda7 VRFS-2282 tests and music session time queries 2014-10-14 03:54:58 +00:00
Jonathan Kolyer 9f869f200f VRFS-2282 added resque schedule cleaner test 2014-10-13 02:32:45 +00:00
Brian Smith d547e4c2d6 VRFS-2094 fix tests 2014-09-08 22:23:35 -04:00
Brian Smith 82090f5f55 VRFS-2072 copy all 1-time cancellations instead of just the first 2014-08-24 15:12:38 -04:00
Brian Smith b1f4ede997 VRFS-2072 fix session scheduler bug where RSVP requests were not being carried forward 2014-08-22 02:14:07 -04:00
Brian Smith 24eb53cc07 fix syntax error and tests 2014-07-29 22:46:07 -04:00
Seth Call 5f131f9407 * VRFS-1403 - maxmind single step import done 2014-07-19 21:11:16 -05:00
Brian Smith 3bc94249ca VRFS-1497 VRFS-1749 added resque job to clean stale sessions, added tests for session scheduler and session cleaner jobs 2014-07-11 02:23:10 -04:00
Brian Smith e1e89d55e8 VRFS-1672 session settings dialog work / other bug fixes 2014-05-31 07:34:52 -04:00
Bert Owen bc0e3ba0eb VRFS-1681 cleanup unused notation files 2014-05-26 01:30:10 +08:00
Seth Call 244f79eefb * merging develop into feature/scheduled_sessions 2014-05-07 15:04:41 -05:00
Seth Call f3d39a351d * wip 2014-05-06 08:34:38 -05:00
Seth Call eab5e5b72b * merging in master with heartbeat fixes into develop after release 2014-05-05 10:50:47 -05:00
Seth Call c0ce26c602 * fixing tests for: * VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup) 2014-05-01 14:09:33 -05:00
Scott Comer fe59865bd9 change join_the_session api to add tracks; move the impl to connection; a few bug fixes 2014-04-30 22:01:43 -05:00
Scott Comer e82ae132bd fix method for adding connection to music session 2014-04-28 22:38:30 -05:00
Seth Call ac1b5d2e42 * fix for timecop 2014-04-15 17:02:51 +00:00
Jonathan Kolyer 9ddbc6ba5c VRFS-925 finishing up tests 2014-04-14 10:57:21 +00:00
Jonathan Kolyer 5a4bff14d2 VRFS-925 running tests for server side GA events 2014-04-08 17:15:49 +00:00
Jonathan Kolyer 7203124e89 merging 2014-04-08 07:21:50 +00:00
Scott Comer 91d76c7f12 marking broken location tests as pending; marked broken icecast config tests as pending; disabled some silly and now useless debugging output in get_work 2014-03-17 12:21:32 -05:00
Jonathan Kolyer 6ba8256d1a VRFS-925 fixed typo for testing 2014-03-10 08:58:03 +00:00
Jonathan Kolyer 2b11cb7abb VRFS-925 ga event processing 2014-03-09 13:38:46 +00:00
Seth Call dae0f40929 * removed is_downloadable for VRFS-1141, from database and UI 
* what's next dialog has icheck-styled checkbox now VRFS-913
* facebook invitations hooked up for VRFS-1121
 2014-02-22 05:09:39 +00:00
Seth Call 148009ece5 * VRFS-1018 - audiomixer ruby runner generates an mp3 with metadata using ffmpeg 2014-02-04 20:28:00 +00:00
Seth Call 90583f8463 * actually comment out audiomixer tests, hwich fail on server 2014-01-25 18:53:59 -06:00
Seth Call e63e718091 * merged 2014-01-25 14:19:12 -06:00
Seth Call 96768b7979 * VRFS-1022 finished 2014-01-25 14:03:14 -06:00
Seth Call fcec0a776b * icecast working locally on my mac (VRFS-1002) 2014-01-21 14:51:03 +00:00
Seth Call 5c8e315ee5 * pending didn't take 2014-01-19 03:32:36 +00:00
Seth Call 13f711754c * suppressing the other failing test on the build server 2014-01-19 03:14:00 +00:00
Seth Call 4e05affc77 * disabling audiomixer tests until I figure out why it's failing on audiomixer 2014-01-19 02:56:35 +00:00
Seth Call e57946afd2 * fixing tests, and adding a bunch more jam-admin page work for managing icecast, as well as the beginnings of the REST API for icecast (VRFS-1002 and VRFS-1006) 2014-01-19 02:20:44 +00:00
Seth Call a7fa73cfb3 * VRFS-801 still working out some mixer devops issues now; 2014-01-13 22:48:55 +00:00