dde84587b9
VRFS-3036 syncing ui/json
2015-06-03 06:41:21 +00:00
d60eff50ba
VRFS-3246 : Support online presences and performance samples through sub-widget. Incremental.
2015-06-02 15:13:41 -05:00
1f076dcc75
VRFS-3246 : More reliable layout and styling for online presence and performance samples.
2015-05-31 20:14:18 -05:00
4dbf2e1c95
VRFS-3246 : Refactoring to allow online presence and samples controls to be used on bands -- incremental.
2015-05-31 17:35:09 -05:00
a22a77bbb6
VRFS-3245 : Fix genre validation on wrong step.
2015-05-31 14:54:29 -05:00
7f02ca5240
VRFS-3245 : Hook up help hover bubbles
...
* Refactor common profile help bubble initialize convenience function
to profile_utils.
* Add new hover bubble text and hook up via HTML attribute on anchor tag
2015-05-31 09:53:28 -05:00
Seth Call
2cb01d8492
* VRFS-3268 - make bugsnag and recurly async
2015-05-29 21:33:45 -05:00
540c3cc37f
VRFS-3245 : Instrument selector
...
* Wrap instrument selector widget in dialog widget and delegate as
necessary
* Add instrument info to band api result
* Integrate with band setup flow
* Style to approximate spec
* Fix a few logic and syntax errors encountered along the way
2015-05-29 21:04:33 -05:00
Seth Call
666fbfff2a
* remove stats write for now, until stats server is hTTPs
2015-05-29 16:22:32 -05:00
Seth Call
43b92d4a17
* VRFS-3264 - help bubbles on jamtrack browse screen when not logged in, VRFS-3267 help IE11 visualize jamtrack browse page correctly
2015-05-29 15:30:23 -05:00
d91d0b0cfe
VRFS-3245 : Instrument selector dialog -- incremental.
2015-05-28 22:41:03 -05:00
c02f8ceda8
VRFS-3245 : Fix reset form logic.
2015-05-28 22:39:32 -05:00
a4317a532b
VRFS-3245 : Render optional controls
...
* If new member is wanted, show play commitment and touring option
* If paid gigs, show amount and gig minimum
* Works largely through class names.
2015-05-28 17:12:39 -05:00
Seth Call
07e8397187
* add in page name
2015-05-28 15:04:20 -05:00
8d73ef6aac
VRFS-3245 : Serialize additional attributes.
2015-05-28 14:21:55 -05:00
Seth Call
6ba4c4d280
* remove debugging print
2015-05-28 14:06:08 -05:00
Seth Call
90dbb395bd
* fix navigation timings
2015-05-28 13:57:07 -05:00
Seth Call
de4411fbdd
* add preview text and preload master on landing page
2015-05-28 13:52:20 -05:00
Seth Call
54a7cb40c9
* turn timing off, and track with GA
2015-05-28 11:10:50 -05:00
Seth Call
e9504b1fc6
* performance API and color changes on affilate page
2015-05-28 10:34:07 -05:00
Seth Call
31a0803019
* VRFS-3226 - default WDM to 48000 on selection. fix bad filter logic for monthly payments (VRFS-3030)
2015-05-28 08:53:24 -05:00
Seth Call
d959a17be4
* affiliate program in place VRFS-3030
2015-05-28 08:20:14 -05:00
c714b98af1
VRFS-3245 : Integrate iCheck and style accordingly.
2015-05-27 13:11:12 -05:00
4f5a39db18
VRFS-3036 band results display
2015-05-27 15:08:04 +00:00
e50dc6e20d
VRFS-3036 band search results
2015-05-27 12:17:42 +00:00
b64aff9fdc
VRFS-3036 merging
2015-05-27 09:17:36 +00:00
1bd1794318
VRFS-3036 band web search args
2015-05-27 08:20:46 +00:00
caca4165fe
merge feature/musician_profile_enhancements
2015-05-27 02:21:25 +00:00
064f402f59
VRFS-3244 : Add additional fields for musical experience. Fix a few bugs and style issues.
2015-05-23 13:00:22 -05:00
c5fc6cb93d
Fix typos.
2015-05-23 08:36:48 -05:00
da58ac6eab
merging
2015-05-22 08:20:07 +00:00
b5f46329b3
VRFS-3036 tightening code
2015-05-22 08:09:52 +00:00
14bce171c8
VRFS-3036 fixed nits
2015-05-22 07:48:05 +00:00
777d4a39cb
VRFS-3036 tohire builder
2015-05-21 06:42:27 +00:00
3af55a3c14
VRFS-3036 tohire builder
2015-05-21 05:47:14 +00:00
a3c09bf8ad
VRFS-3244 : Incremental - Refactor some common code. Whack unused code.
2015-05-20 19:46:29 -05:00
429d5ad35d
VRFS-3244 : New navigation logic for band profile editor -- incremental.
2015-05-20 14:17:53 -05:00
Seth Call
c96f0a7859
* VRFS-3260 - fraud check code and admin helpers complete
2015-05-20 09:24:17 -05:00
8d3247e084
VRFS-3036 to hire builder
2015-05-20 09:24:53 +00:00
1a91704532
VRFS-3036 band search filters
2015-05-20 06:25:22 +00:00
f16bd28574
VRFS-3243 : Ability to selectively skip genre validation
2015-05-19 13:32:15 -05:00
e794ccc7af
VRFS-3036 bands to_join builder controls
2015-05-19 05:48:29 +00:00
21f90d7352
merging
2015-05-19 00:45:53 +00:00
826022d414
VRFS-3243 : Band profile basics
...
* Convert to HAML
* Update to look and layout.
* Update how avatar control is optionally hidden, so the table view
will still work properly.
* Prevent double-submits.
2015-05-18 19:19:54 -05:00
d684ecda3b
Merge with latest from develop and manually fix.
2015-05-18 16:02:07 -05:00
Seth Call
48f61552ce
* VRFS-3216 - send up stats more fully formed
2015-05-18 14:18:48 -05:00
Seth Call
1be53f2563
* VRFS-3216 - refine landing events
2015-05-18 14:08:39 -05:00
Seth Call
781a9838b7
* VRFS-3216 - add virtual page views for JamTrack funnels, add test mode for fraud check VRFS-3260
2015-05-18 10:33:58 -05:00
737367b016
VRFS-3036 building out band search filter features, refactoring musician search filter
2015-05-18 04:00:12 +00:00
Seth Call
0264c539b1
*hardcoding https where http is found
2015-05-15 18:25:47 -05:00
Seth Call
2c6a5fe81a
* fix facebook signup issues VRFS-3253
2015-05-15 16:01:39 -05:00
Seth Call
eba9afab04
* fix bug in ability to open JamTrack
2015-05-15 15:30:15 -05:00
Seth Call
8e7ebcf3d6
* VRFS-3236 - update landing pages for jamtracks
2015-05-15 15:02:00 -05:00
Seth Call
939f8cdf82
* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests
2015-05-15 12:34:35 -05:00
11f60b71e4
VRFS-3242 : Schema and model changes required for band profile functionality.
...
* Additional attributes for band_type, band_status, concert_count,
add_new_members, play_commitment, touring_option, paid_gigs,
hourly_rate, gig_minimum
* For joined table musician_instruments, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table performance_stamples, remove the hard requirement
that they be joined to a user, rather a “player” that is polymorphic.
* For joined table online_presences, remove the hard requirement that
they be joined to a user, rather a “player” that is polymorphic.
* Change models as appropriate with new attributes and modify
belongs_to / has_many directives as necessary.
* Fix existing usages of user_id to work with polymorphic player_id.
* Fix tests that use user_id
* Add new tests that exercise online_presence, performance_samples, and
instruments that target a band, rather than a user.
2015-05-13 21:06:14 -05:00
193888f960
VRFS-3242 : Merge with latest develop
2015-05-13 20:56:58 -05:00
Seth Call
fb463d6703
* VRFS-3234 - auto-open jamtrack from account screen
2015-05-12 15:45:23 -05:00
Seth Call
9459215a0f
* reset filters if none specified VRFS-3237
2015-05-12 14:59:53 -05:00
Seth Call
41945d73fe
* VRFS-3211 - seek updated to be more responsive
2015-05-12 14:49:52 -05:00
Seth Call
9edc291ced
* VRFS-3211 - seek feature updated to be more responsive
2015-05-12 14:42:10 -05:00
Seth Call
2723cd8a78
* VRFS-3215 - add checkoutComplete URL
2015-05-12 14:14:44 -05:00
Seth Call
831fdf8c8e
* add https to artifact update
2015-05-12 11:55:55 -05:00
b0fd3fd4c8
VRFS-3007 : Test for presence of online presence and performance samples for musician profile feature. Also, add classes to ease identification of dynamically added elements. Fix a few style issues.
2015-05-11 17:25:57 -05:00
294c01d44a
Merge with latest develop
2015-05-11 17:25:37 -05:00
ec6f50bc70
VRFS-2858 : Soundcloud recording widget. Hooked up on profile summary page.
2015-05-09 20:08:49 -05:00
Seth Call
62b6820e90
* VRFS-3220 - estimate taxes manually
2015-05-09 08:30:12 -05:00
7beacb1803
VRFS-3227 : Genre selector dialog:
...
* Change from table to a 3-column list
* Format/spacing for caption
2015-05-08 19:07:08 -05:00
Seth Call
35057a4da0
* skip default input when querying sample rate
2015-05-08 18:39:04 -05:00
eaf4f49763
VRFS-3015 : Add list items as necessary and remove ordinal selectors. This prevents both some spacing issues and flash of empty list items seen when the form is loaded.
2015-05-08 17:51:33 -05:00
3314515577
VRFS-3105 : Update online presence after updating, and not just on init. Also call show on the appropriate elements, as they could be hidden if an item is being set for the first time.
2015-05-08 16:44:55 -05:00
Seth Call
b80cf2f1cc
* don't set chat's sample rate
2015-05-08 16:00:30 -05:00
ca46ffa43b
VRFS-3104 : Profile Sample edit screen : fix list items displaying over one another.
2015-05-08 15:36:37 -05:00
Seth Call
e5e6742400
* VRFS-3225 - don't show sampler dropdown if old client
2015-05-08 15:35:17 -05:00
Seth Call
10da152916
* VRFS-3225 - show sampler ate dropdown
2015-05-08 15:03:19 -05:00
183f5a5fdd
VRFS-3046 : Add profile interest help bubbles (topics stored as attributes on element)
2015-05-08 11:45:13 -05:00
6d6307f9c9
VRFS-3047 : Polish Save & Next buttons on profile editing screens.
2015-05-07 18:01:12 -05:00
Seth Call
2495f58bf5
* VRFS-3220 - estimated taxes fixed
2015-05-07 14:48:16 -05:00
6fb07d8a31
VRFS-3036 more refactoring
2015-05-07 19:02:21 +00:00
13c1c5311e
VRFS-3036 more refactoring
2015-05-07 19:02:21 +00:00
33cdb33f37
VRFS-3036 refactoring musician_search into base_search
2015-05-07 19:02:21 +00:00
5a6049c935
VRFS-3036 more refactoring
2015-05-07 18:08:36 +00:00
6a23477c4e
VRFS-3036 more refactoring
2015-05-07 17:11:24 +00:00
4cf7f20844
VRFS-3036 refactoring musician_search into base_search
2015-05-07 15:21:39 +00:00
Seth Call
12eeb460a3
* VRFS-3212 - track counts of concurrent packaging attempts
2015-05-07 08:49:15 -05:00
Seth Call
f593a6d706
VRFS-3208 - let admins purchase anyway when pucrhase_nabled = false
2015-05-07 07:45:07 -05:00
Seth Call
76a4a13c41
* fixed the message that occurs when gear goes in/out of USB during FTUE
2015-05-06 22:44:16 -05:00
Seth Call
b523850296
* VRFS-3208 - add new config - purchases_enabled, so that we can stop purchases if needed
2015-05-06 22:09:07 -05:00
Seth Call
6e5472f219
* VRFS-3206 - cancel out of StopRecording earlier
2015-05-06 21:08:17 -05:00
2d1877926e
VRFS-3063 : Fix genre selection bug with proper use of unbind.
2015-05-06 16:07:14 -05:00
Seth Call
0b9d1c3ed2
* VRFS-3201 and probably VRFS-3202 - don't issue two stops to backend and don't issue two openrecordings
2015-05-06 15:54:06 -05:00
a823be0b2e
VRFS-3007 : Stub non-existent method to fix test.
2015-05-06 13:24:03 -05:00
Seth Call
eaabd98ca4
* VRFS-3198 - fix simple boolean bug to rectify out of sync play/pause buttons on playcontrols
2015-05-06 11:54:09 -05:00
Seth Call
4c14e1fbee
* VRFS-3196 - pass correct value (even if it's ignored by backend today)
2015-05-05 18:45:14 -05:00
Seth Call
05f5cd619a
* VRFS-3193 - indicate on jamtrack browse page that 1st jamtrack is free
2015-05-05 16:38:29 -05:00
Seth Call
8f445883fd
VRFS-3146 - fixes for the get ready spiner
2015-05-05 10:29:30 -05:00
Seth Call
5970fae4fa
* VRFS-3188 - sort instrument appropriately
2015-05-05 09:22:15 -05:00
Seth Call
0ac94ae6fc
* VRFS-3167 - call context.jamClient.FTUELoadAudioConfiguration when dialog is loaded
2015-05-04 20:56:05 -05:00
Seth Call
99fa64f4b0
* initialize inviter when user is logged in - VRFS-3180
2015-05-04 18:24:46 -05:00
Seth Call
af98559dfd
* VRFS-3181 hide availability filter
2015-05-04 18:01:03 -05:00
Seth Call
4d28915381
* VRFS-3177 - add spinner to playback and stop preloading all media on page
2015-05-04 17:48:14 -05:00
Seth Call
17ce9f641d
* VRFS-3165 - stop preview widget by using pause, VRFS-3174 - stop preview when you leave page
2015-05-04 14:09:55 -05:00
Seth Call
b0dfccec85
* VRFS-2931 - show video as thumbnail
2015-05-04 11:16:13 -05:00
Seth Call
acc9e2112d
* call new sample rate setters when FTUE profile is created VRFS-3144
2015-05-04 09:01:51 -05:00
Seth Call
a2d5c0a2b9
* VRFS-3166 - only play one widget at a time
2015-05-04 07:52:30 -05:00
Seth Call
4cadabe19e
* VRFS-3149 - paginator arrows now working
2015-05-03 22:27:48 -05:00
Seth Call
4cc9dbb896
* VRFS-3130 - slider shows 0 on stop
2015-05-03 22:07:23 -05:00
Seth Call
23108544bc
* don't check against backend while user has stopped playing VRFS-3145
2015-05-03 21:48:31 -05:00
Seth Call
7063d6e1ea
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-05-03 21:28:28 -05:00
Seth Call
f1c96c1531
* feature/VRFS-3146
2015-05-03 21:28:17 -05:00
4c4121e4d7
Merge with latest develop
2015-05-01 20:00:08 -05:00
4a83100f37
VRFS-3119 : Musician search bug fixes. Fixes some more tests.
2015-05-01 18:48:41 -05:00
Seth Call
32f0967b2a
* VRFS-3141 - tell user why they can't close JamTrack
2015-05-01 16:34:56 -05:00
Seth Call
3697ca9743
* VRFS-3141 - disable close button for JamTrack for non-opener
2015-05-01 16:34:29 -05:00
Seth Call
9f49e9f366
* disable close button for JamTrack for non-opener
2015-05-01 16:30:03 -05:00
Seth Call
7d313b2298
* VRFS-3136 - make sure the 'preferred' is chosen for device, so set the FTUE preferred sample mode
2015-05-01 15:40:42 -05:00
Seth Call
7dec27083b
* VRFS-3139 - hide jamkazam virtual input text in account summary screen
2015-05-01 12:16:13 -05:00
Seth Call
1cd57cb4e8
* VRFS-3118 - check for high latency while in session, VRFS-3138 - fix tons of issues with user downloading both sample rates
2015-05-01 12:09:18 -05:00
51dc0c408a
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-30 19:33:04 -05:00
Seth Call
68b4ab529a
* VRFS-3118 - reload audio globally configurable
2015-04-29 22:03:02 -05:00
Seth Call
69ccf0d4e5
* VRFS-3118 - refresh latency by start/stopping audio system
2015-04-29 21:51:54 -05:00
Seth Call
0ddbfc5e72
* VRFS-3120 - make sure FTUE starts out of session
2015-04-29 16:41:02 -05:00
Seth Call
e21a1504d1
* VRFS-3129 - ignore metronome spinner display check if jamtrack is open
2015-04-29 16:02:33 -05:00
Seth Call
b9d30567db
* VRFS-3128 - reset seek on load of JamTrack
2015-04-29 14:38:03 -05:00
daef55d1a2
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-29 12:59:11 -05:00
757a9a5522
VRFS-3007 : Fix javascript bug causing test and browser problems. Fixes 164 of 203 failures.
2015-04-29 12:58:49 -05:00
Seth Call
72ff54213a
* VRFS-2997 - added license to accounts link. also adding config to ignore high latency if in a pinch
2015-04-28 20:07:21 -05:00
Seth Call
a6128a195b
* VRFS-3121 - fix network test dialog
2015-04-28 17:39:59 -05:00
2260d21fc1
VRFS-3007 : Merge with latest develop
2015-04-28 16:43:38 -05:00
Seth Call
13e4e816d9
* VRFS-3071 - progress indicator for download
2015-04-28 16:29:48 -05:00
Seth Call
00c9ccf699
* temporarily disable high latency
2015-04-28 14:47:27 -05:00
Seth Call
9fa10fe2b2
* temporarily disable high latency
2015-04-28 11:28:10 -05:00
Seth Call
a73aaec393
* don't fail someone joining a session with an unknown latency or very large latency
2015-04-28 11:00:16 -05:00
Seth Call
a70e90ab8c
* VRFS-3099 - fix left over download confirmation on checkout page if you re-enter it
2015-04-28 10:33:42 -05:00
Seth Call
cada0ed0b9
* VRFS-3112 - make recording smaller so no horizontal scroll bar
2015-04-28 09:44:56 -05:00
Seth Call
255ea39e77
* VRFS-3116 - honor positions
2015-04-28 09:35:39 -05:00
Seth Call
1ad86b1d80
* VRFS-3098 - pause button added to jamtrack
2015-04-28 08:58:34 -05:00
Seth Call
34b2614600
* fix dissappearing pause button
2015-04-27 21:39:46 -05:00
Seth Call
1bd054d050
* VRFS-3094 - update style and minor issues in shopping cart screen
2015-04-27 15:42:38 -05:00
Seth Call
760ddecbb1
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
...
Conflicts:
web/app/views/users/_user_dropdown.html.erb
2015-04-27 11:13:31 -05:00
Seth Call
8e6b923b05
* VRFS-3092 - fix jamtrack browse page styling issues, VRFS-3096 - fix standalone download page to have no signup context
2015-04-27 10:35:09 -05:00
Seth Call
d4679f6524
* VRFS-3903 - small shopping cart, VRFS-3092 - done except for play/pause icon
2015-04-26 08:25:36 -05:00
7aa9f3d10a
VRFS-3055 : Don't force override of video_available if current_user is admin.
2015-04-24 17:42:32 -05:00
Seth Call
258c034876
* VRFS-3089 - kill timer if the screen changes for jamtrack guides
2015-04-24 17:28:59 -05:00
Seth Call
776858c391
* VRFS-3087 - disable filter dropdowns
2015-04-24 13:45:47 -05:00
Seth Call
d94388161c
* fixing recording-based tests and one checkout test
2015-04-24 12:09:22 -05:00
Seth Call
4cce21e7f8
* VRFS-3080 - partial refund manual process done
2015-04-23 16:20:21 -05:00
Seth Call
989518fa68
* VRFS-3082 - email alert if jamtrack fails
2015-04-23 10:34:17 -05:00
75ac40e765
VRFS-3055 : Fix broken gear wizard spec. Add additional test to verify
2015-04-22 15:36:21 -05:00
b916d4d997
VRFS-3055 : Multiple levels of config option video_available
...
“none”, “mvp”, and “full”. “mvp” mode is similar to full, except it
hides video recording functionality.
2015-04-22 15:36:21 -05:00
Seth Call
39f45f20ba
* VRFS-3078 - show original price in void purchase
2015-04-22 14:20:07 -05:00
Seth Call
9217e92372
* protect against video calls when in account screen
2015-04-22 10:21:08 -05:00
Seth Call
763ade01dd
* protect against webcamViewer from getting involved if video is not available
2015-04-22 10:18:33 -05:00
8f49d7b83f
Merge remote-tracking branch 'origin/develop' into develop
2015-04-21 18:30:17 -05:00
c3134d8177
VRFS-3070 : Webcam selection & state fixes
...
* Hook up test webcam button
* Handle object vs. string from client method.
2015-04-21 18:30:02 -05:00
Seth Call
67c9f5d891
* VRFS-2605 - automatically stop recording if jamtrack is playing
2015-04-21 16:34:57 -05:00
Seth Call
3181a67bda
* VRFS-2605 - prevent close of jamtrack or backing track while recordig
2015-04-21 16:30:40 -05:00
Seth Call
1ce41c5a54
* VRFS-2605 - refining jamtrack offset values and manifest for audiomixer, and fixnig bug with jamtrack monitoring applied to playcontrols.js by accident
2015-04-21 16:24:10 -05:00
7a760e087b
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-04-21 14:29:43 -05:00
a9ab5bb730
Merge video_ui branch into develop.
2015-04-21 13:47:00 -05:00
Seth Call
556347f35b
* VRFS-2605 compute offset and seeks in manifest
2015-04-21 13:46:33 -05:00
Seth Call
8369ef0e13
* VRFS-3051 - pass userId into JamTrackDownload bridge call
2015-04-21 10:30:37 -05:00
6f4c8d819d
VRFS-3055 : Video features on gear wizard available via config. Update spec to match behavior.
2015-04-21 09:23:57 -05:00
Seth Call
c29af72938
* fix jamtrack landing page formatting VRFS-3056
2015-04-20 22:13:30 -05:00
Seth Call
6991e8afaf
* VRFS-3057 - shopping cart to reflect real price
2015-04-19 12:19:05 -05:00
a2c64ee13a
VRFS-1848 : Make sure save/discard buttons are enabled after validation. Make event handler registration idempotent.
2015-04-17 17:55:23 -05:00
c0e36d0f9e
VRFS-1848 : Better state management for recording finished dialog WRT google authorization / youtube errors. Hide youtube errors via ajax upon successful login.
2015-04-17 15:29:19 -05:00
b6fad726c4
VRFS-1848 : Halt claim recording and show error if "Save to Youtube" selected, but not logged into google.
2015-04-17 13:22:20 -05:00
267e5a7e10
VRFS-1848 : Make login window disappear when login complete after the google oauth callback.
2015-04-17 09:31:40 -05:00
f4765d03f9
VRFS-1848 : Fix JS syntax error
2015-04-16 16:24:39 -05:00
832cd9bf31
VRFS-1848 : Move google auth JS to module. Fix bug causing google auth to appear in same window.
2015-04-16 16:24:23 -05:00
3c41af5bd2
VRFS-1847 : Make video button behave appropriately as a toggle. Also, turn off video on initial load and before hiding.
2015-04-16 14:20:34 -05:00
7025673939
VRFS-1847 : Show video button in session.
...
* Hook to webcam viewer widget and initialize and toggle as appropriate
from session.js
* Camera icon
2015-04-16 13:05:40 -05:00
766568f8cb
Merge and fix
2015-04-16 12:16:09 -05:00
75f1098ca3
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-14 03:13:27 -04:00
09e4253f5f
VRFS-2699 select checkboxes for items already in list
2015-04-14 03:06:18 -04:00
12f5fc94c2
VRFS-2699 recording selector dialog
2015-04-14 02:43:29 -04: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
Seth Call
fa725af5e4
* VRFS-2945 - jamtrack countin spinner and text now showing
2015-04-13 09:56:48 -05:00
b81222278d
merge develop
2015-04-13 08:16:45 -04:00
4ef86587b6
VRFS-2699 recording selector work
2015-04-13 08:12:18 -04:00
711fd1984b
VRFS-2893 added SaveSettings bridge call
2015-04-13 02:08:15 +00:00
Seth Call
e882bb272c
* VRFS-3050 - disable configure button for playback profile
2015-04-17 16:32:53 -05:00
Seth Call
1809b0213b
* VRFS-3043 - pass along preview timeline data in preview
2015-04-17 15:01:56 -05:00
Seth Call
a2e5d941c1
* remove double scrollbars when in client on the shopping cart page VRFS-3052
2015-04-17 14:09:29 -05:00
Seth Call
3c37cbbf59
* VRFS-3042 - remove duplicate registrations on pagination
2015-04-17 14:01:07 -05:00
Seth Call
3a2590a472
* VRFS-3037 - code added without testing, and VRFS-3039 - download link added to checkout confirmation screen if you've not downloaded the app yet
2015-04-17 09:39:27 -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
Seth Call
13027649f4
* VRFS-3023 - i want a jamblaster functionality
2015-04-15 21:37:22 -05:00
Seth Call
35d2cb7657
* VRFS-2991 - updating descriptions for SEO per David's comments
2015-04-15 20:37:49 -05:00
168d1e77f1
VRFS-2874 : Developer tracking
2015-04-15 18:37:07 -05:00
946640e724
VRFS-2874 : Jam Track Analytics : Hook up broadcast listen.
2015-04-15 18:27:00 -05:00
280496af78
VRFS-2874 : JamTrack analytic core tracking functionality
2015-04-15 18:23:51 -05:00
4db40f6d3b
VRFS-2874 : Some prerequisite functionality required for analytics.
2015-04-15 18:22:55 -05:00
ae050590f6
Whack extraneous logging.
2015-04-15 18:17:02 -05:00
Seth Call
42b58a97e8
* VRFS-3034 - workaround QtWebkit crash by conditionalizing the 'crashy' rule
2015-04-15 15:14:41 -05:00
Seth Call
ab1fadaea4
* VRFS-3031 - jamtrackBrowse is new URL
2015-04-14 15:16:37 -05:00
Seth Call
06c964a151
* VRFS-2977 - make facebook signup work with checkout flow
2015-04-14 14:12:24 -05:00
0e0ea46771
Merge branch 'develop' into feature/jam_track_analytics
2015-04-13 13:10:43 -05:00
f56cf339e9
VRFS-2874 : Incremental hookup of ga for jam tracks.
2015-04-13 13:08:34 -05:00
1d6f690f82
VRFS-2874 : Jam Track Analytics JS tracking method implementation.
2015-04-13 13:07:50 -05:00
Seth Call
0dc77b400a
* VRFS-3006 - remove 'No audio loaded' when jamtrack is loading, and VRFS-3016 - no more text wrapping in error msg
2015-04-12 16:22:01 -05:00
Seth Call
b1b6686d3a
* VRFS-2976 - change default to 10/2/2 for WDM
2015-04-12 15:55:48 -05:00
Seth Call
ab2925ef88
VRFS-2821 - payment history screen added
2015-04-12 13:46:22 -05: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
6110bc736f
Merge branch 'develop' into feature/jam_track_analytics
2015-04-08 15:54:41 -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
1b463c02d9
VRFS-3018 : Account JamTracks empty state - show "no jam tracks" message and provide a link to the shopping page. Also remove stray debug logs.
2015-04-08 12:51:40 -05:00
6784c750ce
VRFS-2874 : Initial analytics for playing JamTracks in a session attended by multiple participants.
2015-04-07 14:04:29 -05:00
34edd24972
Merge branch 'feature/VRFS-2998' into develop
2015-04-07 12:08:03 -05:00
6e971b159c
Fix bug found in spec.
2015-04-06 15:52:34 -05:00
31a8729f71
VRFS-2998 : Fix runaway previews by only allowing one expanded item at a time.
2015-04-10 15:56:33 -05:00
08198e0aae
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 23:43:34 +00:00
40899dab90
VRFS-2701 minor cleanup
2015-04-05 19:59:36 -04:00
91e9e73644
VRFS-2701 adding SoundCloud/YouTube sources fully functional
2015-04-04 21:46:37 -04:00
51b38bbeed
VRFS-2795 css styling of builder page
2015-04-04 23:32:39 +00:00
52f88692ca
VRFS-2795 styling; result link fixes
2015-04-04 21:57:59 +00: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
0890aee9da
VRFS-2795 paginating
2015-04-04 16:11:36 +00:00
e563ad0d8b
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-04-04 14:56:36 +00: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
2f8d048dde
VRFS-2701 updated site validator lib to extract recording title for YouTube and SoundCloud URLs
2015-04-04 02:31:12 -04:00
1f432446f5
VRFS-2795 fixing results display; generating same data
2015-04-04 02:54:58 +00:00
325d3d2780
VRFS-2975 cloning findMusician js
2015-04-02 16:00:34 +00: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
0ccf30b023
VRFS-2795 adding result rows
2015-04-02 12:27:20 +00:00
a87c08afe3
Merge branch 'develop' into feature/musician_profile_enhancements
2015-04-01 23:09:51 -04:00
269519a394
VRFS-2701 wip adding external recordings
2015-04-01 23:09:16 -04:00
Seth Call
c276d97e42
* pass in data with metronome open stat
2015-04-01 09:04:52 -05:00
03f94480e7
VRFS-2701 wip adding recording sources
2015-03-31 22:32:41 -04:00
Seth Call
80a48c60c6
* VRFS-2879 - adding 3 product pages (jamblaster, platform, jamtracks)
2015-03-31 21:08:09 -05:00
d21a88a5de
VRFS-2998 : Hooking up preview widget - incremental.
2015-03-31 19:55:26 -05:00
9d4943d814
VRFS-2701 fixed HTML
2015-03-31 20:42:57 -04:00
546205b186
VRFS-2701 wip editing presence and samples
2015-03-31 20:35:38 -04: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
c9468d0981
Merge branch 'feature/musician_profile_enhancements' of bitbucket.org:jamkazam/jam-cloud into feature/musician_profile_enhancements
2015-03-29 21:22:27 -04:00
b02013846e
VRFS-2701 remove error message when username is blank
2015-03-29 21:22:12 -04:00
83c00ea6e4
merge develop
2015-03-29 10:12:42 -04:00
a0e9dbdd25
VRFS-2701 added callbacks to site validator to highlight invalid usernames and site URLs
2015-03-29 10:06:39 -04:00
Seth Call
398f7e04ad
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-03-28 10:10:29 -05:00
Seth Call
260a80ee37
* VRFS-2987 - remote participants can see opened JamTracks
2015-03-28 10:10:18 -05:00
401fd43849
Merge branch 'feature/jam_track_ui_2' into develop
2015-03-27 15:48:08 -05:00
Seth Call
23fdf51110
* resize session based on track content VRFS-2819
2015-03-27 15:36:09 -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
cc1660d1dc
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-26 04:28:09 +00:00
9eeb0e454b
VRFS-2795 merging with feature/musician_profile_enhancements
2015-03-26 03:31:21 +00:00
1b89e570e3
Merge branch 'feature/musician_profile_enhancements' of bitbucket.org:jamkazam/jam-cloud into feature/musician_profile_enhancements
2015-03-25 22:20:58 -04:00
5e6082d1f1
VRFS-2701 integrated site validators
2015-03-25 22:20:43 -04:00
Seth Call
1e1e6222bb
* VRFS-2686 - if user seeks to 0, then offest it back to beginning of JamTrack (before prelude)
2015-03-25 15:01:22 -05:00
Seth Call
31e4fbfdf8
* suppress metronome logic when JamTrack is open VRFS-2971
2015-03-25 14:45:51 -05:00
5f953d1b19
VRFS-2830 : Merge / manual fix
2015-03-25 10:56:24 -05:00
adef8c8c45
VRFS-2830 : Payment History
...
API, client, view, styles and test
2015-03-24 17:13:09 -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
bc98a17786
VRFS-2701 wired up action buttons on samples page
2015-03-23 22:32:04 -04:00
d3cf83db85
VRFS-2701 remove use of template on experience screen
2015-03-23 22:26:36 -04:00
5e2d860bf7
VRFS-2830 : License dialog and hookup
2015-03-23 15:38:55 -05:00
9face3b3f9
VRFS-2701 wip presence/sample edit
2015-03-23 16:27:36 -04:00
98ea77a5e0
Merge branch 'develop' into feature/cohort_data
2015-03-23 20:07:24 +00: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
231f7c69b5
VRFS-2701 wip presence/sample edit
2015-03-23 13:11:28 -04:00
Seth Call
04aa1a9b3c
* wip
2015-03-23 08:52:52 -05:00
3ae34fc426
VRFS-2974 fixed broadcast widget bug when session is private
2015-03-22 21:30:08 -04:00
e4aa6609ec
VRFS-2974 fixed broadcast widget bug when session is private
2015-03-22 21:13:53 -04:00
370ca1086e
VRFS-2701 VRFS-2699 wip performance samples edit screen
2015-03-21 20:53:38 -04:00
ae71c1b9e9
VRFS-2701 VRFS-2699 wip performance samples edit screen
2015-03-21 10:16:46 -04:00
96a816f317
merge develop
2015-03-21 10:06:53 -04:00
9acb235a6d
VRFS-2701 VRFS-2699 wip performance samples edit screen
2015-03-21 10:04:46 -04:00
Seth Call
128a8119cf
* VRFS-2942 - show correct instrument and show correct part info
2015-03-20 22:04:03 -05:00
Seth Call
b137d7586f
* VRFS-2973 - fix pagination in jam trackdialog
2015-03-20 21:27:11 -05:00
Seth Call
f29a9d7465
* wip
2015-03-20 16:15:13 -05:00
e3d1a80a6f
VRFS-2830 : Mesh out purchased jam tracks view and behavior.
2015-03-20 15:26:06 -05:00
Seth Call
49368e2e66
Merge branch 'hotfix/recording_fix' into develop
2015-03-20 11:26:50 -05:00
Seth Call
3cb706495e
* wip
2015-03-20 11:25:42 -05:00
Seth Call
6df6165bb7
remove jamblaster notice from site
2015-03-20 09:55:35 -05:00
Seth Call
393f05f9b0
* wip
2015-03-20 09:21:29 -05:00
Seth Call
661c4ed446
* wip
2015-03-20 08:48:00 -05:00
299caa5b59
VRFS-2701 VRFS-2923 bug fixes on musician profile enhancements / genre selector dialog
2015-03-19 02:50:49 -04:00
82f35e221f
VRFS-2701 fixed cancel and back buttons
2015-03-18 21:42:18 -04:00
abb31c4e40
VFFS-2830 : Jam tracks account overview
2015-03-17 13:52:30 -05:00
Seth Call
137c6faedc
* wip
2015-03-17 10:15:00 -05:00
c91fd0cb0e
merge develop
2015-03-17 03:10:22 -04:00
c0dcbcce75
VRFS-2701 edit current interests working
2015-03-17 03:08:40 -04:00
Seth Call
9dd3984d07
* VRFS-2936 - ugly button for Peter testing
2015-03-16 13:36:02 -05:00
Seth Call
97d469cc85
* wip
2015-03-16 13:27:39 -05:00
07b74cc3e7
VRFS-2823 : Enable proper back button behavior.
2015-03-16 00:29:57 -05:00
e6b09e5728
VRFS-2892 : Reset main form error to hidden upon re-entering purchase flow.
2015-03-15 20:30:39 -05:00
f4cd225142
VRFS-2823 : Bugfix and cleanup.
2015-03-15 19:45:58 -05:00
9a38b63376
VRFS-2823:Update link on landing page to properly set filter parameters.
2015-03-15 18:43:08 -05:00
782357ce4e
VRFS-2823 : Accomplishes a number of items
...
* Ability to set filter settings from URL
* Ability to expand and collapse; hiding the items mentioned in spec.
* Misc styling and code cleanup.
2015-03-15 18:42:22 -05:00
4a8dd75fa2
VRFS-2701 VRFS-2923 wip genre selector dialog
2015-03-15 11:58:20 -04:00
888c4707b5
VRFS-2701 VRFS-2923 wip genre selector dialog
2015-03-15 11:26:54 -04:00
b91bc09817
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-15 11:09:21 -04:00
768f3a7ff0
VRFS-2701 VRFS-2923 wip genre selector dialog
2015-03-15 11:08:49 -04:00
Seth Call
e82da2161d
* VRFS-2927 - mute both master/personal for own tracks
2015-03-14 15:00:11 -05:00
Seth Call
23488f8f7f
* wip
2015-03-14 14:36:34 -05:00
63544de145
VRFS-2822 : Cleanup
2015-03-13 14:45:57 -05:00
40a1ad137d
VRFS-2823 : Convert to coffee and clean up.
2015-03-13 14:45:38 -05:00
Seth Call
b0aac73732
* VRFS-2924 - show visual metronome option
2015-03-13 10:44:24 -05:00
Seth Call
1cd8288cc3
* wip
2015-03-13 10:28:27 -05:00
Seth Call
1b36fb812f
wip
2015-03-13 09:12:33 -05:00
3d9e80f719
VRFS-2701 use profileUtils for preselecting genres on experience screen
2015-03-13 02:48:09 -04:00
4e456bce41
VRFS-2701 wip current interests editing
2015-03-13 02:26:09 -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
a1c929aeb1
* wip
2015-03-12 18:15:32 -05:00
Seth Call
f9e02c5707
Merge branch 'develop' into feature/jam_track_ui_2
...
Conflicts:
admin/app/admin/jam_tracks.rb
admin/app/views/admin/jam_tracks/_form.html.slim
admin/app/views/admin/jam_tracks/_jam_track_track_fields.html.slim
admin/config/initializers/jam_tracks.rb
db/manifest
ruby/lib/jam_ruby.rb
ruby/lib/jam_ruby/app/uploaders/jam_track_track_uploader.rb
ruby/lib/jam_ruby/jam_tracks_manager.rb
ruby/lib/jam_ruby/models/jam_track.rb
ruby/lib/jam_ruby/models/jam_track_right.rb
ruby/lib/jam_ruby/models/jam_track_track.rb
ruby/spec/jam_ruby/models/jam_track_right_spec.rb
ruby/spec/jam_ruby/models/jam_track_track_spec.rb
ruby/spec/jam_ruby/resque/jam_tracks_builder_spec.rb
web/app/assets/javascripts/download_jamtrack.js.coffee
web/app/assets/javascripts/globals.js
web/app/assets/javascripts/jam_rest.js
web/app/assets/javascripts/order.js
web/app/assets/javascripts/playbackControls.js
web/app/assets/javascripts/session.js
web/app/assets/stylesheets/client/session.css.scss
web/app/controllers/api_jam_tracks_controller.rb
web/app/controllers/api_recurly_controller.rb
web/spec/controllers/api_jam_tracks_controller_spec.rb
2015-03-12 08:51:52 -05:00
3330a09128
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-12 04:40:39 +00:00
41626860a9
VRFS-2795 replacing musician page with new search filter
2015-03-12 04:39:20 +00:00
Seth Call
d6df68a8ff
* VRFS-2913 - allow /client to be accessed without being logged in
2015-03-11 16:53:37 -05:00
Seth Call
477df086b0
Revert "* VRFS-2913 - allow /client to be accessed without being logged in"
...
This reverts commit 0a869e91e3
2015-03-11 16:53:12 -05:00
Seth Call
0a869e91e3
* VRFS-2913 - allow /client to be accessed without being logged in
2015-03-11 16:44:22 -05:00
fae67907b1
VRFS-2823 : Fix availability filtering
2015-03-11 16:36:42 -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
631491c4a2
* VRFS-2829 - signup and downoad page changes for jam tracks release
2015-03-10 10:29:40 -05:00
f10bdc18f4
VRFS-2701 wip saving musical experience working
2015-03-10 02:02:59 -04: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
28ebbe893c
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-03-09 09:49:21 -05:00
Seth Call
a10705c163
* VRFS-2909 - jam tracks importer
2015-03-09 09:44:12 -05:00
02b310cbfa
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-09 06:14:36 +00:00
f29d370f2b
VRFS-2701 wip edit musical experience
2015-03-09 01:36:49 -04:00
21c5a212b2
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-09 05:16:41 +00:00
d3f0bad602
VRFS-2795 filter tests
2015-03-09 05:15:15 +00:00
f1808560ce
VRFS-2701 added shells for all new edit screens
2015-03-08 22:57:19 -04:00
03490e06ab
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-08 06:14:28 +00:00
8bbfdbc013
VRFS-2795 instrument selection; json posting
2015-03-08 06:13:29 +00:00
23ccc855d5
VRFS-2795 instrument selection; json posting
2015-03-08 06:07:30 +00:00
03321a8166
VRFS-2795 instrument json
2015-03-07 06:19:14 +00:00
6b16ab3701
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-06 23:27:42 -05:00
fb3ed71957
VRFS-2854 more session widget feed fixes
2015-03-06 23:18:29 -05:00
36a9f1f6a3
VRFS-2854 more session widget feed fixes
2015-03-06 23:16:27 -05: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
81df46e7a2
VRFS-2795 tweaks
2015-03-06 05:10:29 +00:00
Seth Call
be97555f1a
* VRFS-2885 - check mixers from both modes
2015-03-05 09:47:33 -06:00
6fa59bf76f
VRFS-2854 fixed bug with hovering over private sessions in feed
2015-03-05 02:18:05 -05:00
58324f35a5
VRFS-2854 fixed bug with hovering over private sessions in feed
2015-03-05 02:16:32 -05:00
2e24b58e12
VRFS-2795 instrument selector
2015-03-05 06:49:44 +00:00
2380c50779
VRFS-2795 interests and ages selectors
2015-03-05 06:30:20 +00:00
02e22ba7f3
VRFS-2795 add interests, studios selectors; some refactoring
2015-03-05 05:50:10 +00:00
12b610d2cb
Merge branch 'develop' into feature/musician_profile_enhancements
2015-03-04 02:03:22 -05:00
b40e1c6a40
VRFS-2701 edit profile basics
2015-03-04 02:02:48 -05:00
c8059e9c00
VRFS-2822 : Create a jam track landing page, a coffee script to control it, and styles.
...
Link from main client view. Link TO current (browse) page.
2015-03-03 23:14:24 -06:00
02f606971b
formatting changes
2015-03-03 23:16:13 -05:00
aba65a82bd
let caller decide what to display if no genres are found
2015-03-03 21:29:10 -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
c8ad1d3856
VRFS-2805 : Use jquery.payment to make the credit card and verification more user-friendly. Also use jquery.payment for validation.
2015-03-02 13:30:45 -06:00
930166b213
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-02 12:00:39 +00:00
dd651f02bb
VRFS-2795 populate skill and gigs
2015-03-02 11:59:39 +00:00
b3009ec8c0
VRFS-2795 skill drop down
2015-03-02 11:26:15 +00:00
1c93f4ef80
Merge branch 'feature/musician_profile_enhancements' into feature/musician_search2
2015-03-02 09:44:05 +00:00
0e9f78ccdd
VRFS-2795 search filter front end start
2015-03-02 09:41:53 +00:00
5f2b0b9745
VRFS-2701 added performance sample listings
2015-03-01 13:52:06 -05:00
fa7ec522c5
VRFS-2701 refactor / added action links to each section
2015-02-28 02:52:03 -05:00
4d133e0043
merge develop
2015-02-28 02:24:23 -05:00
a2e28cfe75
VRFS-2701 display online presences on about tab
2015-02-28 02:21:38 -05: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
Seth Call
8205b5ea58
* VRFS-2841 - load jmep into the backend
2015-02-27 08:37:12 -06:00
80e942d69e
VRFS-2701 wip musician profile enhancements
2015-02-26 22:33:53 -05: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
Seth Call
6b795695ee
* VRFS-2753 - assign volume left over volume right to ensure both mono and stereo backend inputs get the data they need
2015-02-25 16:15:41 -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
Seth Call
a7824249a8
* VRFS-2826 - fix regression where remote peers couldn't see tracks
2015-02-23 22:29:28 -06:00
19fdc2ac9d
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-23 23:13:12 -05:00
Seth Call
c5b77a02fa
* check shopping cart on leave of shopping cart screen
2015-02-23 17:30:06 -06:00
Seth Call
4841e56dce
* VRFS-2634 - add version check to jamtrack packages
2015-02-23 16:56:21 -06:00
Seth Call
c8752fd830
* VRFS-2634 - add version check to jamtrack packages
2015-02-23 16:55:19 -06:00
Seth Call
0795791909
* move displayCartIcon method to init logic
2015-02-23 16:03:44 -06:00
Seth Call
78ed25ea82
* actually init the shopping cart
2015-02-23 16:00:30 -06:00
Seth Call
be4627d51f
* move around shopping cart init
2015-02-23 15:55:02 -06:00
Seth Call
d89e2f8e56
* VRFS-2818 - mute and volume faders control both mixer/personal simultaneously. more work required for moving of input tracks affecting backing tracks personal mix
2015-02-23 15:00:57 -06:00
Seth Call
ae920c5a1a
* stop play issued before close of backing track
2015-02-23 10:56:22 -06:00
Seth Call
1dbfdf0546
* VRFS-2811 - read loop state when drawing track
2015-02-23 10:45:10 -06:00
Seth Call
9dbf1a3e56
* VRFS-2634 adding version to jamtrack
2015-02-23 09:12:34 -06:00
52c2128721
VRFS-2701 user website should be included for online presence check
2015-02-22 22:52:25 -05:00
6667a33e67
VRFS-2701 wip musician profile enhancements
2015-02-22 22:23:59 -05:00
20ac47a2e1
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-21 23:36:06 -05:00
71543d8c15
VRFS-2701 wip for musician profile UI enhancements
2015-02-21 23:35:12 -05:00
3e473a9ec3
VRFS-2701 wip for musician profile UI enhancements
2015-02-21 23:26:08 -05:00
20baeb8bd3
VRFS-2701 wip UI changes for musician profile enhancements
2015-02-21 09:20:11 -05:00
dcf3706099
VRFS-2798 : Hide/show shopping cart icon depending on contents.
2015-02-20 17:53:18 -06:00
Seth Call
0472d6bc79
* VRFS-2686 - jamtrack sliders work
2015-02-20 11:55:49 -06:00
Seth Call
ea482da0dc
* VRFS-2808 - prevent duplicate attempt to open recording
2015-02-20 10:01:11 -06:00
Seth Call
9d70400e91
* VRFS-2806 - disallow concurrent open of dialog
2015-02-20 09:50:03 -06:00
500af2bc05
merge develop (had lots of migration issues)
2015-02-20 08:35:59 -05:00
Seth Call
38849a1c44
VRFS-2804 - fix code to find the jamtrack ID correctly based on recent client changes
2015-02-19 15:56:42 -06:00
Seth Call
9345d65f06
* merged
2015-02-19 14:31:00 -06:00
Seth Call
2b227912cb
* take out hard-coded jamtrack id
2015-02-19 11:29:13 -06:00
Seth Call
85ffa2ec21
* VRFS-2802 - moving media files mixers in personal mode actually affect master mode now
2015-02-19 09:31:30 -06:00
Seth Call
23c7307c6f
* VRFS-2796 - hide X for non openers
2015-02-18 15:41:51 -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
bf0f1345ed
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-18 03:44:38 -06:00
Seth Call
c30d42c9dd
* VRFS-2777 use SetSessionControlState to update loop info
2015-02-18 03:43:33 -06:00
232873819e
VRFS-2700 cleaned up broken tests
2015-02-18 06:33:06 +00:00
Seth Call
6d839f8efa
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-17 09:45:44 -06:00
Seth Call
2b7ebe1ce1
* use preview recording
2015-02-17 09:45:18 -06:00
Seth Call
b46dce5c29
Merge branch 'feature/backing_tracks' into develop
2015-02-16 10:35:46 -06:00
Seth Call
bfc03fba48
* VRFS-2780 - finish styling loop checkbox
2015-02-16 10:32:23 -06:00
Seth Call
bdc1b898b4
* VRFS-2780 - styling complete; needs testing
2015-02-15 22:15:41 -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
Seth Call
503e46ed74
*wip
2015-02-15 21:52:28 -06:00
Seth Call
c4c05c67d6
* working on sync rework VRFS-2661
2015-02-15 21:52:28 -06:00
6a46ad5910
Merge branch 'develop' into feature/recording_selector
2015-02-16 02:20:38 +00:00
c44c94671a
VRFS-2700 refactored attemptAdd
2015-02-16 01:59:16 +00:00
366ba06e89
VRFS-1845 : Webcam settings included in account page. Script uses same WebcamViewer object as the flue.
2015-02-15 19:28:13 -06:00
6ff4d197ef
VRFS-2700 recording source jasmine tests
2015-02-15 23:10:29 +00:00
a35874fa23
VRFS-1844 : Video gear - refactor to allow for non-embedded webcam preview. Add reusable view to a _webcam partial and reference where necessary.
2015-02-15 16:23:47 -06:00
8a737b3556
VRFS-2473 : Add metronome feature tests.
2015-02-15 14:44:38 -06:00
c52c429e96
VRFS-2473 : Check ntp clock stability of all session participants before opening metronome.
2015-02-15 14:00:36 -06:00
40b4537b04
Merge branch 'develop' into feature/recording_selector
2015-02-15 13:57:16 +00:00
708e842bcc
VRFS-2700 refactored url site test; added deferred state() test
2015-02-15 13:31:45 +00:00
f533e4273d
VRFS-2700 url site type tests with ajax mock
2015-02-15 12:51:16 +00:00
78321ce374
VRFS-2700 added state deferred call; RecordingSource subclass
2015-02-15 12:27:48 +00:00
4aa845cfc8
VRFS-2700 fixed spec stylesheet fixture loading within teaspoon; minor refactoring in site_validator.js
2015-02-15 07:50:04 +00:00
c167f9d09a
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-14 21:04:28 -05:00
8d1d1b3f16
Merge branch 'develop' into feature/musician_profile_enhancements
2015-02-13 21:42:40 -05:00
bbce83984b
VRFS-2498 : Fix spec.
2015-02-13 11:36:03 -06:00
28ff54b000
VRFS-2695 wip new profile API
2015-02-13 03:16:48 -05:00
Seth Call
6007033a15
* explain comment out
2015-02-13 00:00:45 -06:00
Seth Call
72de73f1f9
* remove double-init of external links
2015-02-12 22:25:46 -06:00
b7b401cf59
VRFS-2498 : Add metronome callback to fake client for tests.
2015-02-12 18:51:07 -06:00
064b553e31
VRFS-1845 : Add video account section.
2015-02-12 14:33:34 -06:00
aedcbde1f3
Merge with develop
2015-02-12 14:32:12 -06:00
81dcd9bddc
VRFS-2498 : Hook up new metronome sounds. Check group_id in lieu of media_type as it is not set for metronomes.
2015-02-12 14:05:25 -06:00
889de25a9f
VRFS-2700 fixed error detection for recording sources
2015-02-12 08:31:37 +00:00
5e6a63db2e
VRFS-2700 added rec_* site types to site validation
2015-02-12 08:16:54 +00:00
1081efffdd
VRFS-1844 : A webcam component to initialize, and manage the state of, the webcam setup pane. Since this is accessed in several places, this javascript needed generifying.
2015-02-11 11:10:25 -06:00
72477e0840
VRFS-2698 tweaking teaspoon tests
2015-02-10 07:15:56 +00:00
463e7d3bbd
VRFS-2698 fixed error in renderErrors
2015-02-10 05:47:07 +00:00
febca766e7
VRFS-2698 fixture loading
2015-02-10 05:26:56 +00:00
17b4b1aeca
VRFS-1844 : Fake jam client calls for video APIS to enable faster iterations
2015-02-09 09:43:23 -06:00
f3bae8a97b
VRFS-1967 - clear up error message to assist user
2015-02-08 21:15:20 -06:00
Seth Call
b89e6e9475
* VRFS-2748, VRFS-2749 - update styling for / page and home page
2015-02-06 22:04:37 -06:00
9f27ef8429
VRFS-2698 renamed url_validator to site_validator
2015-02-06 07:43:24 +00:00
1d42b7b662
VRFS-2698 refactoring validator interface
2015-02-06 07:43:24 +00:00
d52f5b2372
VRFS-2698 repurposed urls into usernames
2015-02-06 07:43:24 +00:00
ed47441f67
VRFS-2698 refactoring website_validate to url_validate
2015-02-06 07:43:24 +00:00
e8375b920e
VRFS-1844 : Logic and UI to insert video page on gear wizard - Incremental.
2015-02-04 13:00:19 -06:00
Seth Call
a0e486aed7
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-02-03 09:49:34 -06:00
Seth Call
768c9e2024
VRFS-2739 - remove aggressive check for bad session info and add some basic tests to catch errors in the future
2015-02-03 09:49:19 -06:00
f0f130caae
Merge branch 'develop' into VRFS-2697
2015-02-03 06:39:12 +00:00
75b8be7a85
VRFS-2697 spec tests
2015-02-02 07:45:52 +00:00
e7bb30f730
Merge branch 'develop' into VRFS-2697
2015-02-02 05:44:42 +00:00
e516983aa5
VRFS-1985 detect browser / invalid config when starting a session from the future sessions section
2015-02-01 19:14:39 -05:00
eff19235c3
VRFS-2730 : Hook up jamtrack looping.
2015-02-01 17:59:43 -06:00
a10078260a
VRFS-2722 : Styling and logic necessary to display long labels on backing and other tracks.
2015-02-01 17:59:43 -06:00
e12cbe783c
VRFS-2717 : Show type (extension) and file length in MB.
2015-02-01 17:59:43 -06:00
Seth Call
e9d2df58df
* VRFS-2726 - media_type is not set for develop builds of the client; so null means Recording in develop branch
2015-02-01 14:15:37 -06:00
Seth Call
8234c4c510
* VRFS-2726 - media_type is not set for develop builds of the client; so null means Recording in develop branch
2015-02-01 14:15:17 -06:00
082edc7075
VRFS-2697 css styling
2015-02-01 03:43:58 +00:00
d8c000c7f7
VRFS-2716 : Compare proper string for backing track type. Change a few client calls to correct function names.
2015-01-31 17:57:54 -06:00
Seth Call
cb63439219
* VRFS-2716 - reference to .path in SessionOpenBackingTrack changed to .name
2015-01-31 15:28:53 -06:00
Seth Call
ac1271634d
* VRFS-2716 - changes to deal with new getBackingList format, VRFS-2661 - accepting backing_track info in Track.sync (wip)
2015-01-31 15:20:48 -06:00
9e777a84aa
VRFS-2697 display errors from server-side site check
2015-01-31 18:45:10 +00:00
9086fac76a
VRFS-2697 enhanced error handling; crop url length
2015-01-31 18:07:51 +00:00
abb5c3afb2
VRFS-2697 fixed js typo
2015-01-31 08:59:25 +00:00
fdcc77ae80
VRFS-2697 url format and site validation
2015-01-31 08:41:56 +00:00
6069399a55
VRFS-2697 initial url validation
2015-01-31 05:22:58 +00:00
16092ba816
VRFS-2697 website validator initial commit
2015-01-31 04:50:05 +00:00
a4d8ea5f60
VRFS-2498 : Fix tempo and sound strings for initial metronome opening.
2015-01-29 16:12:26 -06:00
d9d3e67fc5
VRFS-2582 : Hook up to client rather than stubbed API to list backing tracks. Implement in fakeJamClient for easy testing.
2015-01-29 16:11:57 -06:00
Seth Call
3496aa999f
* wip
2015-01-29 14:17:55 -06:00
Seth Call
6de64a1005
Merge branch 'develop' into feature/session_jamtracks
2015-01-26 21:22:59 -06:00
Seth Call
f53c5c9612
*wip
2015-01-26 21:22:44 -06:00
6f8113b374
Merge branch 'develop' into feature/backing_tracks
2015-01-26 12:11:57 -06:00
Seth Call
8556aaac13
* make dynamic registrations confgurable, in case server crashes again: VRFS-2645
2015-01-23 16:51:59 -06:00
Seth Call
9c9a42c2a5
* merged
2015-01-23 13:56:10 -06:00
Seth Call
7844f2ffad
* wip
2015-01-23 13:55:15 -06:00
Seth Call
372444ebd1
* wip
2015-01-23 10:50:58 -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
0d9bd33eb7
Clean up and adjust session UI to display metronome tempos and click sound. Update client.
...
Style updates to fit selects and default to 120 bpm.
2015-01-21 20:16:52 -06:00
Seth Call
698f4ba648
* wip
2015-01-21 15:22:31 -06:00
4741312294
Fix test, cleanup
2015-01-21 15:10:02 -06:00
ff95fe1c35
VRFS-2498, VRFS-2499 : Mesh out backing track/metronome track support at necessary layers rest/api/UI/etc. Implement necessary methods in fakeJamClient for quicker iterating.
2015-01-20 22:14:48 -06: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
6880aec9ef
* VRFS-2658 - adding commints
2015-01-19 10:24:23 -06:00
Seth Call
48b2f5b965
* add value = 1 to series
2015-01-19 10:24:18 -06:00
Seth Call
8a6a9b224b
* VRFS-2658 - track if audio was established
2015-01-19 10:24:11 -06:00
5f9f8a0cdd
Cleanup; upgrade deprecated gem. Attempt to fix intermittently failing test.
2015-01-16 18:00:44 -06:00
3fb45c0dd0
VRFS-2499 - Incremental, nearly done.
2015-01-15 20:28:34 -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
Seth Call
5f9986b30e
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-12 13:40:38 -06:00
Seth Call
9718cc7cca
* remove dynamic registration code
2015-01-12 13:37:50 -06:00
825a293c30
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2015-01-12 02:08:09 -05: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
edbd28d357
* remove extra close bracket in listen link fi
2015-01-11 20:46:45 -06:00
Seth Call
46ae56e7e8
* fix listen link
2015-01-11 20:43:15 -06:00
a07728ffa3
Merge branch 'feature/find_session_start_session' into develop
2015-01-11 21:22:59 -05:00
Seth Call
4d8a7a9bc1
* wip
2015-01-11 15:42:12 -06:00
50ede5bd9e
VRFS-1985 VRFS-2252 allow only session creator to start session with TBD date/time
2015-01-10 15:09:06 -05:00
Seth Call
5ac69fc646
* wip
2015-01-09 16:11:04 -06:00
Seth Call
72ef14a87d
* remove spurious log
2015-01-09 15:20:32 -06:00
Seth Call
0ab7686205
* VRFS-2484 - wip pausing point; the code should not affect stability because it's mostly jamtrack only related
2015-01-09 15:15:12 -06:00
34d7985762
VRFS-2498, VRFS-2499 : Incremental
2015-01-09 02:47:46 -06:00
aeabfcafc8
VRFS-1985 VRFS-2252 only show start button for RSVP / invited user if there is less than 15 minutes left to sesession start time
2015-01-09 03:08:03 -05:00
9643fe1187
fixed javascript error on session detail screen
2015-01-09 02:38:38 -05:00
47293afee4
VRFS-1985 VRFS-2252 allow RSVP and invited users to start session from Find Session screen
2015-01-09 02:10:44 -05:00
Seth Call
cc3bf2ce1f
* wip
2015-01-08 20:35:39 -06:00
79eec652d1
VRFS-1985 wip start session from Find Session screen
2015-01-07 23:18:07 -05:00
81ad2c89b5
VRFS-2610 : Fix bad API call that was throwing exception in console.
2015-01-07 11:27:21 -06: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
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
5f14f73322
* some more fixes for broadcasting - VRFS-2523
2015-01-02 15:29:31 -06:00
Seth Call
9b1525715e
* fix a bug in broadcasting and also fix bad log refernce
2015-01-01 14:22:42 -06: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
83396675e6
* remove a diagnostic from javascript
2014-12-31 20:44:51 -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
ed15eef3ac
* I'm not sure how I typo'ed this...
2014-12-30 21:06:56 -06:00
Seth Call
a3f40b2f99
* fix typo in write_point /write VRFS-2569
2014-12-30 17:15:28 -06:00
Seth Call
6058b1770a
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-30 17:12:44 -06:00
Seth Call
786486026b
* wip
2014-12-30 17:10:16 -06:00
a402e31633
VRFS-2102 dedup instruments for in session users
2014-12-28 00:19:25 -05:00
9eb6870502
VRFS-2359 warn user when starting a TBD session
2014-12-23 01:50:07 -05:00
bbee617c4b
VRFS-1960 : Jam Track Signed Notification, usage in notificationPanel, and spec.
2014-12-22 14:23:05 -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
08a266a203
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-18 16:08:29 -06:00
Seth Call
01808e6dac
* VRFS-2523 - broadcast fixes
2014-12-18 15:14:23 -06:00
Seth Call
d83a632d0b
Conflicts:
...
db/manifest
web/app/assets/javascripts/jam_rest.js
2014-12-18 15:13:55 -06:00
16fb200a2e
VRFS-2162 clear out friend text entry box after selection is made (fixes bug when tabbing out of friend selector list)
2014-12-17 22:43:36 -05:00
Seth Call
566035348b
* VRFS-2562, VRFS-2561, VRFS-2560 - fixes for mute state and behavior for voice chat and my tracks
2014-12-17 09:08:45 -06:00
08842ae243
VRFS-2426 do not divide by 2 when calculating full score for latency badge
2014-12-17 01:14:37 -05:00
c71b9c8f0f
VRFS-2441 prevent long notation file names from overlaying buttons
2014-12-14 22:25:08 -05:00
Seth Call
977a83277d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-12-08 15:37:38 -06:00
Seth Call
566598fffc
* fix for failing tests
2014-12-08 15:37:31 -06:00
93672844f2
VRFS-2529 remove quick-start scheduled sessions from account tab
2014-12-08 06:26:06 +00:00
8634d4f726
VRFS-1959 : change the primary key (id) to be a big int and to share the sequence used by mixes.id and recorded_tracks.id
...
Also modify references as necessary, both from other tables and various
code usages.
2014-12-06 19:55:59 -06:00
e53b9b3df8
VRFS-2424 added user genres
2014-12-05 08:16:49 +00: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
e834a1dfd6
VRFS-1442 refresh session band list each time entering step3
2014-12-03 08:22:35 +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
45542b7a1d
VRFS-1442 band profile, members editing; change notifyAlert to default to 1 button; added band_admin attribute to band members
2014-12-03 08:22:35 +00:00
588f03a199
VRFS-1442 bands page updates
2014-12-03 08:22:35 +00:00
41096f08ad
VRFS-2480: Additional back-end and UI functionality required for checking out.
2014-12-01 18:45:41 -06:00
76548b1af1
Merge branch 'develop' into feature/jam_tracks_merge
2014-12-01 11:45:54 -06:00
09163d2778
Fix javascript to get credit card expiration year from correct field.
2014-11-25 13:59:24 -06:00
9e95f75e2e
VRFS-2480 : Card number was getting whacked from submittal due to a bad javascript assignment.
2014-11-24 15:06:45 -06:00
b35f3ef9ef
Fix fat finger.
2014-11-24 15:05:38 -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
55c5167e36
fix bug with deduping instruments in recording hover
2014-11-21 08:15:59 -05:00
f0b60f28e4
VRFS-2467 dedup users and instruments on session hover bubble
2014-11-21 01:20:27 -05:00
7f88a7550c
VRFS-2480 : Incremental
2014-11-17 21:24:39 -06: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
6ea19f35aa
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-16 21:40:50 -06:00
Seth Call
6b5cd42432
* VRFS-2097 - move around hover hookups
2014-11-16 21:40:21 -06:00
b01b3ecd7d
VRFS-2352 : JamTracks - merge from feature/jam_tracks_merge.
2014-11-16 16:23:31 -06:00
38bf21ad6b
VRFS-2125 prevent duplicate clicks from create band button
2014-11-16 05:40:24 +00:00
Seth Call
f27673eb31
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-15 15:10:43 -06:00
Seth Call
94efaf8a8e
* use hover events (js) instead of CSS to detect if hovering VRFS-2097
2014-11-15 15:07:13 -06:00
719aa2b411
fix getInstrumentId logic
2014-11-15 13:05:01 -05:00
d65358cea6
VRFS-2442 suppress "Recurs once..." text for non-recurring sessions
2014-11-15 13:01:28 -05:00
1c23f095ab
fix null instrument tooltips
2014-11-15 13:00:13 -05:00
3c18d7cf65
VRFS-2442 suppress "Recurs once..." text for non-recurring sessions
2014-11-15 12:24:37 -05:00
12ca12f3cf
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-15 11:33:43 -05:00
a46664acfe
VRFS-2489 scheduled session with is_unstructured_rsvp=true should not prompt user to add slots when approving
2014-11-15 11:05:12 -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
6b206cfa4a
VRFS-2478 : Fix JS timing error causing intermittent test failure.
2014-11-14 16:25:58 -06:00
Seth Call
3fc0329e79
* wip
2014-11-13 09:20:08 -06:00
Seth Call
26ec97f7af
*wip
2014-11-12 08:46:21 -06:00
Seth Call
ae30cedcb1
* add has-mix to non-ajax recordings
2014-11-11 20:41:19 -06:00
Seth Call
27800d17fd
wip
2014-11-11 20:39:46 -06:00
Seth Call
ec37e630c7
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-11 16:24:48 -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
c2b2a7c6ef
More test fixes.
2014-11-11 13:17:33 -06:00
6c825db79f
Merge update
2014-11-10 17:10:01 -06:00
2c3fab9b34
VRFS-2362 replaced class selector with id selector
2014-11-10 14:59:30 +00:00
Seth Call
3c53eab168
*wip
2014-11-09 09:13:22 -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
7071177f3f
VRFS-2297 show instrument tooltips in session and recording hover bubbles
2014-11-07 12:39:45 -05:00
a7cabbe924
VRFS-2311 fix bug
2014-11-06 21:15:04 -05:00
f9d23f77fa
VRFS-2426 one more try at latency badge on hover bubble
2014-11-06 20:43:47 -05:00
Seth Call
164fe8db61
* recording cleanup logic VRFS-2393
2014-11-06 11:26:13 -06:00
415805c4eb
VRFS-2256 allow invited and approved RSVP users to join approval_required sessions without having to send a join request
2014-11-05 21:54:08 -05: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
fc4d55ba84
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-03 10:02:40 -06:00
Seth Call
ace7ac15c8
* VRFS-2432 notify when stream mix is done
2014-11-03 10:00:42 -06:00
c629f3d8bf
fix typo
2014-11-02 21:20:44 -05:00
2688bba63e
VRFS-2296 ensure hover bubble is displayed fully on screen
2014-11-02 21:18:30 -05: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
ae20d53d3d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-02 14:27:07 -05:00
33a431f822
VRFS-2427 fixed broken test
2014-11-02 14:26:56 -05:00
Seth Call
e654aba980
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-11-02 13:16:12 -06:00
Seth Call
daecbd8a2d
* VRFS-2440 - open FTUE immediately after dialog
2014-11-02 13:15:56 -06:00
eb56be97dd
VRFS-2427 fix sorting / paging issue on Feeds screen
2014-11-02 12:57:43 -05:00
ba80b25727
VRFS-2297 added tool tip to band tab of musician profile, couple of other bug fixes
2014-11-01 23:56:52 -04:00
1bfd3f653c
VRFS-2297 create help bubbles / tool tips for all instrument and friends/followers/recordings/sessions icons throughout app
2014-11-01 23:03:20 -04: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
9f3c5f36a6
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-29 07:13:08 -04:00
Seth Call
92956c4ee7
* VRFS-2429 - remove empty session; VRFS-1344 - prompt when joining session that is currently recording
2014-10-28 22:08:22 -05:00
Seth Call
dac2910008
* VRFS-2400 - show retry button only in the correct conditions
...
* VRFS-2425 - make sure threads don't die on exception, but report up
2014-10-28 21:16:54 -05:00
Seth Call
84ee43cdb8
* VRFS-2409 - detect if the mix is discarded in case of a virtual mix
2014-10-28 10:17:28 -05:00
Seth Call
2c66aceea8
* VRFS-2407 - show discarded correctly instead of unknown
2014-10-28 09:39:39 -05:00
300bc2cd82
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-27 21:37:28 -04:00
8bff2f2692
VRFS-2337 fix latency calculation for hover bubble
2014-10-27 21:35:18 -04:00
cf4827ba4a
VRFS-2337 fix latency calculation for hover bubble
2014-10-27 21:20:42 -04:00
Seth Call
e26f870e18
* VRFS-2406 prevent export while in session
2014-10-27 17:21:52 -05:00
Seth Call
a12e6335eb
* VRFS-2403 and VRFS-2403 - deal with leaving a session while joining, and with sync track info while joining
2014-10-27 13:26:04 -05:00
Seth Call
970401374b
* VRFS-2399 - fixed recording sync track issue
2014-10-27 12:42:30 -05:00
555b1ac510
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-26 20:48:23 -04:00
f6f79acddd
VRFS-2358 fixed notation upload and display issues
2014-10-26 19:45:29 -04:00
Seth Call
7e2b894548
* bring the play button back even if private, in private view VRFS-2383
2014-10-26 11:46:33 -05:00
709150edac
Merge branch 'develop' into feature/rsvp_slot_conflict
2014-10-26 12:41:17 -04:00
20d5eb8648
VRFS-2373 - adding white space to statement
2014-10-26 09:57:25 -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
88ac2c3fb5
* remove debug statement about jquery bt
2014-10-25 16:17:08 -05:00
Seth Call
dc590a95c2
* VRFS-2368 - close prodBubbles on session transition, open dialog, close dialog
2014-10-25 10:04:28 -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
b9b1fbb313
VRFS-2232 VRFS-2233 handle notification files so they only can be viewed if can_join?; otherwise throw 403 and handle appropriately
2014-10-22 07:01:11 +00: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
d17d4ede99
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-20 21:33:32 -04:00
447c391324
VRFS-2337 fix calculation of default audio latency
2014-10-20 21:33:23 -04:00
85fa427f02
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-20 03:29:36 +00:00
d6c269fec1
VRFS-2337 fix bug
2014-10-19 21:19:23 -04:00
a8987efaa1
VRFS-2337 added latency badge to musician hover bubble
2014-10-19 21:18:05 -04:00
2e679246cf
VRFS-2340 renamed ukulele image to use correct spelling
2014-10-19 23:07:16 +00:00
7d5d88fa38
VRFS-1470 pass in $feedItem to call of stopSessionPlay
2014-10-19 22:59:43 +00:00
959d68833d
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-14 07:33:34 +00:00
2ac03a912c
VRFS-2217 fixed spec test; cleanup profile feeds issue
2014-10-14 07:33:08 +00:00
ac57463415
Merge branch 'develop' into VRFS-2217
2014-10-14 06:21:38 +00:00
d2a8ff242e
VRFS-2330 resolve several issues with session details screen including RSVP cancel dialog and showing/hiding of 3 action buttons at top
2014-10-14 01:43:48 -04:00
9e7dc1f354
VRFS-2329 changed radio button on RSVP cancel dialog to fix Qt bug
2014-10-14 00:00:02 -04:00
ab66504532
VRFS-2344 show musician hover on pages 2-n on Find Session screen
2014-10-13 20:58:30 -04:00
38631cabde
VRFS-2217 enabling feeds to work in both profile and feed screen
2014-10-13 16:18:20 +00:00
257421a1d0
VRFS-2318 show JOIN button for non-scheduled (future) session
2014-10-13 08:40:10 -04:00
80fc8596b1
VRFS-2217 clearResults sets didLoadAllFeeds = false
2014-10-13 03:45:45 +00:00
4f15045005
VRFS-2217 replace infinite-scroll with simple jquery solution; lowered batch size to 10
2014-10-12 23:03:18 +00:00
a18cd57510
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-11 06:32:15 +00:00
5564fd2cf7
VRFS-2263 added special handling for attempts to join session multiple times
2014-10-10 19:16:25 +00:00
Seth Call
0fb721b8ed
* fix upgrade path: VRFS-2331
2014-10-09 16:45:48 -05:00
Seth Call
69477c5a86
* VRFS-2323 - add new support article for unreachable condition
2014-10-08 14:24:51 -05:00
7ab6d4d1fb
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-10-08 03:22:12 +00:00
Seth Call
71f6b7edc6
* VRFS-2304 - create scoring timeout when doing a network test
2014-10-06 16:44:30 -05:00
3595b46106
VRFS-1486 paginated scrolling of notifications; adjusting notification layout
2014-10-06 04:51:19 +00: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
Seth Call
49170d31a0
* instrument hover
2014-10-05 16:48:54 -05:00
a719670add
VRFS-2278 show correct hover bubble in Session Musicians section of Session Details screen; avatars should link to profile page
2014-10-05 15:14:35 -04:00
Seth Call
2d6f2e606d
* remove console.trace; IE 10 breaks on it
2014-10-03 11:31:29 -05:00
6442674c91
VRFS-2216 fix tests; include pending RSVPs and invites for session details screen
2014-09-28 22:37:52 -04:00
e7a719ffd1
VRFS-2278 added spinner while retrieving session details
2014-09-28 21:29:37 -04:00
Seth Call
0e274e8687
Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into develop
2014-09-28 13:14:16 -05:00
Seth Call
3d169d083e
* rename to geoiplocation
2014-09-28 13:14:06 -05:00
5159480eb8
VRFS-2265 include alert.js in web.js and landing.js
2014-09-28 12:35:22 -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
2a2445bcba
VRFS-2067 fix bug where latency badge was missing for in session users
2014-09-25 09:08:01 -04:00
Seth Call
0b85d00825
* fixing some package issues with websocket-gateway
2014-09-24 20:52:09 -05:00
3f1eb86684
Merge branch 'develop' into feature/sprint_12_work
2014-09-23 21:27:52 -04:00
Seth Call
14043f164e
* VRFS-2225 - fix for profile whacking
2014-09-22 20:35:23 -05:00
Seth Call
63425fe1ff
* make prod bubble show up if 0 or 1 profiles
2014-09-22 15:58:14 -05:00
Seth Call
7645acac72
* VRFS-2249 - protect against less than 1
2014-09-22 14:24:44 -05:00
Seth Call
61f0bd2aa0
* merged
2014-09-22 14:20:58 -05:00
2c7c43c3aa
VRFS-2118 hide play button for private recordings
2014-09-19 01:17:56 -04:00
f4327a7746
fix tests
2014-09-19 01:12:22 -04:00
37be35275b
hide end of list message while searching
2014-09-19 00:20:45 -04:00
9ae3fb1f45
Merge branch 'develop' into feature/sprint_12_work
2014-09-17 21:32:48 -04:00
ee38e8f2cc
VRFS-2067 fix issues with RSVP expand / collapse
2014-09-17 21:32:16 -04:00
Seth Call
609846c295
* VRFS-2204 - udp_reachable showing now
2014-09-17 20:31:58 -05:00
Seth Call
f9c751605c
* VRFS-2016 - potential fix for flapping connections
2014-09-17 17:19:35 -05:00
1f99ebef89
VRFS-2067 expand / collapse RSVP musicians and latencies when there are more than 3
2014-09-17 12:49:58 -04:00
Seth Call
9b6715d101
* remove debugging heartbeat
2014-09-17 10:43:52 -05:00
Seth Call
0db38e17d6
* adding tests for VRFS-2221
2014-09-17 10:22:05 -05:00
692416e27f
VRFS-2067 VRFS-2163 expand / collapse open slots, add All Languages option to language filter
2014-09-17 03:14:43 -04:00
Seth Call
4793ea701a
* VRFS-2209 - fix progress bar by fixing the update size variable. also show countdown
2014-09-16 21:14:16 -05:00
Seth Call
169f97fdc3
* fix bad support blurp
2014-09-16 21:47:59 -04:00
Seth Call
74ac15c8a1
* make better alert about no network server
2014-09-16 21:47:39 -04:00
Jonathan Kolyer
Steven Miers
Seth Call
Brian Smith
Anthony Davis