Commit Graph

6540 Commits

Author SHA1 Message Date
Duncan Sommerville 3cebbaf29a Add aac mime-types into audio mime map 2015-07-07 16:15:35 -04:00
Duncan Sommerville e12494ef5f Fix show source mount error 2015-07-07 15:55: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 0d27011e65 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-07-07 09:21:54 -04:00
drigato b200a29f43 SAAS-928: Time strings on Radio Page are not localized 2015-07-07 09:21:44 -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
Duncan Sommerville 999f03ea1e Merge branch 'saas' into saas-dev 2015-07-06 16:54:39 -04:00
drigato db0b733b84 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-07-06 12:53:41 -04:00
drigato a5a91c25e0 SAAS-929: Shows don't show up on schedule widget on Firefox 2015-07-06 12:53:15 -04:00
Duncan Sommerville 65ab13c23b Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-07-06 11:52:16 -04:00
Duncan Sommerville 31ce52b857 CC-6062 - Fix stretching last column after adding show in calendar view 2015-07-06 11:52:04 -04:00
drigato ec0fbd2d61 Fix for schedule widget weekdays going out of order 2015-07-06 10:47:04 -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 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
drigato e69eb9c2b1 SAAS-916: Localize schedule widget dates 2015-07-06 09:33:04 -04:00
Duncan Sommerville db7e4086ba Re-add favicon headlink 2015-07-04 01:16:58 -04:00
Duncan Sommerville cb0593370a Quick fix 2015-07-04 00:38:53 -04:00
Duncan Sommerville e3101e90b2 Resize player windows to correct dimensions on open 2015-07-02 16:07:49 -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 eda9b54cd1 Remove min-width on showbuilder panel to fix add-content pane issue 2015-06-30 16:35:51 -04:00
Duncan Sommerville 3c33cfd8b2 Remove min-width on showbuilder panel to fix add-content pane issue 2015-06-30 16:35:25 -04:00
Duncan Sommerville 765a61d09f Don't show status page on Airtime pro fix 2015-06-30 16:21:33 -04:00
Duncan Sommerville 771aeaacb6 Don't show status pages on Airtime Pro 2015-06-30 15:19:05 -04:00
Duncan Sommerville 7f9b54b006 SAAS-908 - Styles for new field layout 2015-06-30 12:15:15 -04:00
Duncan Sommerville f87fe11a24 SAAS-908 - Break source URL strings into host/port/mount fields 2015-06-30 12:14:33 -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 7dd69da614 Merge branch 'saas-dev' into saas 2015-06-29 17:07:46 -04:00
Duncan Sommerville a8f214803b Fix javascript error on some browsers 2015-06-29 17:07:17 -04:00
Albert Santoni 1c8ccbf0cd Merge branch 'saas' of https://github.com/sourcefabric/Airtime into saas 2015-06-29 16:36:38 -04:00
Albert Santoni cffc3b7e59 Add semi-colon to Shoutcast URLs to make them work with our player 2015-06-29 16:36:19 -04:00
Duncan Sommerville 04290e28dc Fix error getting current schedule information if connected to master source 2015-06-29 14:25:00 -04:00
Duncan Sommerville 133f1b72ca Remove min-height on datatables for now 2015-06-29 11:32:28 -04:00
Duncan Sommerville 19fb67c8d6 Fix broken delete button 2015-06-29 11:28:27 -04:00
Duncan Sommerville 4be34ea94b Add version string to favicon to force refresh 2015-06-29 10:26:52 -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
Duncan Sommerville ca9c805ce4 SAAS-906 - Change wording on Add to Show button 2015-06-26 15:25: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 c79e4fb9ea CC-4922 2015-06-26 15:12:52 -04:00
Duncan Sommerville 5fe70754bd Replace all timestamp strings with constant 2015-06-26 14:42:52 -04:00
Duncan Sommerville 9d60a3d130 Move Help Translate Airtime link to help menu 2015-06-26 14:27:27 -04:00
Duncan Sommerville 881471c6b8 SAAS-793 - Prevent show image upload when editing single instance of a repeating show 2015-06-26 14:23:45 -04:00
Duncan Sommerville 7e0b6ac7ba Add transifex link constant 2015-06-26 13:28:05 -04:00
Duncan Sommerville 3a51e66b07 Add transifex link to login page 2015-06-26 13:25:19 -04:00
Duncan Sommerville 6b9899d11c SAAS-882 - Switch edit user page to use new-style csrf generation 2015-06-26 10:45:26 -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 79f51f77cb Merge branch '2.5.x-installer' into saas-dev 2015-06-25 18:21:40 -04:00
Duncan Sommerville c59f401eb1 Fix shift selection in library and builder views 2015-06-25 18:21:22 -04:00
Duncan Sommerville 6497bc28c5 Show collapsible sections (other than 'dangerous settings') by default on preferences page 2015-06-25 17:43:15 -04:00
Duncan Sommerville 87bdc01318 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-06-25 14:13:25 -04:00
Duncan Sommerville 6fb9c6a30c SAAS-885, SAAS-857, SAAS-878 - Cosmetic fixes, remove js widget box in preferences 2015-06-25 14:13:09 -04:00
Duncan Sommerville d91b05a0ae SoundCloud - Add release_year metadata field and set default sharing and license types 2015-06-25 10:53:35 -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
Duncan Sommerville adff664e87 Fix sending null fields to SoundCloud 2015-06-24 16:13:04 -04:00
Duncan Sommerville e44e0de534 Add fields to SoundCloud upload 2015-06-24 15:46:53 -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 616cf143d5 SAAS-877 - Fix live-info-v2 behaviour 2015-06-24 14:28:04 -04:00
Duncan Sommerville ef957fe0aa SAAS-877 - Fix errors 2015-06-24 13:07:13 -04:00
Duncan Sommerville fd8194e7d8 Fix error getting media 2015-06-24 12:40:51 -04:00
Duncan Sommerville ffc3ef1bc9 SAAS-877 - Update live-info-v2 api 2015-06-24 12:31:32 -04:00
Duncan Sommerville 7645f67515 SAAS-877 - Update live-info-v2 api 2015-06-24 12:18:52 -04:00
Duncan Sommerville 065988f703 Return default value for disk quota if none set 2015-06-23 19:08:49 -04:00
Duncan Sommerville 4c797cf100 Update installer to work with saas branch 2015-06-23 19:02:55 -04:00
Duncan Sommerville d48e594dcd Fix upload to SoundCloud button remaining disabled after upload failure 2015-06-23 19:02:28 -04:00
Duncan Sommerville 70f6cbbc71 Fixes to airtime-celery setup 2015-06-23 15:10:02 -04:00
Duncan Sommerville a3f1cf1d56 CC-6060 - Fix breaking tooltips when viewing context menu in library 2015-06-22 10:47:34 -04:00
Duncan Sommerville e36c8a16d4 CC-6060 - Fix breaking tooltips when viewing context menu in library 2015-06-22 10:46:29 -04:00
Albert Santoni 1bb6ee63dc SAAS-867: Embedded player spins in endless loop if connection is refused 2015-06-19 15:30:51 -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 de184d761e Rename variable 2015-06-18 13:49:25 -04:00
Duncan Sommerville 6439bc9ad5 Add timestamp on SoundCloud upload success 2015-06-18 13:32:43 -04:00
Duncan Sommerville 02e0537be9 Merge branch 'saas-dev' into soundcloud 2015-06-18 13:29:59 -04:00
Duncan Sommerville 62b4de5162 Merge branch 'saas' into saas-dev
Conflicts:
	airtime_mvc/application/views/scripts/systemstatus/index.phtml
2015-06-18 10:24:44 -04:00
Duncan Sommerville 298ee30e9d Move misplaced tag 2015-06-18 10:03:12 -04:00
Duncan Sommerville 88bd3c9bc2 SAAS-872 - Load disk information statically 2015-06-18 10:03:05 -04:00
Duncan Sommerville 080c2c43b5 Add soundcloud callback file for saas routing 2015-06-17 17:39:37 -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 89e3eaa986 Merge branch 'saas-dev' into soundcloud 2015-06-17 17:00:15 -04:00
Duncan Sommerville 6e520f3bc0 Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup 2015-06-17 14:52:41 -04:00
Duncan Sommerville af2f757985 Move misplaced tag 2015-06-17 14:52:04 -04:00
Duncan Sommerville 92ad5bde6d Add fields to airtime.example.conf for compatibility, remove /etc/init scripts to prevent duplicate processes on startup 2015-06-17 14:49:12 -04:00
Duncan Sommerville 149447b861 Merge branch 'saas-dev' into soundcloud 2015-06-17 14:13:18 -04:00
Duncan Sommerville 8f59d18f34 Merge branch '2.5.x-installer' into saas-dev 2015-06-17 14:11:30 -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 27bebb9168 Remove logging statement 2015-06-17 13:09:56 -04:00
Duncan Sommerville 3a1d34dffe Merge branch 'saas-dev' into soundcloud 2015-06-17 10:14:03 -04:00
Albert Santoni 627343a626 Fixed the status page 2015-06-16 18:18:34 -04:00
Albert Santoni 8d114c7d6e Merge branch '2.5.x' into 2.5.x-installer 2015-06-16 16:34:22 -04:00
Duncan Sommerville e033360a4e Fix error when deleting SoundCloud tracks 2015-06-16 16:21:31 -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