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
96a816f317
merge develop
2015-03-21 10:06:53 -04:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
Seth Call
cfd80927f9
* fix broken tests that occurred when removing mount_uploader from jam_track_track
2015-03-17 13:39:21 -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
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
b91bc09817
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-15 11:09:21 -04:00
Seth Call
7c73e2ab5c
* VRFS-2922 - show spinner for pending metronome
2015-03-12 21:53:23 -05:00
948174f19a
VRFS-2701 musical experience bug fix
2015-03-12 21:34:20 -04: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
6c82e00d00
* VRFS-2876 cleaning up preview downloadability in jam-admin
2015-03-11 09:20:45 -05:00
Seth Call
9279d88d8d
* VRFS-2876 - pro licensing added and 20 second snippet
2015-03-10 22:10:22 -05:00
b998d28c37
VRFS-2795 merging with feature/musician_profile_enhancements
2015-03-10 04:33:37 +00:00
d865d0a1fa
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-09 20:25:28 -04:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
33f10e3197
VRFS-2795 fixing search specs
2015-03-09 06:13:56 +00:00
3810aecb00
merging feature/musician_profile_enhancements
2015-03-06 05:12:13 +00:00
e658e6f4b5
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-05 02:18:55 -05: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
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
63c45e0a6e
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-03-04 16:03:57 -06:00
2004d48fa1
Merge
2015-03-04 16:03:28 -06:00
12b610d2cb
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-04 02:03:22 -05: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
930166b213
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-02 12:00:39 +00:00
171dcb04f0
VRFS-2795 interests filter
2015-02-28 21:18:43 +00:00
88315fcc40
VRFS-2795 instrument and genre filtering tests
2015-02-28 20:37:15 +00:00
d95279e694
VRFS-2795 merging feature/musician_profile_enhancements
2015-02-28 20:18:56 +00:00
4d133e0043
merge develop
2015-02-28 02:24:23 -05:00
2d8748d4ee
VRFS-2795 iterating on tests
2015-02-28 04:24:53 +00: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
030fa1a351
VRFS-2782 : Add api controller test for multiple bitrates. Fix bug found as a result.
2015-02-26 17:43:22 -06:00
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
bd08b40e71
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-02-26 17:00:01 -06:00
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
2ea1259060
merging feature/musician_profile_enhancements
2015-02-24 06:08:33 +00:00
a2ef5e9859
VRFS-2795 gig and studio tests
2015-02-24 06:06:40 +00:00
83f3d56238
VRFS-2795 musician search first draft
2015-02-23 06:21:36 +00:00
c961c1fdc5
fix test
2015-02-22 22:36:15 -05:00
20ac47a2e1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-21 23:36:06 -05:00
500af2bc05
merge develop (had lots of migration issues)
2015-02-20 08:35:59 -05:00
bcd3785b45
VRFS-2785 : Update recurly client with refund functionality. Unit test to verify.
2015-02-19 16:40:19 -06:00
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
28ff54b000
VRFS-2695 wip new profile API
2015-02-13 03:16:48 -05:00
8bd311647a
VRFS-2693 performance model/tests
2015-02-13 01:32:55 -05:00
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
895fb92365
VRFS-2693 VRFS-2694 performance sample model wip
2015-02-11 22:33:10 -05:00
e3f27eeebc
VRFS-2694 user presence model tests
2015-02-10 02:44:16 -05:00
33aef8a380
VRFS-2694 user presence model
2015-02-05 03:34:25 -05:00
05ba1ea5d3
VRFS-2694 wip user presence model and spec
2015-02-03 23:37:20 -05:00
80305c05aa
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-02 19:22:33 -05:00
79507f5f06
VRFS-2693 VRFS-2694 wip new musician profile models and specs
2015-02-01 08:42:44 -05: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
8d19e4510e
VRFS-2693 VRFS-2694 wip new musician profile models
2015-01-31 16:07:34 -05: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
33177ddae6
Merge with develop.
2015-01-29 10:55:10 -06:00
5a2fbab21c
VRFS-2689 user model changes for musician profile enhancements
2015-01-29 00:45:47 -05:00
63574f5a25
VRFS-2667, VRFS-2668 : list_uploads and list_downloads implementation and tests.
2015-01-28 19:22:36 -06:00
d7fc313d5f
VRFS-2665, VRFS-2666 : Create models and relationships for two new tables: backing_tracks and recorded_backing_tracks
2015-01-28 19:22:36 -06:00
4741312294
Fix test, cleanup
2015-01-21 15:10:02 -06:00
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
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
73e8f9ac6f
VRFS-2465 wip text message changes
2015-01-12 01:26:27 -05:00
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
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
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
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
1ede9574cd
VRFS-2547 - capitializing JAMTRACKS_DIR in ruby tests
2015-01-02 22:06:03 -06:00
Seth Call
5758096f33
* fix bug in connection stats
2015-01-01 21:45:07 -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
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
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
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
795cb6f536
Dedicated spec for testing cleaner. Some cleanup/renaming.
2014-12-15 23:57:57 -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
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
6407d2f22a
Merge from working branch
2014-12-15 12:16:19 -06:00
f193ca2f42
VRFS-2529 added create type for session creation
2014-12-08 06:31:45 +00:00
937695e829
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-07 21:35:36 -05:00
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
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
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
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
eb56be97dd
VRFS-2427 fix sorting / paging issue on Feeds screen
2014-11-02 12:57:43 -05:00
a310c46288
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-29 20:41:05 -04:00
Seth Call
62833198b3
* VRFS-2431 - run normalize-ogg and normalize-mp3 to bump up master mix
2014-10-29 11:28:13 -05:00
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
709150edac
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-26 12:41:17 -04:00
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
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
3641521740
VRFS-2244 handle duplicate friend requests better
2014-10-14 02:12:33 -04:00
649027cda7
VRFS-2282 tests and music session time queries
2014-10-14 03:54:58 +00:00
6f27455b02
Merge branch 'develop' into VRFS-2282
2014-10-13 16:18:47 +00:00
Seth Call
078de098ce
* fix test
2014-10-13 09:48:34 -05:00
9f869f200f
VRFS-2282 added resque schedule cleaner test
2014-10-13 02:32:45 +00:00
26b124dde8
VRFS-2282 first pass purging stale sessions
2014-10-12 07:49:31 +00:00
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
d08475c34e
VRFS-2321 comment out session join email notification
2014-10-08 20:27:28 -04:00
f06ef0c716
VRFS-1430 fixed broken tests
2014-10-08 03:48:05 +00:00
9473ffa352
Merge branch 'feature/video_mvp' into develop
2014-10-07 17:37:06 -05:00
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
160108a217
Merge video_mvp branch
2014-10-07 11:33:34 -05:00
bffba5fcbc
VRFS-2219 changes based on Seth code review
2014-10-06 21:03:19 -04:00
e25e3b16a9
VRFS-2027: Create video recordings from source in ApiRecordingsController#start
...
Also includes spec.
2014-10-06 18:17:08 -05:00
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
47490ea3d9
VRFS-2025 Incremental
2014-10-06 16:17:46 -05:00
dffdb78f71
Merge develop into this branch.
2014-10-06 16:17:36 -05:00
7856e43f1e
VRFS-2219 active sessions should sort to top of Feed
2014-10-06 09:20:31 -04:00
66feb39de8
VRFS-2023 - Migration, models and spec for recorded_video, a video analog to recorded_track.
2014-10-03 14:12:09 -05:00
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
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
1203a26271
Merge branch 'develop' into feature/opt_out_notification_fix
2014-09-15 23:02:53 -04:00
Seth Call
9824fa2c61
* VRFS-2159 - rewriting some expectations for build server
2014-09-12 22:45:07 -05:00
Seth Call
2bd189b697
* VRFS-2159 merge
2014-09-12 22:30:51 -05:00
a47ffea5ad
VRFS-2136 added tests
2014-09-12 22:34:59 -04:00
c55413d349
added more tests, minor refactor, only send scheduled session notifications if target user is online
2014-09-11 21:29:48 -04:00
abc8f18c00
VRFS-2140 added more tests, fixed bug in band recording notification
2014-09-11 09:03:32 -04:00
0b1f9d0c97
VRFS-2140 added more tests, fixed bug found in recording notification
2014-09-11 08:38:26 -04:00
a7623aac26
VRFS-2140 do not send any email notifications if the user has opted out of receiving emails
2014-09-10 03:04:35 -04:00
Seth Call
cab20ba017
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-09-08 21:39:04 -05:00
Seth Call
406c86be29
* VRFS-2098 - protect against dup sessions showing up in daily email
2014-09-08 21:38:35 -05:00
d547e4c2d6
VRFS-2094 fix tests
2014-09-08 22:23:35 -04:00
Seth Call
f0304f2ca3
* VRFS-1981 - delete old scores
2014-08-31 22:24:11 -05:00
f39312662d
VRFS-2091 modified email regular expression to prevent 2 consecutive periods after the @
2014-08-27 23:36:57 -04:00
82090f5f55
VRFS-2072 copy all 1-time cancellations instead of just the first
2014-08-24 15:12:38 -04:00
b1f4ede997
VRFS-2072 fix session scheduler bug where RSVP requests were not being carried forward
2014-08-22 02:14:07 -04:00
Seth Call
6a01a1c2d6
* VRFS-2076, VRFS-2071 - musicians only listed once, and added spinner to find musician page
2014-08-21 14:58:14 -05:00
Seth Call
9d46f07153
* VRFS-2070 - work current_scores into a better query, and update the entire site to use it correctly
2014-08-20 17:06:57 -05:00
Seth Call
554d100c31
* VRFS-1962, VRFS-2047, VRFS-2046, VRFS-2006 - score breakdown hover and score badges are all tested and working
2014-08-19 20:58:24 -05:00
Seth Call
8f49a9ab66
Merge branch 'develop' into feature/latency_hover
2014-08-19 12:49:54 -05:00
Seth Call
3daedbd549
* wip
2014-08-19 10:07:21 -05:00
Seth Call
27f4adf772
* VRFS-2064 - stop cycle in network test; VRFS-2062 - don't store HTML in user-inputs
2014-08-18 20:41:44 -05:00
Seth Call
0c3a43a177
* wip
2014-08-18 10:37:55 -05:00
af1a4596e0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-08-14 23:57:51 -04:00
Seth Call
b9a5c75ec5
* VRFS-2055 - escape keyword in hand-crafted SQL query\!
2014-08-14 21:28:30 -05:00
5691e6092f
VRFS-2022 show private sessions/recordings in the feed
2014-08-14 01:45:37 -04:00
Seth Call
aa863240b9
* VRFS-1992 finished (daily session email improvements)
2014-08-01 16:17:04 -05:00
Seth Call
8048c5012d
* wip
2014-07-31 21:06:06 -05:00
Seth Call
00dee99e17
* wip
2014-07-31 20:16:38 -05:00
Seth Call
9544e3d075
* rename new column because it's not working for reasons I can't understand on the build server
2014-07-30 21:05:59 -05:00
Seth Call
2aab3c902d
* fixing test that failed on build server
2014-07-30 17:29:26 -05:00
Seth Call
a11ae44a90
* VRFS-1951 - make sure staging emails don't get sent from my machie
2014-07-30 16:39:59 -05:00
Seth Call
8966a3fc2f
* VRFS-1992 - check open_rsvps for daily session email, VRFS-1991 - remove hardcoded 10 in audio latency on create/join, VRFS-1990 - only send update rsvp notification if scheduled start time changes
2014-07-30 15:11:03 -05:00
24eb53cc07
fix syntax error and tests
2014-07-29 22:46:07 -04:00
Seth Call
027456105b
* VRFS-1968 - locids are now in score history
2014-07-29 18:11:00 -05:00
Seth Call
c3461e82a7
* VRFS-1976 - fixed issue where UI always picks 1st scheduled session; VRFS-1962 - use 'full latency' instead of just internet latency in musician search, find session, and new musicians email
2014-07-29 17:52:20 -05:00
Seth Call
1e6524e534
* VRFS-1956 - fixes for musicians page
2014-07-28 23:04:56 -05:00
Seth Call
e9a4f33420
* VRFS-1957 - use median instead of just most recent for current_scores
2014-07-28 17:37:47 -05:00
Seth Call
6a037d9987
* VRFS-1944 - user info added to scores and score_histories
2014-07-24 18:39:26 -05:00
Seth Call
cc6f3fe974
* VRFS-1934/VRFS-1936 - fix scrolling in sessions, VRFS-1938 - no dups in find session page
2014-07-23 15:11:02 -05:00
Seth Call
55e304e109
* try to fix millisecond sensitivity in rspec matcher
2014-07-22 14:46:26 -05:00
Seth Call
333e321877
* updating the last_jam info on user in 5 needed locations (login, registration, ftue, import, etc)
2014-07-22 14:36:45 -05:00
Seth Call
6c4bcd98be
* VRFS-1924 - score_history added
2014-07-21 16:42:30 -05:00
Seth Call
75b2f21823
* adding support for opting out of transaction cleaner for tests that make transactions
2014-07-19 21:35:48 -05:00
Seth Call
513a46067a
* merged
2014-07-19 21:12:11 -05:00
Seth Call
5f131f9407
* VRFS-1403 - maxmind single step import done
2014-07-19 21:11:16 -05:00
Seth Call
9b29189cc0
* VRFS-1922 - trying to fix test
2014-07-14 17:25:20 -05:00
Seth Call
8441acacef
* VRFS-1922 - marking unscheduled sessions as started if activemusicsession is created, and added a migration to fix up old sessions
2014-07-14 16:43:46 -05:00
Seth Call
c2a5936720
* wip
2014-07-14 15:53:04 -05:00
Seth Call
14dad29c59
* VRFS-1861 - show something useful in the session section of the account screen
2014-07-12 08:55:58 -05:00
Seth Call
ba4fa985bf
* VRFS-1877; list 4 hours old and newer sessions - also noticed that create session listed sessions were filtering TBD scheduled sessions; brought those back in
2014-07-11 22:44:49 -05:00
Seth Call
2923969e94
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-11 17:22:01 -05:00
Seth Call
014a423a3d
* VRFS-1860 - account screen lists by date; VRFS-1911 partially done (using proper date formatting)
2014-07-11 17:21:55 -05:00
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
Seth Call
55aea1109f
* VRFS-1869 - use offset
2014-07-10 22:08:03 -05:00
Seth Call
afa2fa58cf
* VRFS-1887 - make the RSVP text helpful as to the state of the session relative to the viewing user
2014-07-10 15:57:48 -05:00
Seth Call
f693470c63
* VRFS-1910 - approved_rsvps to handle null instruments on slots, as well as remove attr_accessors as holders on user model
2014-07-10 15:22:00 -05:00
Seth Call
f2975c8838
* VRFS-1908 - add more canceled checks
2014-07-10 11:27:26 -05:00
Seth Call
0020a8eb0d
* VRFS-1889 completed; VRFS-1879 - partially done
2014-07-08 13:34:03 -05:00
Seth Call
27fe4f4ae9
* VRFS-1880 - fixed issue and added test
2014-07-07 16:08:36 -05:00
Seth Call
b96cc32d3c
* VRFS-1858 use open_rsvp instead of music_access for scheduled session
2014-07-04 08:26:46 -05:00
Seth Call
9cb702f9de
* VRFS-1858 - fix sessions with no scheduled_start time being filtered
2014-07-03 22:47:11 -05:00
Seth Call
7a10e67c76
* take out restriction for max 12 hours in the future for scheduled sessions
2014-06-30 16:14:01 -05:00
Seth Call
cbe4bf1747
* VRFS-1757 - updated signin dialog to 'modern' standards; VRFS-1826 - 2/3 fixed
2014-06-30 15:44:28 -05:00
Seth Call
865b488f93
* VRFS-304 - user history (feed) tab
2014-06-27 14:17:56 -05:00
Seth Call
c7a0208804
* create session/find session 'what app' guard movement; * VRFS-1753 - network guard in place (and FTUE guard withit)
2014-06-25 16:54:31 -05:00
Seth Call
fe7c58bafc
* adding code to handled positive timezone
2014-06-25 10:21:36 -05:00
Seth Call
464c595d6b
* fixing controller/request tests
2014-06-24 10:33:31 -05:00
Seth Call
6d84241cae
* merged
2014-06-23 22:28:23 -05:00
Seth Call
5750584769
* VRFS-1803 - myriad create session styling fixes; some default behaviors added, UI behavors added; VRFS-1808; change up how upload files works
2014-06-23 22:26:27 -05:00
c5d9f41242
fix merge
2014-06-23 01:56:44 -04:00
e211871168
merge develop
2014-06-23 01:09:03 -04:00
Seth Call
3d1c4f2488
* VRFS-1790 - drag handles added to configure tracks; VRFS-1653 - fixed bug where slow initial connect would cause loop; also log in on initail connect instead of extra login message
2014-06-19 14:05:33 -05:00
74d5053a8a
allow session organizer to create RSVP for self without having invitation
2014-06-18 22:32:21 -04:00
Seth Call
a46180880e
* fixing a few web tests
2014-06-17 20:07:40 -05:00
Seth Call
39a55f562c
* VRFS-1684 and VRFS-1684 (find session APIs) completede
2014-06-17 17:16:49 -05:00
Seth Call
106222638f
* VRFS-1684 and VRFS-1686 - updating stored procs, added /api/sessions/nonactive/, adding a bunch of tests for sms_index
2014-06-17 14:10:24 -05:00
35f630bdd7
VRFS-1690 add autoapprove option to RSVP creation
2014-06-16 08:11:05 -04:00
87a74e235d
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-16 01:47:07 -04:00
75b22ced5b
added ability to retrieve RSVP requests by approval status
2014-06-16 01:46:52 -04:00
d02e10def5
fix asm_index stored procedure to populate all users of active sessionsinto ams_users_tmp whether they have scores or not
2014-06-15 19:26:13 -05:00
740d48631a
added ams_users invocation to ams_index method of controller; fixed bug in spec relating to user id accessor of user object
2014-06-15 10:58:19 -05:00
07c1a4c85d
added attribute accessors for music_session_id and latency; added access to ams_users_tmp via ams_users method in ActiveMusicSession; added test of same in the spec
2014-06-15 10:35:15 -05:00
3c3565893d
wire up live latency and tag; accessors for tag and latency; fix borked function def; ams_init function; ams transaction
2014-06-14 21:27:34 -05:00
2799a6443e
added asm_index method to controller and fix a few issues with asm_index and included a simple test
2014-06-13 23:51:54 -05:00
5fc9696d01
merge develop
2014-06-11 08:45:34 -04:00
4c758f3185
VRFS-1749 finished RsvpSlot model tests
2014-06-10 01:08:28 -04:00
0fe76dae13
VRFS-1749 finished RsvpRequest model tests
2014-06-10 00:35:38 -04:00
Seth Call
4a603cbaa2
* VRFS-1764 - fix for content falling out of bounds; VRFS-1762 - tracking audio latency now; need to still make sure this works with new create session flow when it arrives
2014-06-09 15:43:16 -05:00
5ed3a3de81
VRFS-1664 added test as if from queue
2014-06-09 05:40:25 +00:00
e547ced63d
VRFS-1664 updating tests with date mgmt
2014-06-09 05:35:39 +00:00
c0287cc224
VRFS-1664 enhancing tests
2014-06-09 05:12:29 +00:00
c66da4d945
VRFS-1749 RsvpRequest model tests wip
2014-06-07 16:37:50 -04:00
02a0ea12ac
VRFS-1749 RsvpRequest model tests wip
2014-06-07 13:19:02 -04:00
a09326470e
VRFS-1749 RsvpRequest model tests wip
2014-06-07 13:01:03 -04:00
2932d02894
VRFS-1664 added periodical test
2014-06-06 06:09:35 +00:00
18167e898d
VRFS-1665 added large batch test
2014-06-06 05:31:53 +00:00
0aa98146fe
VRFS-1664 reformatting code
2014-06-06 03:56:32 +00:00
a657236814
VRFS-1664 fixed large batch test
2014-06-05 16:29:01 +00:00
e669205c64
VRFS-1664 added looping test
2014-06-05 15:42:23 +00:00
84ed2949f6
VRFS-736 refactoring tests
2014-06-03 04:21:00 +00:00
abc1044431
VRFS-1664 added another test
2014-06-03 04:03:02 +00:00
8d35ea09e8
VRFS-1664 added another test
2014-06-03 04:01:48 +00:00
d36ec17436
VRFS-1664 fixed mail sending test
2014-06-03 03:25:23 +00:00
1f726df320
VRFS-1665 prevent session creator from getting notified of sessions
2014-06-02 06:17:31 +00:00
7ea659c71f
VRFS-1665 rewrote daily email queries and adding pagination; other tweaks
2014-06-02 06:01:55 +00:00
215fb1807c
VRFS-1664 fixed broken tests
2014-05-31 21:52:28 +00:00
4f5adf1340
VRFS-1664 fixing query
2014-05-31 20:41:48 +00:00
edbd3b1c6d
VRFS-1664 new musicians email
2014-05-31 19:09:18 +00:00
ae79912dab
merge develop
2014-05-31 07:41:59 -04:00
5b438ffaef
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-31 07:35:07 -04:00
e1e89d55e8
VRFS-1672 session settings dialog work / other bug fixes
2014-05-31 07:34:52 -04:00
Seth Call
e4da30f39e
* wip
2014-05-29 14:39:08 -05:00
Seth Call
05666f7927
wip
2014-05-29 14:34:18 -05:00
77b6bdf106
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-29 16:32:29 +00:00
f90f55fb11
VRFS-1665 added mail delivery test
2014-05-29 09:15:46 +00:00
f4533ebbf1
VRFS-1665 added non-pass case
2014-05-29 07:41:28 +00:00
243e06533b
VRFS-1665 scheduled session impl
2014-05-29 07:19:55 +00:00
69c92e1f76
fix test
2014-05-29 00:45:31 -04:00
7a4ad83cef
merge develop
2014-05-29 00:20:09 -04:00
ebfe72e11d
fix tests for scoring musician search
2014-05-28 21:19:50 -05:00
6f57265a0d
finish up mods for geocoding based on scores
2014-05-27 11:52:18 -05:00
7446898071
added tests for new_musicians
2014-05-26 14:16:01 -05:00
bc0e3ba0eb
VRFS-1681 cleanup unused notation files
2014-05-26 01:30:10 +08:00
81495315f7
simplify Search.new_musicians api
2014-05-22 21:42:07 -05:00
0e419a7881
VRFS-1692 cancel RSVP complete
2014-05-22 00:40:17 -04:00
94421c03c0
merge conflict with db/manifest resolved
2014-05-21 21:33:38 -05:00
09231c5fe6
fix for vrfs-1476 - scoring should store the detail data
2014-05-21 21:30:43 -05:00
836baee962
merging with develop
2014-05-21 21:55:26 +00:00
25f325d720
VRFS-1690 create RSVP request working
2014-05-21 17:47:11 -04:00
4a76e0c983
get_work has a larger radius and excludes the current connections address
2014-05-21 14:05:45 -05:00
3fd7805b1d
VRFS-736 removed pending send email tests
2014-05-21 07:30:20 +00:00
9ad0badff1
VRFS-736 filling out remaining subtypes
2014-05-21 06:20:15 +00:00
b998b87a01
VRFS-736 refactoring
2014-05-21 06:06:16 +00:00
70f34120b3
VRFS-736 refactoring
2014-05-21 05:24:52 +00:00
f793b14879
VRFS-1738 more RSVP API work
2014-05-21 00:57:32 -04:00
3e0667e24d
added Scores.score_conns to help with making scores for tests; comments for usage of musician_filter; optional score_dt for Score.createx; betterify query for connection in scoring api
2014-05-20 09:46:45 -05:00
96f62b1364
VRFS-1690 VRFS-1691 VRFS-1692 RSVP API work
2014-05-20 02:45:00 -04:00
f53ca0010d
VRFS-736 looping through results
2014-05-20 05:58:06 +00:00
cd801d7852
VRFS-736 fixing progression email algorithm and tests
2014-05-20 05:21:11 +00:00
d665a09080
scheduled session rsvp wip
2014-05-20 00:31:26 -04:00
ca53ee0ead
update data model / fix tests
2014-05-19 23:34:56 -04:00
97843035ba
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-05-19 23:36:23 +08:00
cdc9d121cb
VRFS-1674 Create Session API
2014-05-19 23:35:38 +08:00
4ddd699302
VRFS-736 filling out progression steps
2014-05-19 04:35:25 +00:00
30f2387658
VRFS-736
2014-05-19 03:23:14 +00:00
dce007a13d
VRFS-1670 VRFS-1671 VRFS-1678 RSVP work in progres
2014-05-18 22:31:25 -04:00
f6196bb2c8
VRFS-736 consolidating query
2014-05-19 00:43:37 +00:00
95100a1b49
VRFS-1668 added some edge case tests for new notifications (still need sunny day tests)
2014-05-18 14:59:57 -04:00
1271b74bc4
VRFS-736 passing tests
2014-05-18 06:14:19 +00:00
fbb86dd9e7
VRFS-736 tests passing and what-not
2014-05-18 05:24:07 +00:00
6e7562ffc8
VRFS-736 progression emails first pass
2014-05-18 00:12:01 +00:00
9eaa34b07f
disable lat lng and distance in queries for users
2014-05-17 14:55:26 -05:00
72110cb057
Merge branch 'develop' into vrfs1664
2014-05-17 17:43:35 +00:00
c51d7de5f4
VRFS-1664 some tweaks
2014-05-17 17:38:42 +00:00
7428a2f26b
VRFS-1664 new musician weekly email
2014-05-16 07:58:06 +00:00
091998c200
* fix music_session test
2014-05-16 01:22:21 +08:00
24117c1b67
VRFS-1718 added MusicNotation model, migration
2014-05-15 23:49:06 +08:00
Seth Call
a19d6dcc07
* adding RsvpRequest and RsvpSlot models
2014-05-14 15:48:42 -05:00
00e177311d
tests for last jam location setting and some cleanup of user manager and user location spec
2014-05-13 14:56:58 -05:00
ca27a6ab97
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
...
Conflicts:
db/manifest
2014-05-08 19:47:17 -05:00
3f688a8392
update user home base (last_jam_blah) fields upon registation and joining a music session as a musician
2014-05-08 19:44:52 -05:00
Seth Call
244f79eefb
* merging develop into feature/scheduled_sessions
2014-05-07 15:04:41 -05:00
Seth Call
23aec0d1a5
* uncommenting the index tests; fixed a bug too
2014-05-07 10:53:39 -05:00
Seth Call
5f1ea4c754
* merging manifest
2014-05-07 05:17:17 -05:00
Seth Call
9700fff691
* fixing some SQL in conn manager for querying active_music_sessions
2014-05-06 18:02:00 -05:00
Seth Call
7dd1e6c464
* renaming of tables in
2014-05-06 17:50:41 -05:00
Seth Call
732fd66f0e
* all tests pass; but need to now rename music session tables to match class names...
2014-05-06 16:17:26 -05:00
Seth Call
f3d39a351d
* wip
2014-05-06 08:34:38 -05:00
5f74bce061
VRFS-1577
2014-05-06 06:41:10 +00:00
Seth Call
eab5e5b72b
* merging in master with heartbeat fixes into develop after release
2014-05-05 10:50:47 -05:00
5cc515d615
a small cleanup of connection fields and fix broken tests
2014-05-02 13:44:29 -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
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
Seth Call
ad266e5b80
* VRFS-1663 (diagnostics), VRFS-1657 (configurable timer for heartbeats), VRFS-1653 (websocket connection cleanup)
2014-04-30 15:29:10 -05:00
2ee96c49ec
merging develop
2014-04-30 14:21:23 +00:00
dddc0311c0
VRFS-1577 VRFS-736 session ratings
2014-04-30 14:07:23 +00:00
Seth Call
9820562892
* more websocket/heartbeat fixes
2014-04-30 03:01:28 +00:00
Seth Call
00a6139cd1
* merged
2014-04-29 14:04:26 +00:00
e82ae132bd
fix method for adding connection to music session
2014-04-28 22:38:30 -05:00
c66f5879cf
VRFS-1576 fixed referrals_by_date to support pagination
2014-04-23 02:43:13 +00:00
b232344336
VRFS-1576 added referrals_by_date and associated test
2014-04-22 07:12:05 +00:00
62dbeaa818
VRFS-1576 added validation and tests
2014-04-20 23:20:27 +00:00
245727806d
VRFS-1576 affiliate_partner model
2014-04-20 22:55:40 +00:00
Seth Call
ac1b5d2e42
* fix for timecop
2014-04-15 17:02:51 +00:00
bf1e315b48
Merge branch 'develop' into vrfs925
2014-04-14 10:59:58 +00:00
9ddbc6ba5c
VRFS-925 finishing up tests
2014-04-14 10:57:21 +00:00
Seth Call
76e63193ca
* fixing some broken tests
2014-04-09 21:11:13 +00:00
5a4bff14d2
VRFS-925 running tests for server side GA events
2014-04-08 17:15:49 +00:00
7203124e89
merging
2014-04-08 07:21:50 +00:00
e5d280e374
VRFS-1483 final cleanup
2014-04-05 22:13:28 +00:00
e9f99dbe08
develop merge
2014-04-04 10:22:48 +00:00
b4a3c73917
VRFS-1483 fixed batch email test so it should always work in test Rails.env
2014-04-04 10:18:09 +00:00
Seth Call
700ef04edf
* VRFS-1531, and a fix for feed test having 'dirt' in it from other tests. also reverting batch mailer test
2014-04-04 23:16:38 +01:00
Seth Call
d1622cfd95
* fix batch_mailer tests
2014-04-04 20:02:44 +01:00
e750ac9e68
VRFS-1483 error handling
2014-04-04 10:08:00 +00:00
a7c8d9311f
VRFS-1483 fixing tests
2014-04-03 05:03:28 +00:00
Seth Call
90eb0bc081
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-04-02 00:43:10 +01:00
Seth Call
7bfe1cb634
* VRFS-1532 - launch in chrome, ff, or IE10/11. otherwise show instructions to go run it yourself
...
* VRFS-1541 - alphabetically order recordings
* VRFS-1563 - password reset page should have no crashes anymore.
2014-04-02 00:38:36 +01:00
accaa99e38
VRFS-1483 integrating opt-out; fixing tests
2014-04-01 14:42:26 +00:00
c7ff47dabf
Fixing failing test
2014-03-27 22:23:39 -05:00
Jonathan Kolyer
Brian Smith
Seth Call
Steven Miers
Scott Comer
Bert Owen
Anthony Davis