diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/LICENSE b/LICENSE old mode 100755 new mode 100644 diff --git a/README b/README old mode 100755 new mode 100644 diff --git a/_working/create b/_working/create old mode 100755 new mode 100644 diff --git a/_working/get_downloads.sql b/_working/get_downloads.sql old mode 100755 new mode 100644 diff --git a/_working/get_plays.sql b/_working/get_plays.sql old mode 100755 new mode 100644 diff --git a/apache/django_live.wsgi b/apache/django_live.wsgi old mode 100755 new mode 100644 diff --git a/core/__init__.py b/core/__init__.py old mode 100755 new mode 100644 diff --git a/core/analytics/__init__.py b/core/analytics/__init__.py old mode 100755 new mode 100644 diff --git a/core/analytics/google.py b/core/analytics/google.py old mode 100755 new mode 100644 diff --git a/core/decorators.py b/core/decorators.py old mode 100755 new mode 100644 diff --git a/core/serialisers/__init__.py b/core/serialisers/__init__.py old mode 100755 new mode 100644 diff --git a/core/serialisers/json.py b/core/serialisers/json.py old mode 100755 new mode 100644 diff --git a/core/social/Facebook.py b/core/social/Facebook.py old mode 100755 new mode 100644 diff --git a/core/social/_Social.py b/core/social/_Social.py old mode 100755 new mode 100644 diff --git a/core/social/__init__.py b/core/social/__init__.py old mode 100755 new mode 100644 diff --git a/core/tasks.py b/core/tasks.py old mode 100755 new mode 100644 diff --git a/core/tests/__init__.py b/core/tests/__init__.py old mode 100755 new mode 100644 diff --git a/core/tests/mix.py b/core/tests/mix.py old mode 100755 new mode 100644 diff --git a/core/utils/__init__.py b/core/utils/__init__.py old mode 100755 new mode 100644 diff --git a/core/utils/audio/__init__.py b/core/utils/audio/__init__.py old mode 100755 new mode 100644 diff --git a/core/utils/audio/mp3.py b/core/utils/audio/mp3.py old mode 100755 new mode 100644 diff --git a/core/utils/file.py b/core/utils/file.py old mode 100755 new mode 100644 diff --git a/core/utils/html.py b/core/utils/html.py old mode 100755 new mode 100644 diff --git a/core/utils/live.py b/core/utils/live.py old mode 100755 new mode 100644 diff --git a/core/utils/string.py b/core/utils/string.py old mode 100755 new mode 100644 diff --git a/core/utils/url.py b/core/utils/url.py old mode 100755 new mode 100644 diff --git a/core/utils/waveform.py b/core/utils/waveform.py old mode 100755 new mode 100644 diff --git a/core/widgets/__init__.py b/core/widgets/__init__.py old mode 100755 new mode 100644 diff --git a/core/widgets/upload.py b/core/widgets/upload.py old mode 100755 new mode 100644 diff --git a/dss/__init__.py b/dss/__init__.py old mode 100755 new mode 100644 diff --git a/dss/localsettings.initial.py b/dss/localsettings.initial.py old mode 100755 new mode 100644 diff --git a/dss/logsettings.py b/dss/logsettings.py old mode 100755 new mode 100644 diff --git a/dss/settings.py b/dss/settings.py old mode 100755 new mode 100644 diff --git a/dss/urls.py b/dss/urls.py old mode 100755 new mode 100644 diff --git a/dss/warning_settings.py b/dss/warning_settings.py old mode 100755 new mode 100644 diff --git a/dss/wsgi.py b/dss/wsgi.py old mode 100755 new mode 100644 diff --git a/index.html b/index.html old mode 100755 new mode 100644 diff --git a/manage.py b/manage.py old mode 100755 new mode 100644 diff --git a/pip_upgrade.py b/pip_upgrade.py old mode 100755 new mode 100644 diff --git a/requirements.txt b/requirements.txt old mode 100755 new mode 100644 diff --git a/spa/__init__.py b/spa/__init__.py old mode 100755 new mode 100644 diff --git a/spa/admin.py b/spa/admin.py old mode 100755 new mode 100644 diff --git a/spa/ajax.py b/spa/ajax.py old mode 100755 new mode 100644 diff --git a/spa/api/__init__.py b/spa/api/__init__.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/ActivityResource.py b/spa/api/v1/ActivityResource.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/BackboneCompatibleResource.py b/spa/api/v1/BackboneCompatibleResource.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/ChatResource.py b/spa/api/v1/ChatResource.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/CommentResource.py b/spa/api/v1/CommentResource.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/EventResource.py b/spa/api/v1/EventResource.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/MixResource.py b/spa/api/v1/MixResource.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/ReleaseAudioResource.py b/spa/api/v1/ReleaseAudioResource.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/ReleaseResource.py b/spa/api/v1/ReleaseResource.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/UserResource.py b/spa/api/v1/UserResource.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/__init__.py b/spa/api/v1/__init__.py old mode 100755 new mode 100644 diff --git a/spa/api/v1/tests.py b/spa/api/v1/tests.py old mode 100755 new mode 100644 diff --git a/spa/audio.py b/spa/audio.py old mode 100755 new mode 100644 diff --git a/spa/context_processors.py b/spa/context_processors.py old mode 100755 new mode 100644 diff --git a/spa/forms.py b/spa/forms.py old mode 100755 new mode 100644 diff --git a/spa/management/__init__.py b/spa/management/__init__.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/__init__.py b/spa/management/commands/__init__.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/debug.py b/spa/management/commands/debug.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/deletefailed.py b/spa/management/commands/deletefailed.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/deleteorphanmp3.py b/spa/management/commands/deleteorphanmp3.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/drop.py b/spa/management/commands/drop.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/importdownloads.py b/spa/management/commands/importdownloads.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/importplays.py b/spa/management/commands/importplays.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/processmix.py b/spa/management/commands/processmix.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/processuser.py b/spa/management/commands/processuser.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/purchaselinks.py b/spa/management/commands/purchaselinks.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/tracklists.py b/spa/management/commands/tracklists.py old mode 100755 new mode 100644 diff --git a/spa/management/commands/waveforms.py b/spa/management/commands/waveforms.py old mode 100755 new mode 100644 diff --git a/spa/middleware/__init__.py b/spa/middleware/__init__.py old mode 100755 new mode 100644 diff --git a/spa/middleware/sqlprinter.py b/spa/middleware/sqlprinter.py old mode 100755 new mode 100644 diff --git a/spa/middleware/stripwhitespace.py b/spa/middleware/stripwhitespace.py old mode 100755 new mode 100644 diff --git a/spa/middleware/uploadify.py b/spa/middleware/uploadify.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0001_initial.py b/spa/migrations/0001_initial.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0002_auto__add_userfollows.py b/spa/migrations/0002_auto__add_userfollows.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0003_auto__add_field_mix_duration.py b/spa/migrations/0003_auto__add_field_mix_duration.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0004_auto__add_field_mix_slug.py b/spa/migrations/0004_auto__add_field_mix_slug.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0005_auto__chg_field_userprofile_slug.py b/spa/migrations/0005_auto__chg_field_userprofile_slug.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0006_auto__chg_field_mix_title.py b/spa/migrations/0006_auto__chg_field_mix_title.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0006_auto__chg_field_userprofile_user.py b/spa/migrations/0006_auto__chg_field_userprofile_user.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0007_auto__del_userfollows__chg_field_mix_title.py b/spa/migrations/0007_auto__del_userfollows__chg_field_mix_title.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0008_auto__add_field_userprofile_followers__add_field_userprofile_following.py b/spa/migrations/0008_auto__add_field_userprofile_followers__add_field_userprofile_following.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0009_auto__del_field_userprofile_followers__del_field_userprofile_following.py b/spa/migrations/0009_auto__del_field_userprofile_followers__del_field_userprofile_following.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0010_auto.py b/spa/migrations/0010_auto.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0011_auto__del_field__activity_user.py b/spa/migrations/0011_auto__del_field__activity_user.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0012_auto__add_field__activity_user.py b/spa/migrations/0012_auto__add_field__activity_user.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0013_auto__del_mixfavourite__add_usermixfavourite.py b/spa/migrations/0013_auto__del_mixfavourite__add_usermixfavourite.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0014_auto__del_usermixfavourite__add_mixfavourite.py b/spa/migrations/0014_auto__del_usermixfavourite__add_mixfavourite.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0015_auto__chg_field_mixfavourite_user.py b/spa/migrations/0015_auto__chg_field_mixfavourite_user.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0016_auto__del_mixlike.py b/spa/migrations/0016_auto__del_mixlike.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0017_auto__add_mixlike.py b/spa/migrations/0017_auto__add_mixlike.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0018_auto__del_mixdownload__del_mixlike__del__activity__del_mixplay__del_mi.py b/spa/migrations/0018_auto__del_mixdownload__del_mixlike__del__activity__del_mixplay__del_mi.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0019_auto__add_activityfavourite.py b/spa/migrations/0019_auto__add_activityfavourite.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0020_auto__add_activityplay.py b/spa/migrations/0020_auto__add_activityplay.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0021_auto__add_activitylike.py b/spa/migrations/0021_auto__add_activitylike.py old mode 100755 new mode 100644 diff --git a/spa/migrations/0022_auto__add_activitydownload.py b/spa/migrations/0022_auto__add_activitydownload.py old mode 100755 new mode 100644 diff --git a/spa/migrations/__init__.py b/spa/migrations/__init__.py old mode 100755 new mode 100644 diff --git a/spa/models/__init__.py b/spa/models/__init__.py old mode 100755 new mode 100644 diff --git a/spa/models/_basemodel.py b/spa/models/_basemodel.py old mode 100755 new mode 100644 diff --git a/spa/models/_lookup.py b/spa/models/_lookup.py old mode 100755 new mode 100644 diff --git a/spa/models/activity.py b/spa/models/activity.py old mode 100755 new mode 100644 diff --git a/spa/models/chatmessage.py b/spa/models/chatmessage.py old mode 100755 new mode 100644 diff --git a/spa/models/comment.py b/spa/models/comment.py old mode 100755 new mode 100644 diff --git a/spa/models/event.py b/spa/models/event.py old mode 100755 new mode 100644 diff --git a/spa/models/genre.py b/spa/models/genre.py old mode 100755 new mode 100644 diff --git a/spa/models/label.py b/spa/models/label.py old mode 100755 new mode 100644 diff --git a/spa/models/managers/QueuedActivityModelManager.py b/spa/models/managers/QueuedActivityModelManager.py old mode 100755 new mode 100644 diff --git a/spa/models/managers/__init__.py b/spa/models/managers/__init__.py old mode 100755 new mode 100644 diff --git a/spa/models/mix.py b/spa/models/mix.py old mode 100755 new mode 100644 diff --git a/spa/models/purchaselink.py b/spa/models/purchaselink.py old mode 100755 new mode 100644 diff --git a/spa/models/recurrence.py b/spa/models/recurrence.py old mode 100755 new mode 100644 diff --git a/spa/models/release.py b/spa/models/release.py old mode 100755 new mode 100644 diff --git a/spa/models/tracklist.py b/spa/models/tracklist.py old mode 100755 new mode 100644 diff --git a/spa/models/userprofile.py b/spa/models/userprofile.py old mode 100755 new mode 100644 diff --git a/spa/models/venue.py b/spa/models/venue.py old mode 100755 new mode 100644 diff --git a/spa/podcast.py b/spa/podcast.py old mode 100755 new mode 100644 diff --git a/spa/signals.py b/spa/signals.py old mode 100755 new mode 100644 diff --git a/spa/social/__init__.py b/spa/social/__init__.py old mode 100755 new mode 100644 diff --git a/spa/social/urls.py b/spa/social/urls.py old mode 100755 new mode 100644 diff --git a/spa/social/views.py b/spa/social/views.py old mode 100755 new mode 100644 diff --git a/spa/templates.py b/spa/templates.py old mode 100755 new mode 100644 diff --git a/spa/templatetags/__init__.py b/spa/templatetags/__init__.py old mode 100755 new mode 100644 diff --git a/spa/templatetags/spa_extras.py b/spa/templatetags/spa_extras.py old mode 100755 new mode 100644 diff --git a/spa/urls.py b/spa/urls.py old mode 100755 new mode 100644 diff --git a/spa/views.py b/spa/views.py old mode 100755 new mode 100644 diff --git a/static/bin/sm/soundmanager2.swf b/static/bin/sm/soundmanager2.swf old mode 100755 new mode 100644 diff --git a/static/bin/sm/soundmanager2_debug.swf b/static/bin/sm/soundmanager2_debug.swf old mode 100755 new mode 100644 diff --git a/static/bin/sm/soundmanager2_flash9.swf b/static/bin/sm/soundmanager2_flash9.swf old mode 100755 new mode 100644 diff --git a/static/bin/sm/soundmanager2_flash9_debug.swf b/static/bin/sm/soundmanager2_flash9_debug.swf old mode 100755 new mode 100644 diff --git a/static/bin/sm/soundmanager2_flash_xdomain.zip b/static/bin/sm/soundmanager2_flash_xdomain.zip old mode 100755 new mode 100644 diff --git a/static/css/bootstrap-datepicker.css b/static/css/bootstrap-datepicker.css old mode 100755 new mode 100644 diff --git a/static/css/bootstrap-responsive.css b/static/css/bootstrap-responsive.css old mode 100755 new mode 100644 diff --git a/static/css/bootstrap-timepicker.css b/static/css/bootstrap-timepicker.css old mode 100755 new mode 100644 diff --git a/static/css/bootstrap.css b/static/css/bootstrap.css old mode 100755 new mode 100644 diff --git a/static/css/colorbox.css b/static/css/colorbox.css old mode 100755 new mode 100644 diff --git a/static/css/com.podnoms.player.css b/static/css/com.podnoms.player.css old mode 100755 new mode 100644 diff --git a/static/css/deepsouthsounds.css b/static/css/deepsouthsounds.css old mode 100755 new mode 100644 diff --git a/static/css/emoticons.css b/static/css/emoticons.css old mode 100755 new mode 100644 diff --git a/static/css/jasny/jasny-bootstrap-responsive.css b/static/css/jasny/jasny-bootstrap-responsive.css old mode 100755 new mode 100644 diff --git a/static/css/jasny/jasny-bootstrap-responsive.min.css b/static/css/jasny/jasny-bootstrap-responsive.min.css old mode 100755 new mode 100644 diff --git a/static/css/jasny/jasny-bootstrap.css b/static/css/jasny/jasny-bootstrap.css old mode 100755 new mode 100644 diff --git a/static/css/jasny/jasny-bootstrap.min.css b/static/css/jasny/jasny-bootstrap.min.css old mode 100755 new mode 100644 diff --git a/static/css/select2.css b/static/css/select2.css old mode 100755 new mode 100644 diff --git a/static/css/testing.css b/static/css/testing.css old mode 100755 new mode 100644 diff --git a/static/css/toastr.css b/static/css/toastr.css old mode 100755 new mode 100644 diff --git a/static/css/uploadifive.css b/static/css/uploadifive.css old mode 100755 new mode 100644 diff --git a/static/fonts/iconic_fill.eot b/static/fonts/iconic_fill.eot old mode 100755 new mode 100644 diff --git a/static/fonts/iconic_fill.otf b/static/fonts/iconic_fill.otf old mode 100755 new mode 100644 diff --git a/static/fonts/iconic_fill.svg b/static/fonts/iconic_fill.svg old mode 100755 new mode 100644 diff --git a/static/fonts/iconic_fill.ttf b/static/fonts/iconic_fill.ttf old mode 100755 new mode 100644 diff --git a/static/fonts/iconic_fill.woff b/static/fonts/iconic_fill.woff old mode 100755 new mode 100644 diff --git a/static/fonts/iconic_stroke.eot b/static/fonts/iconic_stroke.eot old mode 100755 new mode 100644 diff --git a/static/fonts/iconic_stroke.otf b/static/fonts/iconic_stroke.otf old mode 100755 new mode 100644 diff --git a/static/fonts/iconic_stroke.svg b/static/fonts/iconic_stroke.svg old mode 100755 new mode 100644 diff --git a/static/fonts/iconic_stroke.ttf b/static/fonts/iconic_stroke.ttf old mode 100755 new mode 100644 diff --git a/static/fonts/iconic_stroke.woff b/static/fonts/iconic_stroke.woff old mode 100755 new mode 100644 diff --git a/static/img/500.png b/static/img/500.png old mode 100755 new mode 100644 diff --git a/static/img/asc.png b/static/img/asc.png old mode 100755 new mode 100644 diff --git a/static/img/beg.jpg b/static/img/beg.jpg old mode 100755 new mode 100644 diff --git a/static/img/bg.gif b/static/img/bg.gif old mode 100755 new mode 100644 diff --git a/static/img/bg.png b/static/img/bg.png old mode 100755 new mode 100644 diff --git a/static/img/close.gif b/static/img/close.gif old mode 100755 new mode 100644 diff --git a/static/img/colorbox/border.png b/static/img/colorbox/border.png old mode 100755 new mode 100644 diff --git a/static/img/colorbox/controls.png b/static/img/colorbox/controls.png old mode 100755 new mode 100644 diff --git a/static/img/colorbox/loading.gif b/static/img/colorbox/loading.gif old mode 100755 new mode 100644 diff --git a/static/img/colorbox/loading_background.png b/static/img/colorbox/loading_background.png old mode 100755 new mode 100644 diff --git a/static/img/default-avatar-32.png b/static/img/default-avatar-32.png old mode 100755 new mode 100644 diff --git a/static/img/default-avatar.png b/static/img/default-avatar.png old mode 100755 new mode 100644 diff --git a/static/img/default-track.png b/static/img/default-track.png old mode 100755 new mode 100644 diff --git a/static/img/desc.png b/static/img/desc.png old mode 100755 new mode 100644 diff --git a/static/img/download-progress-overlay.png b/static/img/download-progress-overlay.png old mode 100755 new mode 100644 diff --git a/static/img/dss-emoticons.png b/static/img/dss-emoticons.png old mode 100755 new mode 100644 diff --git a/static/img/dss-large.png b/static/img/dss-large.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Angel.png b/static/img/emoticons/simple/Angel.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Angry.png b/static/img/emoticons/simple/Angry.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Aww.png b/static/img/emoticons/simple/Aww.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Aww_2.png b/static/img/emoticons/simple/Aww_2.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Blushing.png b/static/img/emoticons/simple/Blushing.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Childish.png b/static/img/emoticons/simple/Childish.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Confused.png b/static/img/emoticons/simple/Confused.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Creepy.png b/static/img/emoticons/simple/Creepy.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Crying.png b/static/img/emoticons/simple/Crying.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Cthulhu.png b/static/img/emoticons/simple/Cthulhu.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Cute.png b/static/img/emoticons/simple/Cute.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Cute_Winking.png b/static/img/emoticons/simple/Cute_Winking.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Devil.png b/static/img/emoticons/simple/Devil.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Emoticons.plist b/static/img/emoticons/simple/Emoticons.plist old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Gah.png b/static/img/emoticons/simple/Gah.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Gah_2.png b/static/img/emoticons/simple/Gah_2.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Gasping.png b/static/img/emoticons/simple/Gasping.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Greedy.png b/static/img/emoticons/simple/Greedy.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Grinning.png b/static/img/emoticons/simple/Grinning.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Grinning_Winking.png b/static/img/emoticons/simple/Grinning_Winking.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Happy.png b/static/img/emoticons/simple/Happy.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Happy_2.png b/static/img/emoticons/simple/Happy_2.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Happy_3.png b/static/img/emoticons/simple/Happy_3.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Heart.png b/static/img/emoticons/simple/Heart.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Huh.png b/static/img/emoticons/simple/Huh.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Huh_2.png b/static/img/emoticons/simple/Huh_2.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Laughing.png b/static/img/emoticons/simple/Laughing.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Lips_Sealed.png b/static/img/emoticons/simple/Lips_Sealed.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Madness.png b/static/img/emoticons/simple/Madness.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Malicious.png b/static/img/emoticons/simple/Malicious.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Sick.png b/static/img/emoticons/simple/Sick.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Smiling.png b/static/img/emoticons/simple/Smiling.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Speechless.png b/static/img/emoticons/simple/Speechless.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Spiteful.png b/static/img/emoticons/simple/Spiteful.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Stupid.png b/static/img/emoticons/simple/Stupid.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Sunglasses.png b/static/img/emoticons/simple/Sunglasses.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Terrified.png b/static/img/emoticons/simple/Terrified.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Thumb_Down.png b/static/img/emoticons/simple/Thumb_Down.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Thumb_Up.png b/static/img/emoticons/simple/Thumb_Up.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Tired.png b/static/img/emoticons/simple/Tired.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Tongue_Out.png b/static/img/emoticons/simple/Tongue_Out.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Tongue_Out_Laughing.png b/static/img/emoticons/simple/Tongue_Out_Laughing.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Tongue_Out_Left.png b/static/img/emoticons/simple/Tongue_Out_Left.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Tongue_Out_Up.png b/static/img/emoticons/simple/Tongue_Out_Up.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Tongue_Out_Up_Left.png b/static/img/emoticons/simple/Tongue_Out_Up_Left.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Tongue_Out_Winking.png b/static/img/emoticons/simple/Tongue_Out_Winking.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Uncertain.png b/static/img/emoticons/simple/Uncertain.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Uncertain_2.png b/static/img/emoticons/simple/Uncertain_2.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Unhappy.png b/static/img/emoticons/simple/Unhappy.png old mode 100755 new mode 100644 diff --git a/static/img/emoticons/simple/Winking.png b/static/img/emoticons/simple/Winking.png old mode 100755 new mode 100644 diff --git a/static/img/favicon.ico b/static/img/favicon.ico old mode 100755 new mode 100644 diff --git a/static/img/info.png b/static/img/info.png old mode 100755 new mode 100644 diff --git a/static/img/loader.gif b/static/img/loader.gif old mode 100755 new mode 100644 diff --git a/static/img/mix-loader.gif b/static/img/mix-loader.gif old mode 100755 new mode 100644 diff --git a/static/img/noise.png b/static/img/noise.png old mode 100755 new mode 100644 diff --git a/static/img/pause.png b/static/img/pause.png old mode 100755 new mode 100644 diff --git a/static/img/play.png b/static/img/play.png old mode 100755 new mode 100644 diff --git a/static/img/player-sprite.png b/static/img/player-sprite.png old mode 100755 new mode 100644 diff --git a/static/img/playhead.png b/static/img/playhead.png old mode 100755 new mode 100644 diff --git a/static/img/select2-spinner.gif b/static/img/select2-spinner.gif old mode 100755 new mode 100644 diff --git a/static/img/select2.png b/static/img/select2.png old mode 100755 new mode 100644 diff --git a/static/img/select2x2.png b/static/img/select2x2.png old mode 100755 new mode 100644 diff --git a/static/img/sheen3.png b/static/img/sheen3.png old mode 100755 new mode 100644 diff --git a/static/img/signin_facebook.png b/static/img/signin_facebook.png old mode 100755 new mode 100644 diff --git a/static/img/signin_google.png b/static/img/signin_google.png old mode 100755 new mode 100644 diff --git a/static/img/signin_twitter.png b/static/img/signin_twitter.png old mode 100755 new mode 100644 diff --git a/static/img/site-logo-gr.png b/static/img/site-logo-gr.png old mode 100755 new mode 100644 diff --git a/static/img/slide-nav.png b/static/img/slide-nav.png old mode 100755 new mode 100644 diff --git a/static/img/social-sprites.png b/static/img/social-sprites.png old mode 100755 new mode 100644 diff --git a/static/img/switch_handle-OLD.png b/static/img/switch_handle-OLD.png old mode 100755 new mode 100644 diff --git a/static/img/switch_handle-gray.png b/static/img/switch_handle-gray.png old mode 100755 new mode 100644 diff --git a/static/img/switch_handle-light.png b/static/img/switch_handle-light.png old mode 100755 new mode 100644 diff --git a/static/img/switch_handle.png b/static/img/switch_handle.png old mode 100755 new mode 100644 diff --git a/static/img/switch_handle_pressed.png b/static/img/switch_handle_pressed.png old mode 100755 new mode 100644 diff --git a/static/img/switch_track-dark.png b/static/img/switch_track-dark.png old mode 100755 new mode 100644 diff --git a/static/img/switch_track-gray.png b/static/img/switch_track-gray.png old mode 100755 new mode 100644 diff --git a/static/img/switch_track-light.png b/static/img/switch_track-light.png old mode 100755 new mode 100644 diff --git a/static/img/switch_track.png b/static/img/switch_track.png old mode 100755 new mode 100644 diff --git a/static/img/toolbar-loader.gif b/static/img/toolbar-loader.gif old mode 100755 new mode 100644 diff --git a/static/img/transmogrifying.png b/static/img/transmogrifying.png old mode 100755 new mode 100644 diff --git a/static/img/twitter-ico.png b/static/img/twitter-ico.png old mode 100755 new mode 100644 diff --git a/static/img/twitter.png b/static/img/twitter.png old mode 100755 new mode 100644 diff --git a/static/img/uploadifive-cancel.png b/static/img/uploadifive-cancel.png old mode 100755 new mode 100644 diff --git a/static/img/waveform-processing.gif b/static/img/waveform-processing.gif old mode 100755 new mode 100644 diff --git a/static/img/whats-on.png b/static/img/whats-on.png old mode 100755 new mode 100644 diff --git a/static/js/app/appv2.coffee b/static/js/app/appv2.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/appv2.js b/static/js/app/appv2.js old mode 100755 new mode 100644 index dbbcb51..89e1510 --- a/static/js/app/appv2.js +++ b/static/js/app/appv2.js @@ -1,8 +1,8 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.6.2 (function() { - define(['backbone', 'marionette', 'app.lib/router', 'app.lib/panningRegion', 'app.lib/audioController', 'views/header', 'views/sidebar/sidebarView', 'models/mix/mixCollection'], function(Backbone, Marionette, DssRouter, PanningRegion, AudioController, HeaderView, SidebarView, MixCollection) { var App, sidebarView; + Marionette.Region.prototype.open = function(view) { this.$el.hide(); this.$el.html(view.el); @@ -36,6 +36,7 @@ }); App.vent.on("routing:started", function() { var enablePushState, pushState; + console.log("App(vent): routing:started"); enablePushState = true; pushState = !!(enablePushState && window.history && window.history.pushState); @@ -62,6 +63,7 @@ console.log("App: gobbling links"); $(document).on("click", "a[href]:not([data-bypass])", function(evt) { var href, root; + console.log("App: scarfed link"); href = { prop: $(this).prop("href"), diff --git a/static/js/app/chat.js b/static/js/app/chat.js old mode 100755 new mode 100644 diff --git a/static/js/app/dss.bootstrapper.js b/static/js/app/dss.bootstrapper.js old mode 100755 new mode 100644 index 4c84e83..125a758 --- a/static/js/app/dss.bootstrapper.js +++ b/static/js/app/dss.bootstrapper.js @@ -23,6 +23,9 @@ requirejs.config({ toastr: 'libs/toastr' }, shim: { + jquery: { + exports: 'jQuery' + }, backbone: { exports: 'Backbone', deps: ['jquery', 'underscore'] diff --git a/static/js/app/lib/audioController.coffee b/static/js/app/lib/audioController.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/lib/audioController.js b/static/js/app/lib/audioController.js old mode 100755 new mode 100644 diff --git a/static/js/app/lib/backbone.dss.model.collection.js b/static/js/app/lib/backbone.dss.model.collection.js old mode 100755 new mode 100644 diff --git a/static/js/app/lib/backbone.dss.model.js b/static/js/app/lib/backbone.dss.model.js old mode 100755 new mode 100644 diff --git a/static/js/app/lib/controller.coffee b/static/js/app/lib/controller.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/lib/controller.js b/static/js/app/lib/controller.js old mode 100755 new mode 100644 diff --git a/static/js/app/lib/editableView.coffee b/static/js/app/lib/editableView.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/lib/editableView.js b/static/js/app/lib/editableView.js old mode 100755 new mode 100644 diff --git a/static/js/app/lib/eventAggregator.coffee b/static/js/app/lib/eventAggregator.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/lib/eventAggregator.js b/static/js/app/lib/eventAggregator.js old mode 100755 new mode 100644 diff --git a/static/js/app/lib/panningRegion.coffee b/static/js/app/lib/panningRegion.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/lib/panningRegion.js b/static/js/app/lib/panningRegion.js old mode 100755 new mode 100644 diff --git a/static/js/app/lib/router.coffee b/static/js/app/lib/router.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/lib/router.js b/static/js/app/lib/router.js old mode 100755 new mode 100644 diff --git a/static/js/app/lib/utils.coffee b/static/js/app/lib/utils.coffee old mode 100755 new mode 100644 index 036676f..23f3fd2 --- a/static/js/app/lib/utils.coffee +++ b/static/js/app/lib/utils.coffee @@ -30,7 +30,17 @@ define ['jquery', 'bootstrap', 'toastr'], ($, bootstrap, toastr) -> toastr.success message, title generateGuid: -> - "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace /[xy]/g, (c) -> - r = Math.random() * 16 | 0 - v = (if c is "x" then r else (r & 0x3 | 0x8)) - v.toString 16 + "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace /[xy]/g, (c) -> + r = Math.random() * 16 | 0 + v = (if c is "x" then r else (r & 0x3 | 0x8)) + v.toString 16 + + downloadURL: (url) -> + iframe = document.getElementById("hiddenDownloader") + if iframe is null + iframe = document.createElement("iframe") + iframe.id = "hiddenDownloader" + iframe.style.visibility = "hidden" + document.body.appendChild iframe + iframe.src = url + true \ No newline at end of file diff --git a/static/js/app/lib/utils.js b/static/js/app/lib/utils.js old mode 100755 new mode 100644 index 56cca46..63f898d --- a/static/js/app/lib/utils.js +++ b/static/js/app/lib/utils.js @@ -1,8 +1,8 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.6.2 (function() { - define(['jquery', 'bootstrap', 'toastr'], function($, bootstrap, toastr) { var _this = this; + return { modal: function(url) { if (url) { @@ -24,6 +24,7 @@ }, checkPlayCount: function() { var _this = this; + if (document.cookie.indexOf("sessionId")) { $.getJSON("/ajax/session_play_count", function(data) { console.log("utils: got playcount"); @@ -46,10 +47,24 @@ generateGuid: function() { return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, function(c) { var r, v; + r = Math.random() * 16 | 0; v = (c === "x" ? r : r & 0x3 | 0x8); return v.toString(16); }); + }, + downloadURL: function(url) { + var iframe; + + iframe = document.getElementById("hiddenDownloader"); + if (iframe === null) { + iframe = document.createElement("iframe"); + iframe.id = "hiddenDownloader"; + iframe.style.visibility = "hidden"; + document.body.appendChild(iframe); + } + iframe.src = url; + return true; } }; }); diff --git a/static/js/app/models/activity/activityCollection.coffee b/static/js/app/models/activity/activityCollection.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/models/activity/activityCollection.js b/static/js/app/models/activity/activityCollection.js old mode 100755 new mode 100644 diff --git a/static/js/app/models/activity/activityItem.coffee b/static/js/app/models/activity/activityItem.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/models/activity/activityItem.js b/static/js/app/models/activity/activityItem.js old mode 100755 new mode 100644 diff --git a/static/js/app/models/comment/commentCollection.coffee b/static/js/app/models/comment/commentCollection.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/models/comment/commentCollection.js b/static/js/app/models/comment/commentCollection.js old mode 100755 new mode 100644 diff --git a/static/js/app/models/comment/commentItem.coffee b/static/js/app/models/comment/commentItem.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/models/comment/commentItem.js b/static/js/app/models/comment/commentItem.js old mode 100755 new mode 100644 diff --git a/static/js/app/models/event.js b/static/js/app/models/event.js old mode 100755 new mode 100644 diff --git a/static/js/app/models/mix/mixCollection.coffee b/static/js/app/models/mix/mixCollection.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/models/mix/mixCollection.js b/static/js/app/models/mix/mixCollection.js old mode 100755 new mode 100644 diff --git a/static/js/app/models/mix/mixItem.coffee b/static/js/app/models/mix/mixItem.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/models/mix/mixItem.js b/static/js/app/models/mix/mixItem.js old mode 100755 new mode 100644 diff --git a/static/js/app/models/release.js b/static/js/app/models/release.js old mode 100755 new mode 100644 diff --git a/static/js/app/models/release_audio.js b/static/js/app/models/release_audio.js old mode 100755 new mode 100644 diff --git a/static/js/app/models/user/userCollection.coffee b/static/js/app/models/user/userCollection.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/models/user/userCollection.js b/static/js/app/models/user/userCollection.js old mode 100755 new mode 100644 diff --git a/static/js/app/models/user/userItem.coffee b/static/js/app/models/user/userItem.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/models/user/userItem.js b/static/js/app/models/user/userItem.js old mode 100755 new mode 100644 diff --git a/static/js/app/site.js b/static/js/app/site.js old mode 100755 new mode 100644 diff --git a/static/js/app/social.js b/static/js/app/social.js old mode 100755 new mode 100644 diff --git a/static/js/app/views/activity/activityItemView.coffee b/static/js/app/views/activity/activityItemView.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/views/activity/activityItemView.js b/static/js/app/views/activity/activityItemView.js old mode 100755 new mode 100644 diff --git a/static/js/app/views/activity/activityListView.coffee b/static/js/app/views/activity/activityListView.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/views/activity/activityListView.js b/static/js/app/views/activity/activityListView.js old mode 100755 new mode 100644 diff --git a/static/js/app/views/comment/commentItemView.coffee b/static/js/app/views/comment/commentItemView.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/views/comment/commentItemView.js b/static/js/app/views/comment/commentItemView.js old mode 100755 new mode 100644 diff --git a/static/js/app/views/comment/commentListView.coffee b/static/js/app/views/comment/commentListView.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/views/comment/commentListView.js b/static/js/app/views/comment/commentListView.js old mode 100755 new mode 100644 diff --git a/static/js/app/views/event.js b/static/js/app/views/event.js old mode 100755 new mode 100644 diff --git a/static/js/app/views/header.coffee b/static/js/app/views/header.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/views/header.js b/static/js/app/views/header.js old mode 100755 new mode 100644 diff --git a/static/js/app/views/mix/mixDetailView.coffee b/static/js/app/views/mix/mixDetailView.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/views/mix/mixDetailView.js b/static/js/app/views/mix/mixDetailView.js old mode 100755 new mode 100644 diff --git a/static/js/app/views/mix/mixEditView.coffee b/static/js/app/views/mix/mixEditView.coffee old mode 100755 new mode 100644 diff --git a/static/js/app/views/mix/mixEditView.js b/static/js/app/views/mix/mixEditView.js old mode 100755 new mode 100644 index 8d0f26d..9b6de98 --- a/static/js/app/views/mix/mixEditView.js +++ b/static/js/app/views/mix/mixEditView.js @@ -1,18 +1,18 @@ -// Generated by CoffeeScript 1.3.3 +// Generated by CoffeeScript 1.6.2 (function() { var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; }, __hasProp = {}.hasOwnProperty, __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; }; define(['app.lib/editableView', 'moment', 'utils', 'libs/backbone/backbone.syphon', 'text!/tpl/MixEditView'], function(EditableView, moment, utils, Syphon, Template) { - var MixEditView; - return MixEditView = (function(_super) { + var MixEditView, _ref; + return MixEditView = (function(_super) { __extends(MixEditView, _super); function MixEditView() { - this.saveChanges = __bind(this.saveChanges, this); - return MixEditView.__super__.constructor.apply(this, arguments); + this.saveChanges = __bind(this.saveChanges, this); _ref = MixEditView.__super__.constructor.apply(this, arguments); + return _ref; } MixEditView.prototype.template = _.template(Template); @@ -37,6 +37,7 @@ MixEditView.prototype.onRender = function() { var parent; + console.log("MixEditView: onRender"); this.sendImage = false; parent = this; @@ -78,6 +79,7 @@ }, success: function(data) { var $out; + $out = $("#results"); $out.html("Your results:"); return $out.append("
" + data + "
| t |