Seth Call
d139966445
VRFS-2643 - run eventmachine in it's own thread
2015-01-11 16:41:49 -06:00
Seth Call
2c8a4b8483
* VRFS-2642 - reconnect at start of each job
2015-01-11 15:43:42 -06:00
Seth Call
4d8a7a9bc1
* wip
2015-01-11 15:42:12 -06:00
d0c0c6d01e
VRFS-2498, VRFS-2499 : Validations.
2015-01-11 14:15:47 -06:00
Seth Call
e8ffb9c27d
Merge branch 'develop' into feature/session_jamtracks
2015-01-09 11:24:03 -06: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
cc3bf2ce1f
* wip
2015-01-08 20:35:39 -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
3028e421fb
VRFS-2614 : Allow jam track to be hidden to non-admin users by setting available=false.
...
Model, controller, admin UI, web UI, and spec to verify non-available
jam_tracks can only be seen by admin users.
2015-01-07 12:33:49 -06:00
Seth Call
405c155c71
* VRFS-2606 get offset time into MM:SS:MLS format
2015-01-07 11:07:26 -06:00
Seth Call
2ff30946e8
* VRFS-2606 - add new tap in fields, support them in activeadmin
2015-01-07 09:30:05 -06:00
67b1132d24
VRFS-2554 fixed notification for scheduled session with TBD date/time
2015-01-06 21:20:41 -05:00
Seth Call
af83a4f6a1
* VRFS-2608 - refactor and slight cleanup of UI towards new spec
2015-01-06 16:51:19 -06:00
Seth Call
1cb9f47f6c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-06 09:41:53 -06:00
Seth Call
7df0258015
* VRFS-2600 - tracks saved as id.ext to expose metadata
2015-01-06 09:36:05 -06:00
8540cd6b90
Merge branch 'feature/nocaptcha' into develop
2015-01-05 23:09:35 -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
8009e309ea
Merge branch 'develop' into feature/nocaptcha
2015-01-05 19:04:57 -06:00
18d06096b5
Revert "Fix spec that was magically passing sporadically."
...
This reverts commit 4cc70f2082
2015-01-05 19:04:08 -06:00
f677714e9a
Revert change.
2015-01-05 19:03:28 -06:00
02aef2fe17
Fix test failures for jam_track rights.
2015-01-05 19:02:48 -06:00
eb990dd930
One more foxy
2015-01-05 18:27:14 -06:00
4cc70f2082
Fix spec that was magically passing sporadically.
2015-01-05 17:47:27 -06:00
6cfe5decbf
Merge branch 'develop' into feature/nocaptcha
2015-01-05 17:04:13 -06:00
9d5d36f059
VRFS-2540 : Clean out some existing recaptcha scaffolding.
...
Current recaptcha gem only works within controllers, so pass flag down
the stack when recaptcha fails. Respect application config for
“recaptcha_enable” at all levels higher than user level. Allows usage
of existing mechanism for attribute validation and passing subsequent
errors back to the UI for reporting.
2015-01-05 17:01:28 -06:00
Seth Call
6906e4454a
* VRFS-2601 - REST API to return keys
2015-01-05 16:53:43 -06:00
Seth Call
d677b43c28
* VRFS-2603 private key now stored
2015-01-05 15:19:20 -06:00
Seth Call
aabbd90b02
* VRFS-2602 change jka to jkz
2015-01-05 14:39:55 -06:00
abbc01fc44
VRFS-2597 : Fix logging method in cleaner to fix spec.
2015-01-04 16:38:28 -06:00
2853c77b7e
VRFS-2597 : Fix some broken tests:
...
* Naming issues
* Restore method that was caught by friendly fire in a cleanup session
* Add a few new specs to properly exercise controller methods to catch
errors sooner, i.e., not in feature specs.
* Restore deleted route
2015-01-04 16:24:31 -06:00
Seth Call
d3b613c2dc
* updating new JamTrack resque jobs for non-forking behavior, log corrections (a bad pattern I started), and extending from Stats-enabled base jobs
2015-01-04 14:18:25 -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
77d62a4744
Merge branch 'feature/jam_tracks' of bitbucket.org:jamkazam/jam-cloud into feature/jam_tracks
...
Conflicts:
web/jt_metadata.json
web/spec/controllers/api_recurly_spec.rb
2015-01-04 09:02:04 -06:00
Seth Call
1f72d1cca4
* debug test that messes with websocket gateway
2015-01-04 09:00:50 -06:00
8eb7430d9a
One more stray puts.
2015-01-03 11:47:28 -06:00
Seth Call
1ede9574cd
VRFS-2547 - capitializing JAMTRACKS_DIR in ruby tests
2015-01-02 22:06:03 -06:00
Seth Call
82b7c005ec
* if promos is selected, then change text to 'Selected Sessions and Recordings' VRFS-2591
2015-01-02 11:18:39 -06:00
Seth Call
5758096f33
* fix bug in connection stats
2015-01-01 21:45:07 -06:00
Seth Call
0f288539cd
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-01 14:23:00 -06:00
Seth Call
9b1525715e
* fix a bug in broadcasting and also fix bad log refernce
2015-01-01 14:22:42 -06:00
559d2d720d
VRFS-2552 update query to include users started scheduled sessions not yet finished
2015-01-01 19:29:18 +00:00
Seth Call
8a84ff5609
* fix broken tests because of removal of diagnostics, and fix bad logging pattern
2014-12-31 23:17:47 -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
bbee617c4b
VRFS-1960 : Jam Track Signed Notification, usage in notificationPanel, and spec.
2014-12-22 14:23:05 -06:00
Seth Call
7ca3acb676
* wip
2014-12-22 09:50:59 -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
3bac8252e9
* fixing websocket tests
2014-12-18 16:26:56 -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
1a7420ffb1
Whack files no longer needed.
2014-12-15 12:26:38 -06:00
6407d2f22a
Merge from working branch
2014-12-15 12:16:19 -06:00
ac2daed4da
VRFS-2481 : Jam Tracks python layer and source.
2014-12-15 12:16:19 -06:00
f6fef00ea5
VRFS-1952 : Schema changes for proper type and incremental code changes. WIP.
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
93672844f2
VRFS-2529 remove quick-start scheduled sessions from account tab
2014-12-08 06:26:06 +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
34f0aff328
* build poke
2014-12-06 15:47:20 -06:00
207b7b9e20
VRFS-1890 : Mechanism to move track up/down, hook up in admin UI.
2014-12-06 14:04:31 -06:00
354f6320fc
VRFS-2463 (1) prevent duplicate claimed recordings from showing in sidebar, (2) only show public recordings and sessions with fan_access=true, (3) exclude recording / session being shown on landing page in the sidebar
2014-12-06 09:34:30 -05:00
9f60327d20
VRFS-2424 added user.genres; refactored band_genres to genre_players; incorporated editing of user genres in profile
2014-12-05 07:50:03 +00:00
868ca0b476
VRFS-1442 sessions band selection
2014-12-03 08:22:35 +00:00
9bdddc22ff
VRFS-1442 band deletion; band member layout; invitations; band admin support
2014-12-03 08:22:35 +00:00
465fd6fa94
VRFS-1442 prepend users bands to band search results
2014-12-03 08:22:34 +00: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
41096f08ad
VRFS-2480: Additional back-end and UI functionality required for checking out.
2014-12-01 18:45:41 -06:00
Seth Call
6ad844035d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-21 17:16:21 -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
f0b60f28e4
VRFS-2467 dedup users and instruments on session hover bubble
2014-11-21 01:20:27 -05:00
Seth Call
76adc44a50
* wip
2014-11-17 17:16:30 -06:00
Seth Call
b780b4a462
* merged
2014-11-17 13:32:13 -06:00
Seth Call
d1d059b4c5
* disable score_histories for now
2014-11-17 13:28:43 -06:00
b01b3ecd7d
VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge.
2014-11-16 16:23:31 -06:00
d65358cea6
VRFS-2442 suppress "Recurs once..." text for non-recurring sessions
2014-11-15 13:01:28 -05:00
118ed7c39c
undo last change re: other instrument id
2014-11-15 11:59:51 -05:00
12ca12f3cf
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-15 11:33:43 -05:00
8707bb2f16
set instrument ID for unstructured rsvp
2014-11-15 11:33:26 -05: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
Seth Call
c3cd742c17
* wip
2014-11-11 16:21:29 -06:00
6c825db79f
Merge update
2014-11-10 17:10:01 -06:00
Seth Call
4e00863de6
* merged
2014-11-07 16:16:25 -06:00
Seth Call
8cad33a303
* recording file/manager fixes and aging of recordings
2014-11-07 16:12:36 -06:00
c6bfd59999
VRFS-2462 fixed session count on musician hover bubble
2014-11-07 13:05:07 -05:00
Seth Call
164fe8db61
* recording cleanup logic VRFS-2393
2014-11-06 11:26:13 -06:00
Seth Call
ea601711fa
* make desk keys configurable
2014-11-05 20:32:37 -06:00
433fe0be74
Initial merge and manual conflict and fix for tests.
2014-11-04 14:55:12 -06:00
b2219da522
Merge feature/video_mvp to develop and resolve conflicts.
2014-11-03 18:28:28 -06:00
Seth Call
4f9bdb2c5c
* VRFS-2404 There are cases where a session can incorrectly get stuck in a 'I'm still recording' state
2014-11-03 15:24:46 -06:00
Seth Call
ace7ac15c8
* VRFS-2432 notify when stream mix is done
2014-11-03 10:00:42 -06:00
0007930936
VRFS-2401 revert to inline styles for email links for now, need to revisit better solution
2014-11-02 16:43:56 -05:00
33a431f822
VRFS-2427 fixed broken test
2014-11-02 14:26:56 -05:00
eb56be97dd
VRFS-2427 fix sorting / paging issue on Feeds screen
2014-11-02 12:57:43 -05:00
Seth Call
5f8953011c
* VRFS-2439 fix spurious -i argument in normalize-ogg and mp3 command
2014-11-01 21:21:42 -05:00
Seth Call
f0d675c10d
* fix typo in exist check
2014-11-01 21:10:12 -05:00
a310c46288
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-29 20:41:05 -04:00
Seth Call
4ee75adcf2
* make intermediary mp3 higher bitrate
2014-10-29 13:51:33 -05: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
Seth Call
149967f877
* VRFS-2375 - share button works now in master mix complete msg
2014-10-29 10:27:29 -05:00
Seth Call
28e752629a
* show private recording on recording landing page to someone who was in the session
2014-10-29 07:22:45 -05:00
6d8ec70087
VRFS-2401 text links in emails should be yellow
2014-10-29 07:12:43 -04:00
300bc2cd82
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-27 21:37:28 -04:00
Seth Call
53706aec71
* VRFS-2405 - cleanup more files in audiomixer, and input/output files in quickmixer
2014-10-27 17:52:56 -05:00
Seth Call
004674c562
* VRFS-2405 - cleanup files after successful audiomix
2014-10-27 17:49:14 -05:00
Seth Call
fb36b8e380
* VRFS-2408 - remove dup tracks from interfrace
2014-10-27 17:14:40 -05:00
Seth Call
5f87fdab00
* bah adding junk to AudioMixer file
2014-10-27 13:51:29 -05:00
Seth Call
bbff3ccab5
* remove debug print
2014-10-27 13:50:44 -05:00
Seth Call
970401374b
* VRFS-2399 - fixed recording sync track issue
2014-10-27 12:42:30 -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
68b9008ba8
* fix wrong class name in AudioMixerRetry
2014-10-25 11:35:59 -05:00
Seth Call
48dea5688e
* commit out fault audiomixer tests
2014-10-25 09:07:20 -05:00
Seth Call
58d96fc171
* VRFS-2192 - export recording button added to file sync dialog
2014-10-23 16:45:25 -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
d8a8a0d33b
remove byebug reference
2014-10-21 19:51:55 -04:00
af2159fe72
VRFS-1945 added create_type to music_sessions; filtering session search based on create_type
2014-10-21 07:27:26 +00:00
a8987efaa1
VRFS-2337 added latency badge to musician hover bubble
2014-10-19 21:18:05 -04:00
cce9fc1577
VRFS-2029 : Fix issue where a nil (instead of false)
...
is causing claimed_recording not to save properly.
2014-10-15 17:59:59 -05:00
e3dadf9c4b
VRFS-2032 : Youtube test account app name/developer key.
2014-10-15 15:17:03 -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
d95a063648
VRFS-2029 : Rails model attribute for upload_to_youtube flag
...
Also includes Rails validation.
2014-10-15 13:45:30 -05:00
077d3f4253
VRFS-2033 - YouTube client library
2014-10-15 12:25:05 -05:00
5691fbc51f
Require new scheduled_music_session_cleaner at class level.
...
Fixes broken unit test.
2014-10-14 14:54:18 -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
ab66504532
VRFS-2344 show musician hover on pages 2-n on Find Session screen
2014-10-13 20:58:30 -04:00
Seth Call
1673d88760
* fix broken mixer behavior
2014-10-13 09:49:52 -05:00
Seth Call
078de098ce
* fix test
2014-10-13 09:48:34 -05:00
257421a1d0
VRFS-2318 show JOIN button for non-scheduled (future) session
2014-10-13 08:40:10 -04:00
9f869f200f
VRFS-2282 added resque schedule cleaner test
2014-10-13 02:32:45 +00:00
95b26e9c00
Merge branch 'develop' into VRFS-2282
2014-10-13 02:15:01 +00:00
aef2b873f2
VRFS-1430 changed db default sender back to noreply; changed text for batch mails to FFFFFF from AAAAAA
2014-10-13 00:51:13 +00:00
26b124dde8
VRFS-2282 first pass purging stale sessions
2014-10-12 07:49:31 +00:00
c2c157a0ba
VRFS-2124 fix feed issue when session switches from fan_access=true to fan_access=false
2014-10-11 13:57:05 -04:00
bdd8c6db5a
VRFS-2219 activate session in feed when the active_music_session record is created
2014-10-11 08:53:26 -04: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
b30d71de6a
VRFS-2320 use from_user_mailer template for session comment
2014-10-07 21:16:56 -04:00
eddd8a526c
VRFS-2320 include from user info in session comment emails
2014-10-07 20:39:13 -04: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
94963f2ad1
VRFS-2028 : Add videos to list_uploads, in addition to tracks.
...
This is accomplished using a SQL union via arel.
2014-10-07 15:34:05 -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
1ce0ac34ef
VRFS-2025 : Add video_sources to join_the_session and its callers.
...
Creates and attaches video_sources just as it does tracks.
2014-10-06 17:02:10 -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
Seth Call
d5eeb03bd3
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-06 09:37:04 -05:00
Seth Call
993074b136
* pinning back devise
2014-10-06 09:36:55 -05:00
7856e43f1e
VRFS-2219 active sessions should sort to top of Feed
2014-10-06 09:20:31 -04:00
14c9a5b469
VRFS-2278 show tooltip for instrument icons on Find Session and Session Detail screens, show user friendly error when unable to approve RSVP
2014-10-05 22:12:50 -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
3080a92096
VRFS-1430 merge conflict correction
2014-10-01 22:12:48 +00:00
5d524cd7b0
VRFS-1430 added email from alias to JamKazam <{noreply,support}@jamkazam.com>; updated link colors to be 588C98
2014-10-01 22:10:54 +00: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
6442674c91
VRFS-2216 fix tests; include pending RSVPs and invites for session details screen
2014-09-28 22:37:52 -04:00
a07fdfe2a8
Merge branch 'develop' into feature/sprint_12_work
2014-09-28 12:00:32 -04:00
38b336c707
VRFS-2216 fix issue with sms_index function
2014-09-28 11:59:59 -04:00
Seth Call
39ed460d14
* VRFS-2280 - fix locations getting invalidated, and VRFS-1806 fixed by detecting no login data
2014-09-25 23:13:34 -05:00
da771acdaf
merge develop
2014-09-25 09:09:44 -04:00
Seth Call
b87ff571ce
* VRFS-1073 - support multiple websocket gateways
2014-09-24 14:27:56 -05:00
Seth Call
350f7ae19a
* poke for build
2014-09-24 09:15:52 -05:00
3f1eb86684
Merge branch 'develop' into feature/sprint_12_work
2014-09-23 21:27:52 -04: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
096c43c0e4
Merge branch 'develop' into feature/sprint_12_work
2014-09-19 00:25:20 -04:00
1858e0da49
VRFS-2218 VRFS-2197 allow unstarted scheduled sessions to be listed up to 12 hours after start time; allow completed sessions to be listed up 2 to hours after completion time
2014-09-19 00:24:38 -04:00
Seth Call
a396671f8b
* VRFS-2223 typo in music_session
2014-09-17 20:38:33 -05:00
Seth Call
0db38e17d6
* adding tests for VRFS-2221
2014-09-17 10:22:05 -05:00
Seth Call
6b96bdcd05
* VRFS-2221 - fix bad reconnect path
2014-09-17 10:22:00 -05:00
1203a26271
Merge branch 'develop' into feature/opt_out_notification_fix
2014-09-15 23:02:53 -04:00
4ddd4e4c13
VRFS-2066 fixed some issues with session landing and feed
2014-09-14 19:17:16 -04:00
03fe5e8a1e
VRFS-2066 consolidate users if they are listed multiple times in MSUH for the same session
2014-09-14 15:52:17 -04:00
f296932f27
fix more session join/leave bugs
2014-09-14 15:12:25 -04:00
e5a6ad862b
fix notification bugs - active_music_session vs. music_session confusion
2014-09-14 14:41:32 -04:00
072f3101c7
VRFS-2179 minor refactor of offline notifications to prevent a second loop from executing
2014-09-13 08:04:40 -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
d8d987e21f
VRFS-2179 send email to friends/followers when user joins a session
2014-09-12 22:57:03 -04:00
a47ffea5ad
VRFS-2136 added tests
2014-09-12 22:34:59 -04:00
4bdcf103ce
VRFS-2136 only return recordings that have at least 1 claimed recording
2014-09-11 21:52:26 -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
632d806825
remove debug statement
2014-09-11 09:04:14 -04:00
abc8f18c00
VRFS-2140 added more tests, fixed bug in band recording notification
2014-09-11 09:03:32 -04:00
71487d989b
Merge branch 'develop' into feature/opt_out_notification_fix
2014-09-11 08:38:56 -04:00
0b1f9d0c97
VRFS-2140 added more tests, fixed bug found in recording notification
2014-09-11 08:38:26 -04:00
Seth Call
7761c2e9a8
* VRFS-2155 fix passing of yellow
2014-09-10 09:25:43 -05:00
Seth Call
5b9987aa17
* fix broken artifacts path: VRFS-2153
2014-09-10 09:13:02 -05: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
8c22d68b60
* sort by date, not the array VRFS-2130
2014-09-08 21:50:51 -05: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
850709e51a
VRFS-2094 include hour, minutes, seconds in filename to avoid overwriting files in S3 added on the same day for different sessions
2014-09-08 21:13:08 -04:00
Seth Call
75d50b8286
* make notations private bucket; only allow access if user has can_join? permissions for session
2014-09-08 16:51:28 -05:00
07024a44a6
VRFS-2094 wip notation upload bug fixes
2014-09-08 09:13:20 -04:00
74763d53f3
VRFS-2094 fixed issue with notation file upload and tying it to music session; still need to fix download issue
2014-09-06 03:30:29 -04:00
Seth Call
f0304f2ca3
* VRFS-1981 - delete old scores
2014-08-31 22:24:11 -05:00
Seth Call
c35cfcf0f9
* VRFS-2104 make sure APP_CONFIG exists in websocket-gateway
2014-08-31 14:45:48 -05:00
Seth Call
5f85908c79
* VRFS-2104 - client update dialog happens when it needs to; not just on startup
2014-08-31 10:30:59 -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
9c4ab6418c
* wip
2014-08-19 14:23:41 -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
25e3f23dcf
VRFS-1891 VRFS-2022 bug fixes / test additions
2014-08-15 00:32:45 -04:00
af1a4596e0
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-08-14 23:57:51 -04:00
Seth Call
d34929d70b
* landing pages in VRFS-2037
2014-08-14 22:23:22 -05: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
4c85740597
* wip
2014-08-13 11:09:52 -05:00
e8847280bc
VRFS-1995 do not send notifications to users with canceled RSVPs
2014-08-12 02:20:25 -04:00
dece2afc1b
VRFS-1478 fix bugs
2014-08-12 00:24:57 -04:00
cc26969f8a
VRFS-1891 cancel RSVP flow fix
2014-08-09 23:22:17 -04:00
fd9893ca42
Merge branch 'develop' into hotfix/cancel_rsvp_flow
2014-08-09 18:35:23 -04:00
f97a416867
VRFS-1891 VRFS-2011 cancel RSVP flow / show proficiency in RSVP dialog
2014-08-08 02:22:32 -04:00
9249e99581
added method min_create_date
2014-08-05 12:09:12 +00:00
Seth Call
e871cc5390
fix latency presention - divide by 2 then round
2014-08-03 21:38:53 -05: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
Steven Miers
Brian Smith
Jonathan Kolyer
Brian Smith