seth
/
jam-cloud
mirror of https://bitbucket.org/jamkazam/jam-cloud.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
jam-cloud/web/app/assets/javascripts
History
Steven Miers 2e4dfaa728 Squashed commit of the following: 
commit 30965c6351
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 15 05:23:27 2015 -0500

    * allow jamblaster to fetch http

commit 5c8fb6b01e
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 11 13:43:07 2015 -0500

    * don't issue stop video in session end

commit 3e27680ea9
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 11 13:40:34 2015 -0500

    * decommision webcam_viewer in session page

commit ac1cc0c828
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Sep 10 07:24:42 2015 -0500

    * VRFS-3541 - don't use HTML to store data sent to server for genre
ID bug in profile

commit 004991119a
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 15:10:51 2015 -0500

    * set 'are you our user' cookie to do better job with ad tracking

commit 13a950e65f
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:58:46 2015 -0500

    * align disable vide obutton better

commit 9722c6cbc6
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:45:18 2015 -0500

    * whitesapce

commit 3976707b14
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:13:51 2015 -0500

    * check for video enabled better

commit b483dd537f
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 9 07:02:12 2015 -0500

    * better text for video test

commit a4f465b6d1
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 8 20:30:47 2015 -0500

    * VRFS-3530, VRFS-3531 - allow user to test and disable video

commit ba99f88048
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 8 10:05:26 2015 -0500

    * VRFS-3534 - fix start recording API signature

commit 386ed8144c
Author: Seth Call <sethcall@gmail.com>
Date:   Sun Sep 6 19:03:08 2015 -0500

    * VRFS-3528 - make sure open jamtrack dialog passes
'show_purchased_only'

commit 6d010a561b
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 4 20:43:15 2015 -0500

    * deal with too-few tracks on landing page, and the 3rd CTA bubble
clipping off text

commit 0076f0205a
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Sep 4 15:00:45 2015 -0500

    * VRFS-352 - instrument-centric landing page

commit 3ee71634b3
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Sep 2 09:40:06 2015 -0500

    * remove test stuff

commit d07ac009bf
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Sep 1 08:11:35 2015 -0500

    * VRFS-3509 - case where no device is configured handled

commit 9420cebad4
Author: Seth Call <sethcall@gmail.com>
Date:   Sun Aug 30 05:00:00 2015 -0500

    * VRFS-3494 - show popup when video window launches for the 1st
time to offer guidance

commit c3f81a4d23
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 10:35:43 2015 -0500

    * build bump

commit e782d5f9bb
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 09:43:40 2015 -0500

    * VRFS-3419 - check better for window opener

commit 36b6699cde
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 08:12:47 2015 -0500

    * validate popup VRFS-3419

commit 8948f0498f
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 27 07:59:21 2015 -0500

    * fix changed path

commit 2bce35d604
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:38:34 2015 -0500

    * fix jamtrack test

commit 63ef63c20d
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:34:40 2015 -0500

    * fix typo again in webcamViewer. need to go to bed

commit 8566cc5bc9
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:31:34 2015 -0500

    * fix typo added in webcamViewer

commit 22ea6e89fd
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 20:26:39 2015 -0500

    * VRFS-3488 - jamtrack search by artist and song need to pin to the
match, not do a sloppy search

commit a4bd28e168
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 16:43:34 2015 -0500

     VRFS-3474 - watch for USB events and refresh video pages

commit d2edfd22c5
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 12:01:52 2015 -0500

    * VRFS-3467 - previews are 20 seconds long indicator on jamtracks

commit defdfa8ce9
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 26 06:04:53 2015 -0500

    * VRFS-3473 - fix 'videoShared' state in webcamViewer

commit 090cfa17c0
Merge: 7560b34 818596a
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 14:53:35 2015 -0500

    Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into
develop

commit 7560b340c7
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 14:52:05 2015 -0500

    * VRFS-3466 - updated frontend to pass in GUIDs

commit 1252dbe178
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 25 05:28:15 2015 -0500

    * use new bridge calls to handle current FPS and resolution
VRFS-3428

commit 818596ae36
Author: Jonathan Kolyer <jonathan@jamkazam.com>
Date:   Tue Aug 25 08:23:52 2015 +0000

    VRFS-3451 musician_search verifying instrument and genres inputs

commit 6918eaf095
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 17:55:06 2015 -0500

     more UI tweaks for video settup in account screen VRFS-3428

commit fc69242578
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 16:18:31 2015 -0500

    * VRFS-3427 - update FTUE to test video, not just audio

commit 729974013a
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 16:17:53 2015 -0500

    * VRFS-3428 - fix button text

commit db1f1d60d5
Merge: 04825d2 90c8d05
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 15:56:42 2015 -0500

    Merge branch 'feature/video_frontend' into develop

commit 04825d2659
Author: Seth Call <sethcall@gmail.com>
Date:   Mon Aug 24 15:54:59 2015 -0500

    * VRFS-3428 - update how we query backend for frame rates

commit 39d0731d74
Author: Seth Call <sethcall@gmail.com>
Date:   Sat Aug 22 05:44:59 2015 -0500

    * VRFS-3456 - remove special chars from search

commit 1874720ee8
Author: Seth Call <sethcall@gmail.com>
Date:   Sat Aug 22 05:32:28 2015 -0500

    * VRFS-3456 - protect special chars from tsquery

commit 29104ff09b
Author: Seth Call <sethcall@gmail.com>
Date:   Fri Aug 21 05:02:48 2015 -0500

    * VRFS-3446 - bug fix for no genre specified on join of session;
also fix search bar in jamtrack dialog

commit 3b6d1febdb
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 15:44:21 2015 -0500

    * forget cta image

commit 6ac622853c
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 15:02:55 2015 -0500

    * VRFS-3449 - a little more tweaking of JamTrack landing page

commit d7fcadcd0d
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 14:49:07 2015 -0500

    * VRFS-3450 - fix 'show all tracks' when pagination occurs by not
doubleregistering

commit e7b50ca4a8
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 14:19:07 2015 -0500

    * VRFS-3449 - updates for direct landing pages

commit 0d075a9568
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:19:17 2015 -0500

    * fix spacing issue

commit 9c17d9a024
Merge: 9873450 0b67ef5
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:06:48 2015 -0500

    Merge branch 'develop' of bitbucket.org:jamkazam/jam-cloud into
develop

commit 98734506df
Author: Seth Call <sethcall@gmail.com>
Date:   Thu Aug 20 09:06:36 2015 -0500

    * VRFS-3448 - fix invisible downloader

commit 90c8d05d00
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 14:17:10 2015 -0500

    * wip

commit bf4044d92e
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 09:24:14 2015 -0500

    * VRFS-3422 - don't die if the user has on sale_line_items

commit 87c62b4db2
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 08:29:22 2015 -0500

    * a fix for linux? hfa code

commit 3fa58715fc
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:36:04 2015 -0500

    * fix open jamtrack dialog for people with less than 10 jamtracks

commit d045c94f54
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:17:37 2015 -0500

    * more HFA request polish

commit dc343f10e3
Author: Seth Call <sethcall@gmail.com>
Date:   Wed Aug 19 07:01:47 2015 -0500

    * don't show free jamtrack notice on landing page if
redeemed_jamtrack cookie is set

commit e6618da456
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 21:29:15 2015 -0500

    * fix a bug in figuring out if the user should be show GET IT FREE

commit 5ba03a2755
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 20:41:37 2015 -0500

    * VRFS-3431 - better response when creating HFA request

commit 37d6c3e57c
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 15:19:40 2015 -0500

    * add csv to dump released JamTracks

commit f6101f3621
Author: Seth Call <sethcall@gmail.com>
Date:   Tue Aug 18 14:26:41 2015 -0500

    VRFS-3422, VRFS-3423, VRFS-3424, VRFS-3429 - JamTrack search/listing

commit 0b67ef5f52
Author: Jonathan Kolyer <jonathan@jamkazam.com>
Date:   Sat Aug 15 15:03:00 2015 +0000

    fixed test for instruments in musician search
 		2015-09-19 16:33:39 -05:00
..
corp Merge with develop. 2015-06-03 14:22:21 -05:00
dialog Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -05:00
web Squashed commit of the following: 2015-09-19 16:33:39 -05:00
wizard Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -05:00
accounts_profile_samples.js Remove stray log. 2015-07-15 17:07:24 -05:00
accounts_session_detail.js Squashed commit of the following: 2015-09-19 16:33:39 -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 * VRFS-1876 - added details to the sesison info page 2014-07-11 22:22:15 -05:00
accounts_video_profile.js Squashed commit of the following: 2015-09-19 16:33: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 Squashed commit of the following: 2015-09-19 16:33:39 -05:00
bandProfile.js * fixing more tests and slight style issues 2015-07-17 11:52:46 -05:00
band_setup.js * VRFS-3344 - ensure popups are all removed when you leave a session 2015-07-18 14:26:50 -05:00
band_setup_photo.js
…
callbackReceiver.js
…
chatPanel.js * moving backend alert initialization to early in frontend initialization, to prep for receiving bad device events (VRFS-1770) 2014-06-11 16:52:46 -05:00
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 Squashed commit of the following: 2015-09-19 16:33:39 -05:00
checkout_signin.js.coffee Merge and fix 2015-04-16 12:16:09 -05:00
checkout_utils.js.coffee Squashed commit of the following: 2015-09-19 16:33:39 -05:00
clientUpdate.js merge conflict from feature/new_session (VRFS-3283) 2015-07-15 10:04:45 -05:00
client_init.js.coffee Squashed commit of the following: 2015-09-19 16:33:39 -05:00
configureTrack.js
…
configureTracksHelper.js Merge and fix 2015-04-16 12:16:09 -05:00
confirm.js fix create session flow errors. 2014-06-19 00:15:56 +02:00
createSession.js.erb
…
custom_controls.js
…
download_jamtrack.js.coffee Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -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
…
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 * protect against double-activation of search of find session screen 2015-07-22 08:16:00 -05:00
ftue.js * resolving VRFS-1781 2014-06-13 12:51:03 -05:00
ga.js Merge with develop. 2015-06-03 14:22:21 -05:00
genreSelector.js Squashed commit of the following: 2015-09-19 16:33:39 -05:00
globals.js Squashed commit of the following: 2015-09-19 16:33:39 -05:00
google_helper.js * wip 2014-08-14 10:09:33 -05:00
header.js
…
helpBubbleHelper.js Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -05:00
jam_track_preview.js.coffee Squashed commit of the following: 2015-09-19 16:33:39 -05:00
jam_track_screen.js.coffee Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -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 * VRFS-1809 - change to _default and copy instruments 2014-07-08 21:14:40 -05:00
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 Squashed commit of the following: 2015-09-19 16:33:39 -05:00
leaveSession.js
…
member_search_filter.js.coffee removed latency as search; fixed regressions 2015-06-28 19:49:02 +00:00
mixer.js
…
mods_utils.js.coffee * merged 2014-11-17 13:32:13 -06:00
networkTestHelper.js Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -05:00
panHelpers.js.coffee merge conflict from feature/new_session (VRFS-3283) 2015-07-15 10:04:45 -05:00
playbackControls.js * VRFS-3385 - metronome flicker code removed, fixing some error scenarios 2015-07-24 12:20:10 -05:00
profile.js merge conflict from feature/new_session (VRFS-3283) 2015-07-15 10:04:45 -05:00
profile_utils.js Squashed commit of the following: 2015-09-19 16:33:39 -05:00
react-components.js Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -05:00
redeem_signup.js Squashed commit of the following: 2015-09-19 16:33:39 -05:00
routemap.js
…
scheduled_session.js.erb Merge with latest develop 2015-05-11 17:25:37 -05:00
search.js
…
searchResults.js Squashed commit of the following: 2015-09-19 16:33:39 -05:00
selectLocation.js Merge and fix 2015-04-16 12:16:09 -05:00
session.js Squashed commit of the following: 2015-09-19 16:33: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 Squashed commit of the following: 2015-09-19 16:33:39 -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 Squashed commit of the following: 2015-09-19 16:33:39 -05:00
voiceChatHelper.js merge conflict from feature/new_session (VRFS-3283) 2015-07-15 10:04:45 -05:00
vuHelpers.js * found one escape hatch issue when coming in from account page for a JamTrack session, and removed some extra logging 2015-07-21 08:40:07 -05:00
web_socket.js
…
webcam_viewer.js.coffee Squashed commit of the following: 2015-09-19 16:33:39 -05:00