Commit Graph

157 Commits

Author SHA1 Message Date
Albert Santoni e49d337db0 Merge remote-tracking branch 'origin/saas-stream-settings' into saas-dev 2015-08-05 14:50:31 -04:00
drigato ce7765a8cb Merge branch 'saas' into saas-dev 2015-07-21 11:03:31 -04:00
drigato 6f09ef4af1 Change usability hint wording 2015-07-21 07:27:26 -04:00
drigato 7f4fbf65e1 SAAS-960 Change hint for currently playing linked show 2015-07-17 12:48:57 -04:00
Duncan Sommerville 1816be156f SAAS-922 - change file extensions in pypo based on mime-type, update lists of accepted mime types 2015-07-16 16:26:52 -04:00
drigato e07d62b020 Small comments fix 2015-07-15 10:41:01 -04:00
drigato 7b237a2e65 SAAS-940: Provide usability hints to user
Changed some hint wording
2015-07-14 12:14:00 -04:00
drigato 2de831a37f SAAS-940: Provide usability hints to user
Made hints more specific
2015-07-14 11:45:37 -04:00
drigato 25ef70767b SAAS-940: Provide usability hints to user
Customized hints depending on what page the user is on and what action
they just completed.
2015-07-13 17:02:31 -04:00
Duncan Sommerville 9fdc08f88a SAAS-876 - reset to default settings when using Airtime Pro streaming 2015-07-13 12:28:58 -04:00
drigato 48547ee347 SAAS-940: Provide usability hints to user
Refactored some code
2015-07-13 11:19:04 -04:00
drigato 55999a07ec SAAS-940: Provide usability hints to user 2015-07-13 08:06:41 -04:00
Albert Santoni 1efa591d67 Fixed double HTML encoding on embedded schedule widget 2015-07-09 12:49:49 -04:00
Duncan Sommerville 3cebbaf29a Add aac mime-types into audio mime map 2015-07-07 16:15:35 -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 e246771af0 SAAS-922 - additional mime-type coverage 2015-07-07 15:09:06 -04:00
Duncan Sommerville 92c9fd30b5 SAAS-922 - expose mime-based file extensions from /rest/media 2015-07-07 13:54:19 -04:00
drigato a5a91c25e0 SAAS-929: Shows don't show up on schedule widget on Firefox 2015-07-06 12:53:15 -04:00
drigato f86c50a834 SAAS-916: Localize schedule widget dates
Fix to use existing locale strings
2015-07-06 10:30:16 -04:00
drigato e69eb9c2b1 SAAS-916: Localize schedule widget dates 2015-07-06 09:33:04 -04:00
Albert Santoni 00dfd64677 Merge pull request #117 from sourcefabric/saas-dev-schedule-widget-angular
Saas dev schedule widget angular
2015-07-01 15:05:59 -04:00
Duncan Sommerville 04fe265538 Task manager update to run individual tasks 2015-06-30 11:46:58 -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 70f6cbbc71 Fixes to airtime-celery setup 2015-06-23 15:10:02 -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 afb02301c1 SAAS-868 - Fixes for pull request #115 - https://github.com/sourcefabric/airtime/pull/115 2015-06-17 17:16:21 -04:00
Duncan Sommerville 27bebb9168 Remove logging statement 2015-06-17 13:09:56 -04:00
Albert Santoni 0f58e315e6 Merge branch 'saas-cc-6055' into saas 2015-06-16 16:13:40 -04:00
Albert Santoni 0b6fb9882a Fix provisioning 2015-06-16 16:04:20 -04:00
Duncan Sommerville 8d2e476ff1 SAAS-868 - Refactor third party + celery workflow, implement locking on TaskManager 2015-06-16 15:10:08 -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
Albert Santoni b4c9a77e7c CC-6055: Improved escaping 2015-06-12 13:48:54 -04:00
Albert Santoni abc81a92b4 XSS prevention for Radio Page 2015-06-12 13:11:28 -04:00
Albert Santoni 53b67d0826 Disabled most of status page for Airtime Pro and fixed HTML syntax errors 2015-06-12 10:36:27 -04:00
drigato 832f70d663 SAAS-859: Schedule widget -> Shows can display on the wrong day 2015-06-11 10:10:03 -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
drigato 060280d5a5 Merge branch 'saas-dev' into saas-landing-page
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/controllers/IndexController.php
2015-06-08 14:55:24 -04:00
Duncan Sommerville 14f37909d1 More robust error handling in show-logo action 2015-06-05 11:55:06 -04:00
drigato 3593a13064 SAAS-842: Schedule widget show time formatting problem 2015-06-03 12:24:19 -04:00
drigato 8f8b0b7f4d Merge branch 'saas-dev' into saas-landing-page
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/views/scripts/embed/player.phtml
2015-05-28 13:25:18 -04:00
drigato 532bd1ea85 SAAS-772: Send metadata to Tunein
Made Improvement so Airtime always makes a request to TuneIn every 4
minutes so TuneIn does not turn metadata off
2015-05-25 15:37:45 -04:00
drigato 94b949adaa SAAS-772: Send metadata to Tunein
Removed unused code
2015-05-22 10:35:36 -04:00
drigato a2a9e54553 Merge branch 'saas-dev' into saas-tunein
Conflicts:
	airtime_mvc/application/views/scripts/form/preferences.phtml
2015-05-19 15:50:16 -04:00
drigato 2da4e264e5 SAAS-772: Send metadata to Tunein
Update metadata when station goes offline
2015-05-19 15:42:07 -04:00
drigato c3457ae03f tunein testing 2015-05-19 15:19:09 -04:00