Commit Graph

7321 Commits

Author SHA1 Message Date
drigato 16f252c2c8 Fix podcast title responsive layout on radio page 2015-11-16 14:16:10 -05:00
Duncan Sommerville 28d378abfa Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 12:45:04 -05:00
Duncan Sommerville 130c5f570b Fix podcast table bug 2015-11-16 12:44:57 -05:00
drigato ae02fa6260 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-16 12:36:11 -05:00
drigato 90ac6367e4 Improve podcast title on radio page 2015-11-16 12:35:50 -05:00
Duncan Sommerville 64f62b1994 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 12:07:59 -05:00
Duncan Sommerville 08f5aa51a6 CSS and display fixes 2015-11-16 12:07:53 -05:00
drigato 08afb54f89 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-16 11:44:30 -05:00
drigato 03e90cdd3f Fix podcast pagination highlighting on radio page 2015-11-16 11:44:06 -05:00
Duncan Sommerville 610d860d6a Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 11:36:24 -05:00
Duncan Sommerville 3010fa01fa Add processing div to podcast episodes table 2015-11-16 11:36:18 -05:00
Duncan Sommerville 7569e936ce Merge branch 'saas-dev-publishing' into saas-dev-publishing-station-podcast 2015-11-13 15:59:57 -05:00
Duncan Sommerville 840f446e07 Disable publish button unless at least one source is checked 2015-11-13 15:59:34 -05:00
Duncan Sommerville 1d8ebab147 Merge branch 'saas-dev-publishing' into saas-dev-publishing-station-podcast 2015-11-13 14:58:24 -05:00
Duncan Sommerville d0265367bf Add forgotten png file 2015-11-13 14:58:06 -05:00
Duncan Sommerville 8e867b522c SAAS-1202 - move station podcast to top-level menu item 2015-11-13 14:57:32 -05:00
Albert Santoni 591f7d59f0 Slightly better error handling for uploads 2015-11-13 10:53:47 -05:00
drigato 50c0bc2c28 Fix podcast current track title escaping on radio page 2015-11-13 09:51:57 -05:00
drigato d9d4ce884c Small radio page tweak 2015-11-13 09:02:33 -05:00
drigato 5b59fecae9 Fix radio page description button 2015-11-13 08:26:44 -05:00
drigato 778904fdb5 Radio page css fixes 2015-11-13 07:48:14 -05:00
Duncan Sommerville 0514a5d789 Frontend tweaks + fixes 2015-11-12 19:29:55 -05:00
Duncan Sommerville 69109e171c Fix bad css 2015-11-12 19:03:32 -05:00
Duncan Sommerville 55df7775c2 Frontend polish and fixes; make empty placeholder implementation more abstract and add placeholder to 'My Podcast' view 2015-11-12 19:02:09 -05:00
Duncan Sommerville 0e74229975 Fix bug where 'Add' dialog appends to the dom multiple times 2015-11-12 15:42:41 -05:00
Duncan Sommerville 5a573d3d9e Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-12 15:32:45 -05:00
Duncan Sommerville 607176276a Fix invalid reference bug 2015-11-12 15:32:38 -05:00
Duncan Sommerville 28e95d5c16 Add publish button to library table 2015-11-12 15:29:01 -05:00
drigato 9fc4e1c603 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-12 15:28:51 -05:00
drigato 9dae535768 Radio page jPlayer fixes 2015-11-12 15:28:40 -05:00
Duncan Sommerville ea887dd8f6 Disable publish checkbox for disconnected sources 2015-11-12 14:47:47 -05:00
Duncan Sommerville 0951afcbb3 SAAS-1188 - add empty placeholder for podcast episodes table 2015-11-12 14:14:42 -05:00
Duncan Sommerville 26c9a19836 Fix bug with import status of podcst episodes 2015-11-12 11:37:39 -05:00
Duncan Sommerville c7dcd4f00a Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-12 10:27:03 -05:00
Duncan Sommerville 1b4ae9bb83 Quick fix for bug on calendar 2015-11-12 10:26:57 -05:00
Albert Santoni ae85c278ea Remove a WIP label temporarily 2015-11-12 10:09:09 -05:00
Duncan Sommerville 071de55329 Add some additional error handling and prevent disabled buttons from being triggered 2015-11-11 19:26:51 -05:00
Duncan Sommerville 8a5c25291e Lower poll interval for checking import status of podcast episodes 2015-11-11 18:52:12 -05:00
Albert Santoni c43b45a7ba Renamed Radio Archive to Radio Podcast 2015-11-11 18:39:00 -05:00
Albert Santoni e5c198b61b Some minor style changes for podcasting 2015-11-11 18:01:09 -05:00
Duncan Sommerville 86b7dec6fb SAAS-1200 - remove context menu from schedule tracks dialog (calendar) 2015-11-11 17:07:24 -05:00
Duncan Sommerville 5b325acb34 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-11 16:48:35 -05:00
Duncan Sommerville 74f7c454b5 * SAAS-1184 - more polish for publishing/podcasting
* Fix some issues with the station podcast feed
* Various small fixes
2015-11-11 16:47:07 -05:00
drigato bec55dc73e Radio page fix for un-supported mime types 2015-11-11 15:53:42 -05:00
drigato faeaf5450b SAAS-1203: Sort published tracks on radio page by publication date DESC 2015-11-11 15:35:07 -05:00
drigato 59cf6f6238 Radio page jPlayer fixes 2015-11-11 14:55:47 -05:00
Duncan Sommerville 5264bebe57 SAAS-1199 - stop user from dragging unimported podcast episodes 2015-11-11 11:16:02 -05:00
Duncan Sommerville c5a5839eff Better errors from podcast 'Add' dialog 2015-11-10 19:26:25 -05:00
Duncan Sommerville de380369ed * SAAS-1197 - fix publish dialog behaviour for tasks with pending states
* SAAS-1184 - more polish on publishing/podcasting
2015-11-10 17:54:31 -05:00
drigato 308457c9f4 SAAS-1174: Indicate on Radio Page which podcast tracks cannot be played
Also made some other UI changes and pagination fixes
2015-11-10 17:06:58 -05:00
Duncan Sommerville b88bcfaa92 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-10 15:10:44 -05:00
Duncan Sommerville bb7f8c1ed3 SAAS-1184 - bugfixes and polish 2015-11-10 15:10:36 -05:00
Albert Santoni 127eeda0b3 Improved styling of podcast subscribe dialog 2015-11-10 15:10:08 -05:00
Albert Santoni f4e9328e57 Renamed View Podcasts to View Episodes 2015-11-10 10:57:56 -05:00
Duncan Sommerville f352b61707 Add prefixes for flex properties 2015-11-09 18:32:46 -05:00
Duncan Sommerville 0360b5e460 * SAAS-1182 - added sanity checks and additional logic to rss import and episode generation
* SAAS-1184 - started work on podcast UI polishing
* Fixed pull request issues
2015-11-09 18:17:49 -05:00
Duncan Sommerville 1bc0f9e54b Fix small bugs in table.js 2015-11-09 13:59:36 -05:00
Duncan Sommerville 48f09c44ca Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-09 13:57:17 -05:00
drigato 372e28f82e SAAS-1158: Station podcast on Radio Page design implementation
Fix some pagination functionality
2015-11-09 13:44:45 -05:00
drigato ea9f0c8929 SAAS-1158: Station podcast on Radio Page design implementation
added pagination to the station rss episodes list
2015-11-09 12:15:46 -05:00
Duncan Sommerville ef5fd271e0 Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-09 10:21:38 -05:00
drigato 4c3e05d5f0 SAAS-1158: Station podcast on Radio Page design implementation 2015-11-09 08:42:46 -05:00
Duncan Sommerville a7881b8941 SAAS-1165 - implement simple one-item drag and drop for podcast episodes table; still needs work 2015-11-06 17:47:46 -05:00
Duncan Sommerville 729360e1a1 SAAS-1165, SAAS-1155 - add constraints to Table buttons, implement podcast + podcast episode constraints; finish left-hand podcast episode view functionality 2015-11-06 14:40:22 -05:00
Albert Santoni 0e6e82a0c6 Fixed session start issue with new API 2015-11-06 13:04:33 -05:00
Albert Santoni e8a0ace018 Fixed up syntax error introduced by last commit 2015-11-06 12:57:35 -05:00
Albert Santoni 713a158bb3 Disable layout in recalculate-schedule API - XXXX-260 2015-11-06 12:50:47 -05:00
Albert Santoni 4a86544738 Skip non-files for XXXX-260 2015-11-06 12:50:30 -05:00
Albert Santoni ee99a7304f XXXX-260 - Recalculate schedule API as part of bugfix
Conflicts:
	airtime_mvc/application/configs/constants.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Scheduler.php
2015-11-06 12:49:53 -05:00
Duncan Sommerville 7072762dd9 Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-06 09:44:29 -05:00
drigato 093de68edb Add station rss subscribe link to radio page 2015-11-05 20:46:33 -05:00
Duncan Sommerville 901ded1441 Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-05 18:16:27 -05:00
Duncan Sommerville 0be26d621b SAAS-1165 - implement most functionality for left-hand podcast episodes view 2015-11-05 18:15:58 -05:00
Albert Santoni 1efd0b815b Removed October educational discount banner from billing page 2015-11-05 16:47:58 -05:00
drigato e496072541 Small css fix 2015-11-05 14:42:52 -05:00
drigato c476b69958 Add podcast icon to radio page 2015-11-05 14:41:31 -05:00
drigato a35d3ad27c SAAS-1175: Radio page should toggle playout between player bar and podcast tracks 2015-11-05 13:24:13 -05:00
Albert Santoni 685134d8bb Better trial suspension notice 2015-11-05 12:45:09 -05:00
Duncan Sommerville 95fc432445 SAAS-1173 - Add escaping for XML elements 2015-11-04 17:08:25 -05:00
Duncan Sommerville a984cee13a Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-04 15:58:11 -05:00
Duncan Sommerville 90ac2cc681 Fix bug where public station podcast feed would not display when logged out 2015-11-04 15:57:51 -05:00
Duncan Sommerville 6cb28e0911 Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
Conflicts:
	airtime_mvc/public/js/airtime/library/podcast.js
2015-11-04 15:18:50 -05:00
Duncan Sommerville df467a24bf Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-04 15:16:35 -05:00
Duncan Sommerville 866b88dbb2 Style tweaks to publishing and podcast dialogs 2015-11-04 15:16:29 -05:00
drigato 8d19e11343 SAAS-1173: Station RSS link does not work
Set charset to UTF-8
2015-11-04 15:08:47 -05:00
Duncan Sommerville ee19d90930 Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view 2015-11-04 13:24:42 -05:00
Duncan Sommerville e7869b54c7 SAAS-1165 - initial work on left-hand pane for podcast episodes 2015-11-04 13:22:33 -05:00
drigato a7370de832 Bump code version 2015-11-04 13:21:36 -05:00
drigato 8a03892ff8 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-04 12:45:50 -05:00
drigato b95ccd46e7 SAAS-1156: Podcast episode playback and download from Radio Page
Switched from using muses to jplayer for playback
2015-11-04 12:45:30 -05:00
Duncan Sommerville b4ec3eeb3f Add sharing token/download key to station podcast URL when set to private; tab middle click fix 2015-11-04 10:52:23 -05:00
Duncan Sommerville 69da2fa07e Style tweaks 2015-11-04 09:45:16 -05:00
Duncan Sommerville b12b08f0f4 SAAS-1164 - styling for publishing frontend 2015-11-04 09:29:03 -05:00
Duncan Sommerville 6683b712c4 Fix a couple of station podcast bugs 2015-11-03 17:13:38 -05:00
Duncan Sommerville a1d9902b2a Cosmetic tweaks 2015-11-03 16:40:09 -05:00
Duncan Sommerville 22f8b0f328 * SAAS-1153 - more work on station podcast frontend. Add delete and edit button functionality for episode table
* Various fixes and backend updates
* Move station podcast creation to id getter in Preferences
2015-11-03 16:23:17 -05:00
Duncan Sommerville c0d8b8b39c * SAAS-1168, SAAS-1153 - work on station podcast frontend
* SAAS-1164 - Styling fixes for publishing and podcast editors
2015-11-03 13:18:55 -05:00
drigato 4cd00b50ee Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-03 11:47:45 -05:00
drigato 569ea00787 Fix for PodcastController index action when station podcast does not exist 2015-11-03 11:45:01 -05:00
drigato 335c2fea11 Fix for radio page when station podcast does not exist yet 2015-11-03 11:40:22 -05:00
drigato 51ec5a0df5 SAAS-1073: Schema upgrade for podcasts
Delete station podcast id from cc_pref in downgrade sql
2015-11-03 11:29:50 -05:00
drigato d20574dfb1 SAAS-1073: Schema upgrade for podcasts
Upgrade and downgrade done.
2015-11-03 10:57:55 -05:00
Duncan Sommerville 3654647170 Add some comments to podcast.js 2015-11-03 10:31:06 -05:00
Duncan Sommerville def8e7280b * SAAS-1161 - refactor backend so episodes are loaded separately from podcast data to speed up loading and improve API readability
* Decouple imported and station podcast behaviour on the frontend
2015-11-02 18:07:16 -05:00
Duncan Sommerville c4be9aebb2 SAAS-1154 - hide RSS tab on Radio page when station podcast video is set to private 2015-11-02 11:22:02 -05:00
Duncan Sommerville 529a73d39d Fun update for tab functionality - add tab sorting and close on middle mouse click 2015-11-02 11:04:30 -05:00
Duncan Sommerville 4f281a30ed Add SoundCloud update and download tasks to Celery backend; requires airtime-celery reinstall 2015-10-30 16:10:16 -04:00
Albert Santoni 702ee97c7b Refactored Facebook Widget stuff 2015-10-30 14:38:34 -04:00
Duncan Sommerville bf97c42167 Fix tabs layout bugs 2015-10-30 11:43:09 -04:00
Duncan Sommerville 9af7f6dcdd Fix tabs bugs and podcast auto-ingest error 2015-10-30 10:29:22 -04:00
Duncan Sommerville d08e19a93a More small TaskManager and auto-ingest fixes 2015-10-29 18:26:20 -04:00
Duncan Sommerville e3feb17f0c * Change the Celery timeout to 15 minutes (from 10) to better accommodate automatic ingest
* Fix various small bugs in auto ingestion and tab implementation
* Update TaskManager run conditions to piggyback on API calls - guarantees a certain frequency of requests and greatly reduces chances of lock contention
2015-10-29 17:53:45 -04:00
Duncan Sommerville c92eceb60d Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-10-29 14:58:35 -04:00
Duncan Sommerville b4db2ff4ca SAAS-1083 - more work on publish dialog 2015-10-29 14:58:30 -04:00
drigato f3f5b4f539 SAAS-1156: Podcast episode playback and download from Radio Page
Fix metadata html escaping
Tried some tinkering with codecs
2015-10-29 14:45:19 -04:00
Duncan Sommerville 706db9bc25 Fix bug where multiple file metadata editors couldn't be opened through context menu 2015-10-29 13:47:43 -04:00
Duncan Sommerville 40a2aa10d8 SAAS-1083 - Implement unpublishing 2015-10-29 13:09:50 -04:00
Duncan Sommerville 4b11979eff Remove station podcast from podcast datatable; editor now opens from button in podcasts view 2015-10-29 12:17:52 -04:00
Duncan Sommerville 8c49477b9c Add some comments to podcast.js 2015-10-29 11:54:35 -04:00
Duncan Sommerville 95aae317c6 Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
	airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
	airtime_mvc/public/css/dashboard.css
	airtime_mvc/public/js/airtime/library/spl.js
2015-10-29 11:21:24 -04:00
Duncan Sommerville 1de8a24b59 CSS fixes for uploads page 2015-10-29 11:15:01 -04:00
Duncan Sommerville ada7212823 Add TaskManager task to fail pending imports over an hour old 2015-10-29 11:03:28 -04:00
Duncan Sommerville b5f31065a7 Fix merge error 2015-10-29 10:18:53 -04:00
Duncan Sommerville 59ad4fd7f5 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-10-29 10:12:31 -04:00
Duncan Sommerville a6eb4dc3e8 Fix for in-app lock contention - move task initialization into PageLayoutInitPlugin to run after session is loaded
Conflicts:
	airtime_mvc/application/Bootstrap.php
2015-10-29 10:12:26 -04:00
Duncan Sommerville 8978c3692d Fix annoying css error 2015-10-29 09:58:32 -04:00
Duncan Sommerville 14b35dcf18 Fix for in-app lock contention - move task initialization into PageLayoutInitPlugin to run after session is loaded 2015-10-29 09:37:39 -04:00
Duncan Sommerville cd17a23d13 Fix download counter reset timer 2015-10-29 09:23:41 -04:00
Duncan Sommerville 1067e9f8ae Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-10-28 18:54:35 -04:00
Duncan Sommerville e97aa199bd SAAS-1083 - work on publish dialog 2015-10-28 18:54:30 -04:00
drigato 3065d56018 SAAS-1156: Podcast episode playback and download from Radio Page
Playback is working in HTML5 mode and integrated with player bar
2015-10-28 16:28:56 -04:00
Duncan Sommerville 05f51a9a2d Refresh podcast tabs on focus to have better synchronization with auto-ingest backend 2015-10-28 13:43:21 -04:00
Duncan Sommerville e8643e04eb Add colreorder fixed columns to podcast + episodes datatables so checkbox column is fixed 2015-10-28 12:17:29 -04:00
Duncan Sommerville cc9f1ea6d0 * Wrap station podcast feed contents on radio page in displayRssTab check
* Test fix for automatic ingest bug
* Move disable layout code in feeds controller to avoid error case
2015-10-28 10:58:22 -04:00
drigato 09efacf4d5 SAAS-1156: Podcast episode playback and download from Radio Page
Playback works in HTML mode for mp3 files only right now.
Added a function that changes the player iframe's src attribute
so it plays individual tracks.
2015-10-27 16:00:15 -04:00
Albert Santoni 323b54d239 Rename billing menu for trials 2015-10-27 15:01:34 -04:00
drigato 1211e8db7f Fix typo 2015-10-26 15:55:03 -04:00
drigato 73e7e6e021 SAAS-1148: Add station podcast to Radio Page
Skeleton is done. Download link works. Play link not yet done.
2015-10-26 15:24:33 -04:00
drigato 7f05d5c05e Return track metadata as part of PodcastEpisodes API 2015-10-26 15:09:06 -04:00
drigato e994033109 Refactor podcast episodes rest controller index action 2015-10-26 11:28:10 -04:00
drigato 5a2d8b26a9 Fix for breaking uploads - fix cue regex 2015-10-23 16:09:38 -04:00
Albert Santoni aed18c534d SAAS-1150: Null mime type breaks the scheduled shows tab 2015-10-23 15:00:19 -04:00
Duncan Sommerville e8980e7a79 Bugfixes and more work on station podcast frontend 2015-10-22 18:03:38 -04:00
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