..
corp
Merge with develop.
2015-06-03 14:22:21 -05:00
dialog
* fixing feed_spec
2015-07-17 07:18:27 -05:00
everywhere
Merge with develop.
2015-06-03 14:22:21 -05:00
landing
Merge with develop.
2015-06-03 14:22:21 -05:00
minimal
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
react-components
* video button is conditional in session screen based on config
2015-07-17 09:49:48 -05:00
web
* fixing feed_spec
2015-07-17 07:18:27 -05:00
wizard
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
AAA_Log.js
* prune the log cache from the right direction in the array
2014-08-08 13:05:27 -05:00
AAB_message_factory.js
Conflicts:
2014-12-18 15:13:55 -06:00
JamServer.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
accounts.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
accounts_affiliate.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
accounts_audio_profile.js
Merge with latest develop
2015-05-11 17:25:37 -05:00
accounts_identity.js
…
accounts_jamtracks.js.coffee
* VRFS-3234 - auto-open jamtrack from account screen
2015-05-12 15:45:23 -05:00
accounts_payment_history_screen.js.coffee
* VRFS-3080 - partial refund manual process done
2015-04-23 16:20:21 -05:00
accounts_profile.js
VRFS-3190 : Use scoped classes instead of ids for navigation buttons. Initialize musician profile samples properly.
2015-06-05 12:55:55 -05:00
accounts_profile_avatar.js
VRFS-3047 : Polish Save & Next buttons on profile editing screens.
2015-05-07 18:01:12 -05:00
accounts_profile_experience.js
VRFS-3190 : Use scoped classes instead of ids for navigation buttons. Initialize musician profile samples properly.
2015-06-05 12:55:55 -05:00
accounts_profile_interests.js
VRFS-3335 : Conditional validation for hourly rate and daily minimum when editing profile.
2015-07-17 13:42:48 -05:00
accounts_profile_samples.js
Remove stray log.
2015-07-15 17:07:24 -05:00
accounts_session_detail.js
fixed javascript error on session detail screen
2015-01-09 02:38:38 -05:00
accounts_session_properties.js
VRFS-2441 prevent long notation file names from overlaying buttons
2014-12-14 22:25:08 -05:00
accounts_sessions.js
…
accounts_video_profile.js
VRFS-3334 : Proper initialization of webcam viewer with unique parents. Trigger resolution change when select box changes.
2015-07-16 16:39:39 -05:00
addNewGear.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
addTrack.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
affiliate_report.js
…
alert.js
…
application.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
backend_alerts.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
bandProfile.js
* fixing more tests and slight style issues
2015-07-17 11:52:46 -05:00
band_setup.js
VRFS-3332 : Band setup : validate genres only when on the correct step AND the next button is used.
2015-07-15 20:05:24 -05:00
band_setup_photo.js
…
callbackReceiver.js
…
chatPanel.js
…
checkout_complete.js
* VRFS-3215 - add checkoutComplete URL
2015-05-12 14:14:44 -05:00
checkout_order.js
Merge with develop.
2015-06-03 14:22:21 -05:00
checkout_payment.js
* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests
2015-05-15 12:34:35 -05:00
checkout_signin.js
* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests
2015-05-15 12:34:35 -05:00
checkout_signin.js.coffee
Merge and fix
2015-04-16 12:16:09 -05:00
checkout_utils.js.coffee
Merge with develop.
2015-06-03 14:22:21 -05:00
clientUpdate.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
client_init.js.coffee
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
configureTrack.js
…
configureTracksHelper.js
Merge and fix
2015-04-16 12:16:09 -05:00
confirm.js
…
createSession.js.erb
…
custom_controls.js
…
download_jamtrack.js.coffee
* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests
2015-05-15 12:34:35 -05:00
extras.js
…
facebook_helper.js
* wip
2014-08-14 10:09:33 -05:00
facebook_rest.js
…
faderHelpers.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
fakeJamClient.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
fakeJamClientMessages.js
…
fakeJamClientRecordings.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
feed.js
VRFS-2217 enabling feeds to work in both profile and feed screen
2014-10-13 16:18:20 +00:00
feedHelper.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
feed_item_recording.js
* add has-mix to non-ajax recordings
2014-11-11 20:41:19 -06:00
feed_item_session.js
…
findBand.js
VRFS-1442 bands page updates
2014-12-03 08:22:35 +00:00
findMusician.js
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
findSession.js
Merge and fix
2015-04-16 12:16:09 -05:00
ftue.js
…
ga.js
Merge with develop.
2015-06-03 14:22:21 -05:00
genreSelector.js
…
globals.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
google_helper.js
* wip
2014-08-14 10:09:33 -05:00
header.js
…
helpBubbleHelper.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
homeScreen.js
* VRFS-3089 - kill timer if the screen changes for jamtrack guides
2015-04-24 17:28:59 -05:00
hoverBand.js
* VRFS-2097 - move around hover hookups
2014-11-16 21:40:21 -06:00
hoverFan.js
* VRFS-2097 - move around hover hookups
2014-11-16 21:40:21 -06:00
hoverMusician.js
VRFS-2426 do not divide by 2 when calculating full score for latency badge
2014-12-17 01:14:37 -05:00
hoverRecording.js
fix bug with deduping instruments in recording hover
2014-11-21 08:15:59 -05:00
hoverSession.js
VRFS-2467 dedup users and instruments on session hover bubble
2014-11-21 01:20:27 -05:00
instrumentSelector.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
inviteMusicians.js
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
jam_rest.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
jam_track_preview.js.coffee
Merge with develop.
2015-06-03 14:22:21 -05:00
jam_track_screen.js.coffee
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
jam_track_utils.js.coffee
Merge and fix
2015-04-16 12:16:09 -05:00
jamkazam.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
jamsocket.js
…
jamtrack_landing.js.coffee
Merge with develop.
2015-06-03 14:22:21 -05:00
joinSession.js
…
jquery.autocomplete.js
…
jquery.carousel-1.1.js
…
jquery.custom-protocol.js
…
jquery.exists.js
* many recording features/improvements: VRFS-2151, VRFS-1551, VRFS-2360, VRFS-2290, VRFS-2002, VRFS-2181
2014-10-22 23:10:49 -05:00
jquery.formToObject.js
…
jquery.hoverIntent.js
…
jquery.instrumentSelector.js
…
jquery.listenRecording.js
Merge and fix
2015-04-16 12:16:09 -05:00
jquery.listenbroadcast.js
Merge and fix
2015-04-16 12:16:09 -05:00
jquery.metronomePlaybackMode.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
jquery.monkeypatch.js
…
jquery.mousewheel-3.1.9.js
…
jquery.muteSelector.js
* wip
2014-11-13 09:20:08 -06:00
jquery.queryparams.js
…
layout.js
* VRFS-2855 - broadcast notifications done
2015-06-10 08:26:45 -05:00
leaveSession.js
…
mixer.js
…
mods_utils.js.coffee
* merged
2014-11-17 13:32:13 -06:00
musician_search_filter.js.coffee
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
networkTestHelper.js
Merge and fix
2015-04-16 12:16:09 -05:00
notificationPanel.js
Merge and fix
2015-04-16 12:16:09 -05:00
order.js
Merge and fix
2015-04-16 12:16:09 -05:00
paginator.js
Merge with latest develop
2015-05-11 17:25:37 -05:00
panHelpers.js.coffee
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
playbackControls.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
profile.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
profile_utils.js
VRFS-3335 : Conditional validation for hourly rate and daily minimum when editing profile.
2015-07-17 13:42:48 -05:00
react-components.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
react-init.js
* VRFS-2855 - broadcast notifications done
2015-06-10 08:26:45 -05:00
recordingManager.js
* recording cleanup logic VRFS-2393
2014-11-06 11:26:13 -06:00
recordingModel.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
recording_utils.js.coffee
* VRFS-2409 - detect if the mix is discarded in case of a virtual mix
2014-10-28 10:17:28 -05:00
redeem_complete.js
* fix bug in ability to open JamTrack
2015-05-15 15:30:15 -05:00
redeem_signup.js
* 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
routemap.js
…
scheduled_session.js.erb
Merge with latest develop
2015-05-11 17:25:37 -05:00
search.js
…
searchResults.js
VRFS-2093 fixed formatting and band URL issues with band search and hover bubble
2014-08-28 00:31:22 -04:00
selectLocation.js
Merge and fix
2015-04-16 12:16:09 -05:00
session.js
VRFS-3334 : Proper initialization of webcam viewer with unique parents. Trigger resolution change when select box changes.
2015-07-16 16:39:39 -05:00
sessionLatency.js
…
sessionList.js
Merge and fix
2015-04-16 12:16:09 -05:00
sessionModel.js
* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests
2015-05-15 12:34:35 -05:00
sessionTrack.js
…
session_utils.js
* VRFS-3234 - auto-open jamtrack from account screen
2015-05-12 15:45:23 -05:00
sessions.js.coffee
…
shopping_cart.js
* VRFS-3255 (shopping cart only on /client) , VRFS-3253 - frictionless shopping done with tests
2015-05-15 12:34:35 -05:00
sidebar.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
site_validator.js.coffee
VRFS-3190 : Several bug fixes for band profile
2015-06-04 18:55:15 -05:00
static_pages.js.coffee
…
stun.js
* VRFS-2159 merge
2014-09-12 22:30:51 -05:00
subscription_utils.js.coffee
Merge and fix
2015-04-16 12:16:09 -05:00
swfobject.js
…
sync_viewer.js.coffee
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
terms.js
…
testBridge.js
…
tickDuration.js
VRFS-2066 fixed some issues with session landing and feed
2014-09-14 19:17:16 -04:00
trackHelpers.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
twitter_helper.js
* wip
2014-08-14 10:09:33 -05:00
ui_helper.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
userSession.js
…
user_dropdown.js
* merged
2014-09-22 14:20:58 -05:00
users.js.coffee
…
utils.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
voiceChatHelper.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
vuHelpers.js
merge conflict from feature/new_session (VRFS-3283)
2015-07-15 10:04:45 -05:00
web_socket.js
…
webcam_viewer.js.coffee
VRFS-3334 : Proper initialization of webcam viewer with unique parents. Trigger resolution change when select box changes.
2015-07-16 16:39:39 -05:00