Commit Graph

5452 Commits

Author SHA1 Message Date
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
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
drigato a35d3ad27c SAAS-1175: Radio page should toggle playout between player bar and podcast tracks 2015-11-05 13:24:13 -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 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 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 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
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 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 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 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 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