Commit graph

1957 commits

Author SHA1 Message Date
drigato
0601bd675e SAAS-939: Add option to preferences to display login button on radio page 2015-07-09 14:38:44 -04:00
Duncan Sommerville
ac2e1a2d4b SAAS-876 - More work on stream settings page 2015-07-08 16:04:09 -04:00
Duncan Sommerville
6b9d9e8063 Merge branch 'saas-dev' into saas-stream-settings 2015-07-08 12:47:24 -04:00
Duncan Sommerville
776596d5b6 SAAS-922 - replace large conditionals with single public mime-type map 2015-07-07 15:48:22 -04:00
Duncan Sommerville
5cb396e512 SAAS-923 - 2.5.14 schema upgrade to add partial unique index on cc_pref's keystr column (when subjid is null) 2015-07-06 18:03:44 -04:00
drigato
71b2a4e946 Removing duplicate locale strings 2015-07-06 10:29:02 -04:00
drigato
6914e16165 SAAS-916: Localize schedule widget dates
Forgot to commit msg strings for this
2015-07-06 10:21:27 -04:00
Duncan Sommerville
457230ba07 SAAS-876 - Initial commit 2015-07-03 13:32:41 -04:00
drigato
5f925f2f1f Merge branch 'saas-dev' into saas-dev-schedule-widget-angular 2015-06-30 09:46:36 -04:00
drigato
6db75550cc SAAS-870: Schedule widget displays shows in wrong timezone
Timezone conversion done in frontend
2015-06-30 09:38:53 -04:00
Duncan Sommerville
5cc8774e56 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/configs/constants.php
2015-06-29 10:02:58 -04:00
drigato
0a4651f752 SAAS-870: Schedule widget displays shows in wrong timezone
Have angularjs hooked in
2015-06-26 15:25:44 -04:00
Duncan Sommerville
5fe70754bd Replace all timestamp strings with constant 2015-06-26 14:42:52 -04:00
Duncan Sommerville
c44bae8140 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
	airtime_mvc/public/js/airtime/preferences/preferences.js
2015-06-26 10:37:30 -04:00
Duncan Sommerville
67155b136a Add downgrade action to UpgradeController, fix SoundCloud schema and bugs 2015-06-24 18:38:04 -04:00
Duncan Sommerville
8fcaf7fc74 Merge branch 'saas-dev' into soundcloud
Conflicts:
	airtime_mvc/application/configs/constants.php
2015-06-24 16:35:06 -04:00
Albert Santoni
d54eb37317 Merge branch 'saas' into saas-dev 2015-06-24 15:19:38 -04:00
Duncan Sommerville
f26559c0c6 Fix permissions for SoundCloud functionality 2015-06-24 14:48:38 -04:00
Duncan Sommerville
7645f67515 SAAS-877 - Update live-info-v2 api 2015-06-24 12:18:52 -04:00
Albert Santoni
74b403897d Merge branch 'saas' of github.com:sourcefabric/Airtime into saas 2015-06-19 14:23:46 -04:00
Albert Santoni
19adb062cf SAAS-879 and add FAQ to Help menu
* SAAS-879: When trying to save changes in the user setting pages
  changes do not save and goes to a "an error hass occured page"
2015-06-19 14:22:58 -04:00
Duncan Sommerville
76a7aa9a24 Fix SoundCloud and TaskManager bugs, switch tasks to use acks_late, and provide feedback from SoundCloud context menu items 2015-06-18 18:18:48 -04:00
Duncan Sommerville
02e0537be9 Merge branch 'saas-dev' into soundcloud 2015-06-18 13:29:59 -04:00
Duncan Sommerville
88bd3c9bc2 SAAS-872 - Load disk information statically 2015-06-18 10:03:05 -04:00
Duncan Sommerville
b42d773b5d Merge branch 'saas-dev' into soundcloud 2015-06-17 13:45:33 -04:00
Duncan Sommerville
4b3b3b5b93 SAAS-872 - Load disk information statically 2015-06-17 13:44:14 -04:00
Duncan Sommerville
3a1d34dffe Merge branch 'saas-dev' into soundcloud 2015-06-17 10:14:03 -04:00
Albert Santoni
0f58e315e6 Merge branch 'saas-cc-6055' into saas 2015-06-16 16:13:40 -04:00
Duncan Sommerville
0cd9b1d0e5 Merge branch 'saas-dev' into soundcloud 2015-06-16 15:10:14 -04:00
Duncan Sommerville
8d2e476ff1 SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager 2015-06-16 15:10:08 -04:00
Albert Santoni
61272cd42c Handle 404s with the correct error page, and don't log them 2015-06-16 14:58:27 -04:00
Albert Santoni
90bd0a1ab4 Attempt at fixing Sentry error logging 2015-06-16 14:35:29 -04:00
drigato
709b9bbeec CC-6059: Default station logo broken in Audio Preview popup 2015-06-16 13:37:05 -04:00
drigato
4bebe1e0fb Radio page fixes 2015-06-16 12:50:40 -04:00
Duncan Sommerville
3902c8c746 Add SoundCloud delete functionality and fixes; implement TaskManager to run background jobs 2015-06-15 15:12:37 -04:00
drigato
ad5121f2ca Radio Page improvements 2015-06-15 14:42:37 -04:00
Duncan Sommerville
706d7db2b2 Merge branch 'saas-dev' into soundcloud 2015-06-15 11:03:37 -04:00
Albert Santoni
b4c9a77e7c CC-6055: Improved escaping 2015-06-12 13:48:54 -04:00
Albert Santoni
7c6f15984d Small consistency changes for the embeddable widgets 2015-06-10 18:02:25 -04:00
Duncan Sommerville
8163608666 Merge branch 'saas-dev' into soundcloud 2015-06-10 16:25:30 -04:00
Duncan Sommerville
459f9494c3 Merge saas-dev into soundcloud 2015-06-10 16:08:52 -04:00
drigato
357e17f3b4 Fix for station logo not displaying correctly 2015-06-10 15:57:09 -04:00
Duncan Sommerville
626489bb3b SAAS-853 - Celery backend for SoundCloud uploads 2015-06-10 15:04:49 -04:00
Albert Santoni
24db599afe Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-06-10 15:03:21 -04:00
Albert Santoni
c18e728583 Merge branch 'saas-installer-albert' into saas-dev 2015-06-10 15:03:11 -04:00
drigato
ffcd15190f Default station logo was not displaying 2015-06-10 14:46:27 -04:00
Albert Santoni
3996e757b7 Merge branch 'saas-dev' into saas-installer-albert 2015-06-10 12:02:08 -04:00
drigato
0796f58878 Merge branch 'saas-dev' into saas-landing-page 2015-06-10 11:14:02 -04:00
drigato
042e441708 Radio Page Code Review Changes
Reset stylesheets in index controller.
Removed hardcoded days of week in WidgetHelper.
Display schedule widget with 6 days after the current day.
2015-06-10 11:13:03 -04:00
Albert Santoni
6126e8a51c Merge branch 'saas' into saas-dev 2015-06-10 11:02:59 -04:00