Commit Graph

7128 Commits

Author SHA1 Message Date
drigato 58a7b9324b Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
Conflicts:

airtime_mvc/application/modules/rest/controllers/PodcastEpisodesController.php
2015-10-22 15:03:38 -04:00
drigato 1aee6ba97a SAAS-1140: Paginate station podcast feed episodes
Added pagination to PodcastEpisodes controller
2015-10-22 14:51:39 -04:00
Albert Santoni 3e97ee5d62 Localization and verbiage improvements for adding podcasts 2015-10-22 14:39:12 -04:00
Albert Santoni 01618b55af Fixed a bug with our table widget toolbar not showing up with static data. Also fixed a race condition. 2015-10-22 14:28:12 -04:00
Duncan Sommerville f94e462fe0 Revert polling interval for podcast ingest 2015-10-22 12:22:56 -04:00
Duncan Sommerville 9302027a2b Fix issue with automatic ingest; shift episode ingest to PodcastEpisodesController 2015-10-22 12:12:41 -04:00
Duncan Sommerville 23ccc268d1 Forgot to add station podcast phtml 2015-10-22 10:44:47 -04:00
Duncan Sommerville 814fc67e90 Work on station podcast editor view 2015-10-21 19:21:52 -04:00
Duncan Sommerville 6580c12ad3 Add station podcast privacy toggle 2015-10-21 17:30:24 -04:00
Albert Santoni 16a0172542 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-10-21 16:26:04 -04:00
Albert Santoni a4b42344dd CC-6140: Switch to Windows linebreaks for stream M3U 2015-10-21 16:25:59 -04:00
drigato eba99728ae Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-10-21 16:14:54 -04:00
drigato cb8c34c3d5 SAAS-1126: Make player widget localizable 2015-10-21 16:14:36 -04:00
Albert Santoni 3b81ea02c8 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-10-21 16:14:11 -04:00
Albert Santoni 4d1d96c8f7 CC-6140: M3U streaming link 2015-10-21 16:14:06 -04:00
Duncan Sommerville 92ffa955c3 SAAS-1081 - implement station podcast download counter that resets monthly 2015-10-21 12:54:50 -04:00
Duncan Sommerville 6c0055895c Set auto ingest timestamp when updating 2015-10-21 11:18:33 -04:00
drigato b98f573531 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-10-21 11:01:20 -04:00
drigato 1cfa708717 SAAS-1125: Cue in and out points should be editable in the track metadata editor
Also made improvement by showing errors when the form has invalid data
2015-10-21 10:58:22 -04:00
Duncan Sommerville 0b1df6baf3 * SAAS-1084 - initial work on publishing API backend
* More work on automatic ingest
* Add automatic_ingest_timestamp column to ImportedPodcast
2015-10-20 19:03:34 -04:00
Albert Santoni 6cbc2f5316 Slight CSS rework for SAAS-1136 2015-10-20 17:39:46 -04:00
Albert Santoni f441f2d385 SAAS-1136: Disk usage div overflows if your disk usage is over 100% 2015-10-20 16:57:31 -04:00
Albert Santoni f79ca8650f Unpaid invoice usability hint and invoice page style fix - SAAS-1134 2015-10-20 15:44:24 -04:00
Albert Santoni 885f47c20e Better solution for upgrade problems (SAAS-1133) 2015-10-20 14:52:17 -04:00
Albert Santoni 9d4cc6c205 Temporary workaround for upgrade problems 2015-10-20 12:28:18 -04:00
Albert Santoni c8e1408dbe Handle error case with bad user timezone strings break advanced search 2015-10-20 11:45:26 -04:00
Albert Santoni 195f1f0e9a Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-10-19 17:31:31 -04:00
Albert Santoni f8a6721703 Increase transaction isolation level for track scheduling and moving 2015-10-19 17:31:26 -04:00
Duncan Sommerville 3a791ef9b5 Remove unnecessary field 2015-10-19 17:00:03 -04:00
Duncan Sommerville 12f6536e74 Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/controllers/plugins/Acl_plugin.php
2015-10-19 16:18:19 -04:00
Duncan Sommerville 1a5250205c Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-10-19 16:10:25 -04:00
Duncan Sommerville bd3a16ae7b SAAS-1110 - Fix header sizing at most screen resolutions 2015-10-19 16:10:20 -04:00
Duncan Sommerville bcbd8a8050 Fix bug in auto ingest, immediately retry on failure 2015-10-19 15:36:34 -04:00
Albert Santoni da6e613a24 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-10-19 15:23:57 -04:00
Albert Santoni fb4aef405c Increase transaction isolation level to avoid duplicate shows, SAAS-1111 2015-10-19 15:23:50 -04:00
Duncan Sommerville 9d0beabd3f Make playout history page visible for Program Managers 2015-10-19 14:09:42 -04:00
Duncan Sommerville c8069aaedd Initial publishing fixes and tweaks 2015-10-19 13:42:27 -04:00
Duncan Sommerville be3a3fbd9f * Fix error in automatic podcast ingest
* Switch from text-scrolling to using title attributes to display overflowing text strings
2015-10-19 12:57:18 -04:00
Albert Santoni 97cc4050a4 CC-6139: User timezone setting displays incorrectly in user settings 2015-10-19 12:37:34 -04:00
drigato 14104a93ae SAAS-1080: Station podcast feed 2015-10-19 11:54:53 -04:00
Albert Santoni 30d742af92 Added msising publish-dialog.phtml and fixed .gitignore file 2015-10-15 18:03:03 -04:00
Duncan Sommerville bddc121c2d Initial work on automatic ingest for imported podcasts 2015-10-15 14:44:17 -04:00
Duncan Sommerville a2d725f2b9 Fix podcast episode ingest 2015-10-15 11:33:09 -04:00
drigato 40d0619f10 Override Podcast->fromArray 2015-10-15 08:06:01 -04:00
Albert Santoni d98459a55d Fix head title on Radio Page 2015-10-14 15:20:49 -04:00
Albert Santoni eea5fff1fa Fixed jQuery being broken on Radio Page 2015-10-14 15:15:25 -04:00
Albert Santoni 2713bd7beb Merge branch 'saas-dev' into saas-3.x-sessionoptimizations 2015-10-14 14:50:54 -04:00
Albert Santoni 591b3d1539 Fix SAAS-1128 more robustly to fix timezone/lang popup for sign up too 2015-10-14 14:40:23 -04:00
Albert Santoni a90b97fb55 SAAS-1128: Logging in from www.airtime.pro doesn't trigger lang/timezone setup dialog 2015-10-14 14:28:39 -04:00
Albert Santoni 08344895d6 Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev 2015-10-14 11:59:05 -04:00
Albert Santoni 9a03b1b50a Force users to click OK in the language/timezone popup 2015-10-14 11:58:44 -04:00
Localizer 96e6038d87 updated translation resources 2015-10-14 15:49:16 +00:00
drigato c166b4f00e Merge branch 'saas-dev-publishing' into saas-dev-publishing-schema-change
Conflicts:
	airtime_mvc/application/models/airtime/Podcast.php
2015-10-14 11:04:41 -04:00
drigato d647bf67ea Refactoring Podcast classes and services 2015-10-14 10:58:13 -04:00
drigato 7f64edafff SAAS-1121: New link show instances don't get created sometimes if there is no show content
Fixed by checking if the linked show is empty before trying to copy its
tracks into new show instances
2015-10-13 11:08:17 -04:00
drigato cfb21f8425 Bunch of schema changes 2015-10-13 10:14:23 -04:00
Duncan Sommerville c3c4abdd0c Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/css/styles.css
	airtime_mvc/public/js/airtime/library/library.js
	airtime_mvc/public/js/airtime/library/spl.js
2015-09-30 16:26:02 -04:00
Duncan Sommerville ee70a0dbea SAAS-1094 - update backend to prevent removal of items in linked shows while on air 2015-09-30 14:44:48 -04:00
Duncan Sommerville b01fdc6805 SAAS-1094 - update backend to prevent removal of items in linked shows while on air 2015-09-30 14:44:06 -04:00
Duncan Sommerville 98d565ff3d SAAS-1101 - add workaround for pages obstructed by livechat box 2015-09-30 14:24:21 -04:00
Duncan Sommerville c0372c1745 Fix webstream tab change behaviour 2015-09-30 12:07:31 -04:00
Duncan Sommerville 2ee7e4bf71 SAAS-1088 - move 'All My Shows' checkbox to dropdown instead 2015-09-30 11:38:33 -04:00
Duncan Sommerville 258500f650 SAAS-1102 - fix datatables pagination layout issues 2015-09-30 11:24:29 -04:00
Duncan Sommerville efa3999041 SAAS-1016 - fix some stream settings not being saved correctly 2015-09-30 10:30:32 -04:00
drigato bdab0f7b1a Revert medatdata editor fix 2015-09-30 10:03:34 -04:00
drigato f91d28e3f2 Css fix for playlist editor 2015-09-30 09:02:35 -04:00
drigato 2e024bcfdd Css fixes for metadata and playlist editors 2015-09-30 08:58:39 -04:00
drigato c7dd2e7256 Working on changing schema 2015-09-30 08:53:13 -04:00
Localizer 4b882064f2 updated translation resources 2015-09-30 11:32:44 +00:00
Albert Santoni 8b33acacd3 Merge branch 'saas-sessionoptimizations' into saas-3.x-sessionoptimizations
Conflicts:
	airtime_mvc/application/Bootstrap.php
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/LoginController.php
	airtime_mvc/application/controllers/UserController.php
	airtime_mvc/public/js/airtime/preferences/preferences.js
2015-09-29 18:58:55 -04:00
Duncan Sommerville 70e538ebb4 SAAS-1069 - disable add button when track metadata tab is open 2015-09-29 16:39:54 -04:00
Duncan Sommerville c08994a60b Fix bug where user could open mutiple copies of same webstream tab 2015-09-29 16:34:23 -04:00
Duncan Sommerville 80515ef263 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-29 16:26:47 -04:00
Duncan Sommerville d3e9665063 Fix bug where switching to a webstream tab would throw an error 2015-09-29 16:26:39 -04:00
drigato 81bf601a12 SAAS-1099: Dashboard messed up in Safari 2015-09-29 16:03:14 -04:00
Duncan Sommerville 3df1081c60 SAAS-1088 - fix broken 'all my shows' checkbox 2015-09-29 15:51:09 -04:00
Duncan Sommerville 3fcc3c507a Fix tabs bug 2015-09-29 15:09:09 -04:00
Duncan Sommerville 0029844fa7 Fix layout of schedule tracks dialog 2015-09-29 13:54:43 -04:00
Albert Santoni f25457d1eb SAAS-1098: Max filesize restricted by new uploader 2015-09-29 13:29:06 -04:00
drigato b00ac6750c Testing 2015-09-29 13:04:22 -04:00
Albert Santoni eb5fcec485 SAAS-1096: Tabs layout in Schedule Tracks broken in Firefox, sometimes Chrome 2015-09-29 13:02:22 -04:00
Albert Santoni 4c52bd99f6 Temporarily fix the Help video label breaking the Help page layout 2015-09-29 12:36:56 -04:00
Duncan Sommerville c2cd768398 SAAS-1094 - fix selector for scheduled show selection + context menu 2015-09-29 12:27:45 -04:00
Duncan Sommerville f4fad13eb8 SAAS-1086 - centre cursor when dragging 2015-09-29 12:07:24 -04:00
Duncan Sommerville db1e69c00f Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-09-29 12:00:07 -04:00
Duncan Sommerville 8cc5e5835c Fix double processing icon when adding/removing tracks from playlists 2015-09-29 12:00:02 -04:00
Albert Santoni a9eb3f737d Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev 2015-09-29 11:50:18 -04:00
Albert Santoni 6f185d094b SAAS-1095: Unknown schedule type: array 2015-09-29 11:49:53 -04:00
Duncan Sommerville 99a5f7facb Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
Conflicts:
	airtime_mvc/build/sql/defaultdata.sql
2015-09-29 11:37:53 -04:00
Duncan Sommerville f5afc0957f SAAS-1087 - fix DJ list overflow + styling 2015-09-29 11:36:00 -04:00
Duncan Sommerville 7a44a05cb2 Style tweaks 2015-09-29 11:28:30 -04:00
Duncan Sommerville a75a9676f2 More robust solution for not showing what's new popup to new users 2015-09-29 11:28:20 -04:00
Albert Santoni 41cf4b389a Cleanup for defaultdata.sql 2015-09-29 11:03:19 -04:00
Duncan Sommerville 477708ecc9 Style tweaks 2015-09-29 10:29:21 -04:00
Albert Santoni f1c5a8b244 Fix the timezone/language picker and fix the What's New dialog popping up for new users 2015-09-29 09:19:33 -04:00
Albert Santoni 6658fca10b Some polish for the What's New popup 2015-09-28 22:17:34 -04:00
Albert Santoni 943048dd87 Hacky fix for SAAS-1090 - Allow airtime-system to work with session optimizations 2015-09-28 17:48:04 -04:00
Duncan Sommerville 67c20630a3 UI revamp what's new dialog 2015-09-28 17:19:02 -04:00
Duncan Sommerville d09941dffa Set TaskManager run interval back to 30 seconds 2015-09-28 14:15:08 -04:00
Duncan Sommerville c1a16d7973 Add filter string to generic Table object; add call to refetch podcast episode table data 2015-09-28 14:14:01 -04:00