Seth Call
fc99fbce6c
* VRFS-3058 - fix uniqueness constraint on ShoppingCart and test
2015-04-19 11:43:54 -05:00
Seth Call
3c37cbbf59
* VRFS-3042 - remove duplicate registrations on pagination
2015-04-17 14:01:07 -05:00
Seth Call
fefd5a3fda
* jamtrack UI fixes: VRFS-3041 (ordering fixed), VRFS-3004 - loading/no more jamtrack notice fixes, and VRFS-3005 - filter by band works
2015-04-16 15:44:38 -05:00
Seth Call
4cf4e21552
* VRFS-2938 - packaging phase now shows % indicator
2015-04-16 14:45:29 -05:00
005dfdaa91
Merge branch 'feature/jam_track_analytics' into develop
2015-04-16 11:11:07 -05:00
705e67a810
VRFS-2874 : Clean up code and logic - fixes problem of false positive.
2015-04-16 00:21:45 -05:00
4db40f6d3b
VRFS-2874 : Some prerequisite functionality required for analytics.
2015-04-15 18:22:55 -05:00
Seth Call
19ad2fbcc5
* VRFS-2991 - sitemap generator done (but still vetting other parts of the site for basic SEO)
2015-04-14 16:39:39 -05:00
Seth Call
06c964a151
* VRFS-2977 - make facebook signup work with checkout flow
2015-04-14 14:12:24 -05:00
75f1098ca3
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-14 03:13:27 -04:00
Seth Call
1183d0790c
* add default to exiting sales databases
2015-04-13 16:05:43 -05:00
Seth Call
eee6be5d0b
* VRFS-2978 - give temporary pass to payment screen if you just filled out info
2015-04-13 15:54:23 -05:00
b81222278d
merge develop
2015-04-13 08:16:45 -04:00
252beca091
VRFS-2895 added unsubscribe link to email footer that doesnt require login
2015-04-12 11:03:12 +00:00
Seth Call
ab2925ef88
VRFS-2821 - payment history screen added
2015-04-12 13:46:22 -05:00
5a4157c563
check for nil
2015-04-10 20:19:53 -04:00
Seth Call
e42b926a5e
* VRFS-3028 - switch to using Recurly Adjustments for JamTrack purchases
2015-04-10 15:19:08 -05:00
246efbdaa8
merge develop
2015-04-09 20:47:01 -04:00
Seth Call
fd02e23572
* updated home page VRFS-2868
2015-04-08 22:44:21 -05:00
Seth Call
974049f204
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-04-08 14:36:48 -05:00
Seth Call
42dac058e1
VRFS-2884 - Update things in session and FTUE for default profile
2015-04-08 14:34:05 -05:00
3fd659c3df
VRFS-3019 : Fix :group_artist option on JamTrack query to not also group by id, like the regular version of the query.
2015-04-08 12:53:09 -05:00
0a451742ef
merge develop
2015-04-06 21:26:54 -04:00
086b3bc3c4
VRFS-2795 styling and descriptions
2015-04-04 20:26:41 +00:00
e0d2feb84d
VRFS-2795 pagination
2015-04-04 17:29:15 +00:00
e4795d9297
VRFS-2795 fixed filter description issue
2015-04-04 15:36:15 +00:00
e563ad0d8b
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 14:56:36 +00:00
91e9e73644
VRFS-2701 adding SoundCloud/YouTube sources fully functional
2015-04-04 21:46:37 -04:00
4fbf3e694d
VRFS-2795 filter description & spec tests; support for reset, cancel buttons; proper display and update impl
2015-04-04 14:55:41 +00:00
Seth Call
821ca9d76a
* VRFS-2875 - sales record keeping as well as recurly hook processing
2015-04-03 15:34:12 -05:00
4f7c43b9d8
VRFS-2795 cloning old search code into new musician_search
2015-04-02 14:52:16 +00:00
c3ede10f1d
merging feature/musician_profile_enhancements
2015-04-02 14:51:33 +00:00
a87c08afe3
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-01 23:09:51 -04:00
4c2d4958fe
VRFS-2894 Update email / user info in recurly upon finalize. Test to verify.
2015-03-31 20:25:54 -05:00
Seth Call
b1b2d3ad24
* VRFS-2869 - band landing page
2015-03-31 16:17:17 -05:00
Seth Call
47c6b3ec16
* VRFS-2870 - tests add for individual jam track song page
2015-03-31 15:17:43 -05:00
Seth Call
f7febfabcf
* VRFS-2999 - create whole track preview for master track on import
...
* VRFS-3000 - create duration for jam track
* VRFS-2996 - create jamtrack preview widget
* VRFS-2870 - individual jam track landing page (still needs tests)
2015-03-31 13:36:49 -05:00
ddc4decfd3
merging feature/musician_profile_enhancements
2015-03-30 06:07:43 +00:00
Seth Call
3d43f123b1
* VRFS-2992 -make mp3 as well as ogg preview
2015-03-29 21:51:14 -05:00
83c00ea6e4
merge develop
2015-03-29 10:12:42 -04:00
401fd43849
Merge branch 'feature/jam_track_ui_2' into develop
2015-03-27 15:48:08 -05:00
4f08f6acad
Merge and fix
2015-03-27 09:54:01 -05:00
Seth Call
e2957592ea
VRFS-2605 - audiomixer manifest updated for volume and offsets
2015-03-26 17:45:23 -05:00
3f994e3993
Merge branch 'develop' into feature/jam_track_ui_2
2015-03-26 11:59:49 -05:00
bb4ea7cd94
Merge branch 'feature/jam_track_ui_2' of bitbucket.org:jamkazam/jam-cloud into feature/jam_track_ui_2
2015-03-26 11:59:42 -05:00
Seth Call
ef78471b59
Merge cherry pick
2015-03-26 11:58:41 -05:00
Seth Call
4a36bc6982
* VRFS-2988 - relax position duplication constraint
2015-03-26 10:16:14 -05:00
21322318d8
VRFS-2795 latency ordering
2015-03-26 06:28:38 +00:00
f3344affaf
VRFS-2795 distance sort order
2015-03-26 05:56:43 +00:00
9eeb0e454b
VRFS-2795 merging with feature/musician_profile_enhancements
2015-03-26 03:31:21 +00:00
Seth Call
0848a59082
* merged develop again
2015-03-25 14:32:03 -05:00
Seth Call
f0c4647ef5
* VRFS-2981 - check for create_type = nil in scheduled_rsvp
2015-03-25 11:26:32 -05:00
Seth Call
53ef0f1b4f
VRFS-2975 - change jam track Id to varchar(64)
2015-03-25 11:11:10 -05:00
5f953d1b19
VRFS-2830 : Merge / manual fix
2015-03-25 10:56:24 -05:00
Seth Call
18563ff065
* VRFS-2890 fix infinite scroll as well as bug with limit vs per_page style scrolling
2015-03-24 14:59:20 -05:00
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
9face3b3f9
VRFS-2701 wip presence/sample edit
2015-03-23 16:27:36 -04: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
96a816f317
merge develop
2015-03-21 10:06:53 -04: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
10f25be8c4
* replace old style of volume changes VRFS-2964
2015-03-20 08:53:34 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
abb31c4e40
VFFS-2830 : Jam tracks account overview
2015-03-17 13:52:30 -05:00
Seth Call
bb35535262
* VRFS-2941 - fix meddling of mount_uplaoder with existing URS
2015-03-17 10:55:16 -05:00
c91fd0cb0e
merge develop
2015-03-17 03:10:22 -04:00
Seth Call
ab72438a3f
* VRFS-2932 - make preview apply to all jam track tracks
2015-03-16 17:50:38 -05:00
Seth Call
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
f4cd225142
VRFS-2823 : Bugfix and cleanup.
2015-03-15 19:45:58 -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
41626860a9
VRFS-2795 replacing musician page with new search filter
2015-03-12 04:39:20 +00: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
4ebbff42cc
VRFS-2823 : Jam Tracks shopping page updates
...
* Remove individual labels from search and show a “Filter JamTracks”
label.
* Style
* Add filter box for artist & populate
* Bind events in JS and pass through to api
* Tweak api park from “artist_name” to “artist”
2015-03-11 15:40:12 -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
882f2267cf
* fixing urls getting messed with my mount uploader
2015-03-09 16:35:39 -05:00
e91ee68d58
VRFS-2822 : Add options to query for both filtering on artist and grouping on artist (to get a list of artists through existing query infrastructure).
2015-03-09 10:11:47 -05: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
8bbfdbc013
VRFS-2795 instrument selection; json posting
2015-03-08 06:13:29 +00:00
03321a8166
VRFS-2795 instrument json
2015-03-07 06:19:14 +00:00
3549ea117c
VRFS-2795 generating json from filter settings
2015-03-06 07:20:14 +00:00
2b9bebb438
VRFS-2795 generate JSON from filter settings
2015-03-06 07:03:30 +00:00
15559f593f
VRFS-2795 sortorder, refactoring
2015-03-06 06:33:38 +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
d514a67be5
VRFS-2795 changed gig/studio vals to match profile enhancements branch
2015-03-05 05:51:26 +00: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
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
0e9f78ccdd
VRFS-2795 search filter front end start
2015-03-02 09:41:53 +00:00
bfd3f3fac6
VRFS-2795 filled out JSON_SCHEMA
2015-02-28 22:45:43 +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
8205b5ea58
* VRFS-2841 - load jmep into the backend
2015-02-27 08:37:12 -06:00
2823645a60
Merge with develop & fix manifest.
2015-02-26 17:49:10 -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
bd08b40e71
VRFS-2782 : Support multiple bitrates throughout models, managers, up loaders and builders.
2015-02-26 17:00:01 -06:00
0c599ca023
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-25 21:55:57 -05:00
Seth Call
4a7d6925da
* wip
2015-02-25 19:56:26 -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
ca9e3706c7
* wip
2015-02-25 16:13:04 -06:00
Seth Call
dbaeb8d996
merged
2015-02-25 10:43:21 -06:00
Seth Call
947d649f5f
* VRFS-2831 - metronome showing
2015-02-24 17:16:12 -06:00
9c9c01b2fd
VRFS-2785 : Make id fields accessible for admin UI.
2015-02-25 09:41:51 -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
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
83f3d56238
VRFS-2795 musician search first draft
2015-02-23 06:21:36 +00:00
20baeb8bd3
VRFS-2701 wip UI changes for musician profile enhancements
2015-02-21 09:20:11 -05:00
500af2bc05
merge develop (had lots of migration issues)
2015-02-20 08:35:59 -05:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
Seth Call
b09825d188
* VRFS-2791 - unique-ify recorded backing track and backing track IDs
2015-02-18 10:16:47 -06:00
Seth Call
39415cdf22
* remove BPM from jam_tracks
2015-02-17 10:41:49 -06:00
Seth Call
e40c964d97
* merged
2015-02-15 22:15:34 -06:00
Seth Call
afe9f65709
* merged
2015-02-15 22:14:30 -06:00
Seth Call
42a2abe99c
* merged
2015-02-15 22:01:06 -06:00
09b4ed09a4
VRFS-2696 edit musician profile API enhancements
2015-02-15 08:23:26 -05:00
4b97807fc8
fix syntax error
2015-02-14 21:14:13 -05:00
0a1837c4e6
VRFS-2695 VRFS-2696 wip get/update musician profile API changes
2015-02-14 21:02:26 -05: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
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
cce2ce2ffc
minor change to ensure current instance session id is used
2015-02-01 17:15:01 -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
33177ddae6
Merge with develop.
2015-01-29 10:55:10 -06:00
5ed67cc8f6
VRFS-2667, VRFS-2668 : Fix broken spec.
2015-01-29 09:50:13 -06:00
f521f3ba4c
VRFS-2689 new ruby models supporting db schema updates
2015-01-29 00:48:24 -05: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
6f8113b374
Merge branch 'develop' into feature/backing_tracks
2015-01-26 12:11:57 -06:00
Seth Call
9c9a42c2a5
* merged
2015-01-23 13:56:10 -06:00
3f2be132bd
VRFS-2539 protect against error during notification load if the related session is missing / clean up the notifications of nonexistent sessions
2015-01-21 22:40:31 -05:00
c70a5ee2bb
Merge branch 'develop' into feature/backing_tracks
2015-01-21 14:16:04 -06:00
f80b0e4f66
VRFS-2193 show only active musicians in each feed item detail view for in-progress sessions
2015-01-20 02:21:25 -05:00
cefce67e89
Merge branch 'develop' into feature/backing_tracks
2015-01-19 15:21:13 -06:00
Seth Call
f8b3d8cc7d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-19 10:25:53 -06:00
Seth Call
c5af644a38
* do not accept latency above 10000ms on user model
2015-01-16 17:20:07 -06:00
2017fed9ce
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-12 22:37:28 -05:00
54d0f36319
VRFS-2465 use new table for text messages
2015-01-12 22:37:07 -05: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
babd9d7d90
VRFS-2540 : Don't send welcome email if recaptcha fails. Spec to verify.
2015-01-12 12:41:44 -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
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
e9e9962c42
Conflicts:
...
db/manifest
ruby/spec/jam_ruby/models/email_batch_spec.rb
2015-01-07 17:44:56 -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
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
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
aabbd90b02
* VRFS-2602 change jka to jkz
2015-01-05 14:39:55 -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
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
8eb7430d9a
One more stray puts.
2015-01-03 11:47:28 -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
559d2d720d
VRFS-2552 update query to include users started scheduled sessions not yet finished
2015-01-01 19:29:18 +00:00
Seth Call
786486026b
* wip
2014-12-30 17:10:16 -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
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
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
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
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
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
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
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
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
a310c46288
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-29 20:41:05 -04: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
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
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
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
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
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
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
257421a1d0
VRFS-2318 show JOIN button for non-scheduled (future) session
2014-10-13 08:40:10 -04:00
95b26e9c00
Merge branch 'develop' into VRFS-2282
2014-10-13 02:15:01 +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
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
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
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
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
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
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
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
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
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
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
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
406c86be29
* VRFS-2098 - protect against dup sessions showing up in daily email
2014-09-08 21:38:35 -05: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
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
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
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
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
915bb4ad13
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-07-30 07:13:19 +02:00
Seth Call
dd318a9b8a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-29 21:43:44 -05:00
Seth Call
9013ff2e94
* VRFS-1987 fix stupid typo caused by refactor of MusicSession to ActiveMusicSession
2014-07-29 21:42:35 -05:00
0a075da783
VRFS-1983 session organizer cancelling RSVP should send notification to RSVP requester
2014-07-29 22:07:46 -04:00
19f36b7d1b
copy is_unstructured_rsvp flag on RsvpSlot
2014-07-29 21:52:08 -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
95dcea9ca7
fixed issue #1632 #1954
2014-07-29 18:15:23 +02: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
4f7c1ef22e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-27 11:46:38 -05:00
Seth Call
2dd6153ed8
* wip on score export
2014-07-26 14:18:17 -05:00
e87ae50dfe
VRFS-1942 tuning admin view
2014-07-26 04:10:40 +00:00
d28a65c5ff
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-26 03:59:11 +00:00
ff73c170bd
VRFS-1942 refactoring scheduled session emails; new admin view into batch email data queries
2014-07-26 03:58:58 +00:00
Seth Call
adb0b15555
* fixing bad schedules on scheduler.yml, and wip on admin web reporting
2014-07-25 15:01:14 -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
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
57728fbfe8
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-21 16:42:36 -05:00
Seth Call
6c4bcd98be
* VRFS-1924 - score_history added
2014-07-21 16:42:30 -05:00
ecf4b6f397
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-07-21 05:14:11 +00:00
b4ab41637c
VRFS-1629 added UserAuthorization.goog_auth method to exclude auths past expiration
2014-07-21 05:14:05 +00:00
25cff163dc
VRFS-1874 added query constraint to filter out users with last_jam_locidispid = NULL
2014-07-21 05:12:07 +00:00
4aa359fc13
VRFS-1921 legal policy links are now specific to environment, fixed bug with legal policy link on Session Info page
2014-07-21 01:05:07 -04: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
5027000c49
VRFS-1927 Session organizer needs to be prohibited from canceling their RSVP
2014-07-16 20:19:43 +02:00
590e6d8028
VRFS-1926 fixed, fix scheduled session query
2014-07-16 18:21:21 +02:00
Seth Call
ae8c3120aa
* wip
2014-07-14 17:22:49 -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
26f7d2755b
VRFS-1918 Session Details Update Screen - once over with tests
2014-07-14 20:40:00 +02:00
6b00538436
miscellaneous formatting fixes
2014-07-13 13:36:56 -04:00
Seth Call
4b4a6606bf
VRFS-1882 - you can create (actually, join) a session multiple times...
2014-07-12 22:20:15 -05:00
a7621b0326
VRFS-1911 fixed date formatting in app / email notifications, added session name and start time to popup notification
2014-07-12 18:24:12 -04: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
d47218961e
* working on formatting still
2014-07-11 21:11:34 -05:00
Seth Call
471a0d13a0
* VRFS-1917 - timezone set correctly
2014-07-11 20:54:54 -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
74b2f19460
* VRFS-1897 - fix the creator getting approval notice
2014-07-10 16:37:48 -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
3a5d146ef3
* change can_delete to can_cancel, and don't cehck for start_at anymore
2014-07-10 11:38:17 -05:00
Seth Call
f2975c8838
* VRFS-1908 - add more canceled checks
2014-07-10 11:27:26 -05:00
Seth Call
71737f3f5e
* VRFS-1879 - handle case of no instruments selected for others; VRFS-1894 - canceled RSVPs that have not been dealt with are not shown
2014-07-08 16:52:25 -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
4872c037ad
added field to approved_rsvps method per request from Bert
2014-07-05 21:51:45 -04:00
4e1a68f344
VRFS-1855 fixed Create / Find Session issues related to open RSVPs
2014-07-03 00:51:54 -04:00
421d183ba3
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-07-02 15:57:55 +02:00
2ced001f77
add account scheduled session properties page, add spec, fix detail page, create session flow
2014-07-02 15:57:18 +02:00
Seth Call
607c0a145d
* get rid of print
2014-07-01 13:26:27 -05:00
Seth Call
ba57c00dec
* VRFS-1429 - instruments stay selected, and tos stays selected
2014-07-01 13:19:33 -05:00
b0011137b9
VRFS-1827 add Fan Page URL to session info page
2014-07-01 00:44:10 -04:00
0ece384569
VRFS-1828 VRFS-1829 add date/time info to Find Session screen, fix RSVP dialog issues
2014-07-01 00:36:06 -04:00
Seth Call
2cdc1b87e3
VRFS-1817 remove jamtracks option
2014-06-30 16:24:56 -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
63dfb8929c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-30 15:44:38 -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
156095f3c8
Merge branch 'develop' of https://bitbucket.org/jamkazam/jam-cloud into develop
2014-06-29 15:55:18 +02:00
07d96d7a57
VRFS-1667, VRFS-1729 implemented account session page, session detail page
2014-06-29 15:54:51 +02:00
287faa765c
VRFS-1812 added latency indicators to the session info page
2014-06-28 13:06:32 -04:00
Seth Call
b130818011
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-27 14:18:09 -05:00
Seth Call
865b488f93
* VRFS-304 - user history (feed) tab
2014-06-27 14:17:56 -05:00
eb30ee3391
VRFS-1672 music notation file upload work
2014-06-26 23:07:48 -04:00
Seth Call
f9ce995a8f
* tweak date offset logic
2014-06-25 21:50:20 -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
31ec7ae6b1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-06-25 14:49:44 +00:00
05b3d855d7
VRFS-1458 cleaned up labels and selection issues with country/region/city selects
2014-06-25 14:49:33 +00: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
e211871168
merge develop
2014-06-23 01:09:03 -04:00
f4b4734c94
VRFS-1669 find session work
2014-06-23 00:58:37 -04:00
bc47a0a599
VRFS-1669 find session wip
2014-06-21 16:16:39 -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
af06127403
fix create session flow, rsvp
2014-06-20 02:43:21 +08:00
b4151c27e9
VRFS-1669 VRFS-1672 session settings dialog / find session work
2014-06-19 00:21:34 -04:00
74d5053a8a
allow session organizer to create RSVP for self without having invitation
2014-06-18 22:32:21 -04:00
7f6a5e75ff
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-19 00:16:24 +02:00
f27ff725ef
fix create session flow errors.
2014-06-19 00:15:56 +02:00
Seth Call
8efe5ee575
* adding name proxy method
2014-06-18 09:54:08 -05:00
Seth Call
e3d521e07a
* adding in session.name to show.rabl and history_show.rabl
2014-06-18 08:09:36 -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
Seth Call
3ef4619872
* cleaning up minor things
2014-06-16 15:58:44 -05:00
Seth Call
8d16bdacfa
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-16 15:41:52 -05:00
Seth Call
f680fafaf3
* VRFS-1684 - adding latency to participants and approved_rsvps JSON response.
2014-06-16 15:41:37 -05:00
35f630bdd7
VRFS-1690 add autoapprove option to RSVP creation
2014-06-16 08:11:05 -04:00
75b22ced5b
added ability to retrieve RSVP requests by approval status
2014-06-16 01:46:52 -04:00
4c81fdc1eb
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-15 15:49:47 -04:00
7f3f47c3e6
VRFS-1749 session info tests
2014-06-15 15:49:43 -04: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
ab2ad1b93c
Merge branch 'feature/scheduled_sessions' of https://bitbucket.org/jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-15 15:12:07 +08:00
db6d6fa315
fix tests, rsvp error
2014-06-15 15:10:44 +08:00
ab5a7dc47a
Merge branch 'feature/scheduled_sessions' of bitbucket.org:jamkazam/jam-cloud into feature/scheduled_sessions
2014-06-14 21:27:43 -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
a557e9966a
VRFS-1749 more session info tests / fix "deprecated" warnings
2014-06-14 13:13:45 -04:00
Seth Call
Steven Miers
Brian Smith
Jonathan Kolyer
Brian Smith
root
Bert Owen
Scott Comer