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
63c45e0a6e
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-03-04 16:03:57 -06:00
Steven Miers
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
Steven Miers
5396e66c67
Merge with develop
2015-02-27 11:51:45 -06:00
Seth Call
9415593244
* merged
2015-02-27 08:41:49 -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
bd08b40e71
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-02-26 17:00:01 -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
dbaeb8d996
merged
2015-02-25 10:43:21 -06:00
Steven Miers
bcd3785b45
VRFS-2785 : Update recurly client with refund functionality. Unit test to verify.
2015-02-19 16:40:19 -06:00
Steven Miers
0907c1acd1
VRFS-2785 : Factory recurly client into ruby project. Fix references and specs as appropriate.
2015-02-19 01:06:50 -06:00
Seth Call
39415cdf22
* remove BPM from jam_tracks
2015-02-17 10:41:49 -06:00
Seth Call
42a2abe99c
* merged
2015-02-15 22:01:06 -06:00
Steven Miers
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
Seth Call
ac1271634d
* VRFS-2716 - changes to deal with new getBackingList format, VRFS-2661 - accepting backing_track info in Track.sync (wip)
2015-01-31 15:20:48 -06:00
Seth Call
7352fa9b19
* VRFS-2613 - optimizing hourly cleanup by moving it to the score report routine
2015-01-30 10:46:02 -06:00
Seth Call
96bc9487c4
* merged
2015-01-29 16:13:40 -06:00
Steven Miers
33177ddae6
Merge with develop.
2015-01-29 10:55:10 -06:00
Brian Smith
5a2fbab21c
VRFS-2689 user model changes for musician profile enhancements
2015-01-29 00:45:47 -05:00
Steven Miers
63574f5a25
VRFS-2667, VRFS-2668 : list_uploads and list_downloads implementation and tests.
2015-01-28 19:22:36 -06:00
Steven Miers
4741312294
Fix test, cleanup
2015-01-21 15:10:02 -06:00
Steven Miers
cefce67e89
Merge branch 'develop' into feature/backing_tracks
2015-01-19 15:21:13 -06:00
Seth Call
c5af644a38
* do not accept latency above 10000ms on user model
2015-01-16 17:20:07 -06:00
Steven Miers
c6f03a91b8
VRFS-2498, VRFS-2618 More coherent data model and logic for backing tracks and metronome re: active_music_session_spec.
2015-01-12 17:44:20 -06:00
Brian Smith
73e8f9ac6f
VRFS-2465 wip text message changes
2015-01-12 01:26:27 -05:00
Brian Smith
21f25e51d0
VRFS-1985 VRFS-2252 added tests
2015-01-12 01:20:19 -05:00
Seth Call
2c798e8860
* VRFS-2629 - one can follow the progression of a jam track being signed with detail
2015-01-09 11:23:20 -06:00
Seth Call
e28db48e94
* resolving VRFS-2624 - if nil recording_ids, just exit early
2015-01-08 10:25:54 -06:00
Seth Call
3fb5ab89d9
* typo in user wipe to fix test
2015-01-07 18:24:48 -06:00
Seth Call
ef03b8886a
* missed merge conflict
2015-01-07 17:45:47 -06: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
Seth Call
2ff30946e8
* VRFS-2606 - add new tap in fields, support them in activeadmin
2015-01-07 09:30:05 -06:00
Seth Call
eb26c33858
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-05 20:26:42 -06:00
Seth Call
4e6ca425d9
* trying to fix tests
2015-01-05 20:26:36 -06:00
Steven Miers
02aef2fe17
Fix test failures for jam_track rights.
2015-01-05 19:02:48 -06:00
Seth Call
6906e4454a
* VRFS-2601 - REST API to return keys
2015-01-05 16:53:43 -06:00
Seth Call
aabbd90b02
* VRFS-2602 change jka to jkz
2015-01-05 14:39:55 -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
5758096f33
* fix bug in connection stats
2015-01-01 21:45:07 -06:00
Seth Call
786486026b
* wip
2014-12-30 17:10:16 -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
d83a632d0b
Conflicts:
...
db/manifest
web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
Steven Miers
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
Steven Miers
795cb6f536
Dedicated spec for testing cleaner. Some cleanup/renaming.
2014-12-15 23:57:57 -06:00
Steven Miers
ff42a84598
VRFS-2482 : Jam Tracks cleanup and initial spec.
2014-12-15 20:30:46 -06:00
Steven Miers
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
Steven Miers
8ac9d19e73
VRFS-2481 : Use jam_tracks object hierarchy to create jkz file, and upload to AWS. Meshed out spec to verify creation and upload, including a real ogg file (required by the python tool).
2014-12-15 18:02:51 -06:00
Steven Miers
6407d2f22a
Merge from working branch
2014-12-15 12:16:19 -06:00
Jonathan Kolyer
f193ca2f42
VRFS-2529 added create type for session creation
2014-12-08 06:31:45 +00:00
Brian Smith
937695e829
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-07 21:35:36 -05:00
Brian Smith
605bdbcbf6
VRFS-2463 added tests for excluding currently viewed sessions/recordings
2014-12-07 21:35:30 -05:00
Seth Call
53ce955838
* VRFS-2530 - denormalize online for performance reasons
2014-12-07 16:04:10 -06:00
Seth Call
e0688ac6f1
* VRFS-2520 - recordings can be cleaned up now
2014-12-02 17:13:47 -06:00
Seth Call
589a2f6cc6
* VRFS-2520 - recordings can be cleaned up now
2014-12-02 17:13:34 -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
Steven Miers
b01b3ecd7d
VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge.
2014-11-16 16:23:31 -06: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
Seth Call
6277708bb4
VRFS-1491 - create personal/master mix toggle, and beef up user.mods
2014-11-11 16:21:46 -06:00
Steven Miers
6c825db79f
Merge update
2014-11-10 17:10:01 -06:00
Seth Call
8cad33a303
* recording file/manager fixes and aging of recordings
2014-11-07 16:12:36 -06:00
Seth Call
164fe8db61
* recording cleanup logic VRFS-2393
2014-11-06 11:26:13 -06:00
Steven Miers
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
Brian Smith
eb56be97dd
VRFS-2427 fix sorting / paging issue on Feeds screen
2014-11-02 12:57:43 -05:00
Brian Smith
300bc2cd82
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-27 21:37:28 -04:00
Seth Call
fb36b8e380
* VRFS-2408 - remove dup tracks from interfrace
2014-10-27 17:14:40 -05:00
Brian Smith
709150edac
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-26 12:41:17 -04:00
Brian Smith
c57ea372ac
VRFS-2311 allow session creator to add and approve slots on the fly when there are no available slots
2014-10-25 22:23:52 -04: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
Steven Miers
c1f2a2083f
VRFS-2029 : Update REST API ApiRecordingsController#claim
...
to accept and distribute upload_to_youtube flag as appropriate. Spec
to verify.
2014-10-15 13:54:10 -05:00
Brian Smith
3641521740
VRFS-2244 handle duplicate friend requests better
2014-10-14 02:12:33 -04: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
Jonathan Kolyer
26b124dde8
VRFS-2282 first pass purging stale sessions
2014-10-12 07:49:31 +00:00
Steven Miers
4d08359ef1
Fixes VRFS-2334 : re-add filter for users
...
Includes spec to reproduce, and additional specs that uncovered a
problem with setting the client_video_source_id.
2014-10-10 11:07:36 -05:00
Brian Smith
d08475c34e
VRFS-2321 comment out session join email notification
2014-10-08 20:27:28 -04:00
Steven Miers
9473ffa352
Merge branch 'feature/video_mvp' into develop
2014-10-07 17:37:06 -05:00
Steven Miers
e26c254d36
VRFS-2028 : Tests for verifying both types are there and have expected attributes in the hash.
...
I.E., type is “recorded_track” or “recorded_video” as appropriate, and
videos have client_video_source_id attribute. Also test pagination.
2014-10-07 15:36:16 -05:00
Steven Miers
160108a217
Merge video_mvp branch
2014-10-07 11:33:34 -05:00
Brian Smith
bffba5fcbc
VRFS-2219 changes based on Seth code review
2014-10-06 21:03:19 -04:00
Steven Miers
e25e3b16a9
VRFS-2027: Create video recordings from source in ApiRecordingsController#start
...
Also includes spec.
2014-10-06 18:17:08 -05:00
Steven Miers
8ec75bb4e7
VRFS-2025 : Specs for video_sources park.
2014-10-06 17:02:33 -05:00
Seth Call
71f6b7edc6
* VRFS-2304 - create scoring timeout when doing a network test
2014-10-06 16:44:30 -05:00
Steven Miers
47490ea3d9
VRFS-2025 Incremental
2014-10-06 16:17:46 -05:00
Steven Miers
dffdb78f71
Merge develop into this branch.
2014-10-06 16:17:36 -05:00
Brian Smith
7856e43f1e
VRFS-2219 active sessions should sort to top of Feed
2014-10-06 09:20:31 -04:00
Steven Miers
66feb39de8
VRFS-2023 - Migration, models and spec for recorded_video, a video analog to recorded_track.
2014-10-03 14:12:09 -05:00
Steven Miers
5135fe7faf
VRFS-2024 - Migration, model and spec for video source.
2014-10-03 13:36:51 -05:00
Seth Call
40506afaa0
* fix score tests
2014-10-01 09:55:51 -05:00
Seth Call
8889b8ce42
* merge in faster score searches (VRFS-2202)
2014-09-30 10:51:23 -05:00
Brian Smith
38b336c707
VRFS-2216 fix issue with sms_index function
2014-09-28 11:59:59 -04:00
Seth Call
b87ff571ce
* VRFS-1073 - support multiple websocket gateways
2014-09-24 14:27:56 -05:00
Seth Call
51b5923022
* fix broken tests
2014-09-22 15:55:02 -05:00
Seth Call
61f0bd2aa0
* merged
2014-09-22 14:20:58 -05:00
Seth Call
0db38e17d6
* adding tests for VRFS-2221
2014-09-17 10:22:05 -05:00
Brian Smith
1203a26271
Merge branch 'develop' into feature/opt_out_notification_fix
2014-09-15 23:02:53 -04:00