Commit Graph

1171 Commits

Author SHA1 Message Date
Duncan Sommerville ea887dd8f6 Disable publish checkbox for disconnected sources 2015-11-12 14:47:47 -05:00
Albert Santoni ae85c278ea Remove a WIP label temporarily 2015-11-12 10:09:09 -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 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 59cf6f6238 Radio page jPlayer fixes 2015-11-11 14:55:47 -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
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 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 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 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 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 866b88dbb2 Style tweaks to publishing and podcast dialogs 2015-11-04 15:16:29 -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 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 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
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
Albert Santoni 702ee97c7b Refactored Facebook Widget stuff 2015-10-30 14:38:34 -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 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 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 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
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
Duncan Sommerville e8980e7a79 Bugfixes and more work on station podcast frontend 2015-10-22 18:03:38 -04:00
Albert Santoni 3e97ee5d62 Localization and verbiage improvements for adding podcasts 2015-10-22 14:39:12 -04:00
Duncan Sommerville 23ccc268d1 Forgot to add station podcast phtml 2015-10-22 10:44:47 -04:00
Duncan Sommerville 6580c12ad3 Add station podcast privacy toggle 2015-10-21 17:30:24 -04:00
drigato cb8c34c3d5 SAAS-1126: Make player widget localizable 2015-10-21 16:14:36 -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 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 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
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 c8069aaedd Initial publishing fixes and tweaks 2015-10-19 13:42:27 -04:00
Albert Santoni 30d742af92 Added msising publish-dialog.phtml and fixed .gitignore file 2015-10-15 18:03:03 -04:00
Albert Santoni 9a03b1b50a Force users to click OK in the language/timezone popup 2015-10-14 11:58:44 -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 2ee7e4bf71 SAAS-1088 - move 'All My Shows' checkbox to dropdown instead 2015-09-30 11:38:33 -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
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
Duncan Sommerville ca51dcf3ae SAAS-1071 - more work on backend podcast implementation 2015-09-24 12:58:02 -04:00
Albert Santoni 5bd8a508b1 Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
	airtime_mvc/public/js/airtime/library/spl.js
2015-09-21 18:12:27 -04:00
Albert Santoni 479153df17 Merge branch 'saas' into saas-dev
Conflicts:
	airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
Albert Santoni a21c4612c9 Renamed a podcast.js function for clarity 2015-09-21 17:59:31 -04:00
Duncan Sommerville 4115f4939e Frontend tweaks 2015-09-21 15:37:57 -04:00
Duncan Sommerville 373ff55923 Frontend tweaks to podcasting + new abstract datatables functionality 2015-09-21 12:40:05 -04:00
Duncan Sommerville 0710accbe2 SAAS-1062 - more work on podcasting frontend 2015-09-18 18:29:50 -04:00
Duncan Sommerville a6450353e5 Add missing phtml file 2015-09-18 15:52:54 -04:00
Duncan Sommerville 6de6e2767c SAAS-1062 - Podcast skeleton work; slight rework to backend functionality 2015-09-18 15:39:12 -04:00
Duncan Sommerville be39b6b7c0 * Initial podcast skeleton functionality
* Rename SoundCloud/Celery classes to fit conventions
* Small fixes to Table class functionality
2015-09-18 15:34:55 -04:00
Albert Santoni a810010448 Dropped percentage from educational discount 2015-09-18 14:01:30 -04:00
Albert Santoni 2cad7c1848 Added educational pricing page link 2015-09-18 13:59:55 -04:00
Albert Santoni 8308ce9cac October promo banner 2015-09-17 15:38:00 -04:00
Albert Santoni 3d07260a9d Small VAT checker bugfix 2015-09-17 15:17:18 -04:00
Albert Santoni f6a33802db Merge branch 'saas-dev-tablerefactor' into saas-dev-publishing 2015-09-15 14:21:53 -04:00
Albert Santoni ffdc83dc26 Reusable datatable control that hooks up to any of our REST APIs
* Implements item selection (single, shift, ctrl), pagination, and
  sorting. To be used in the future.
* Added example code for how to use the table widget
* Temporarily added a table test page to the DashboardController
2015-09-15 14:18:35 -04:00
Duncan Sommerville 893d60ed44 Revert "SAAS-1061 - implement podcast list view skeleton; small bugfixes"
This reverts commit 0fcf6a8dac.
2015-09-14 18:29:43 -04:00
Duncan Sommerville 8c65ba8f66 SAAS-1061 - implement podcast list view skeleton; small bugfixes
Conflicts:
	airtime_mvc/public/js/airtime/library/library.js
2015-09-14 18:29:13 -04:00
Duncan Sommerville 0fcf6a8dac SAAS-1061 - implement podcast list view skeleton; small bugfixes 2015-09-14 18:26:28 -04:00
drigato bd4fc62e04 Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
Conflicts:
	airtime_mvc/public/js/airtime/library/spl.js
2015-09-09 13:55:27 -04:00
drigato 2569ce4d0a CC-6136: Playlist fade values don't get or set properly
Fix smartblock design and fade out saving bug
2015-09-09 13:54:16 -04:00
Duncan Sommerville e6494e7ff0 Better way to disable and reenable xfade button in playlist/sb editors 2015-09-08 16:56:55 -04:00
Duncan Sommerville 8c3f1cf535 Fix some issues with playlist/smart-block fade buttons 2015-09-08 16:44:33 -04:00
Duncan Sommerville 17c2ec2fd4 Fix responsiveness bugs 2015-09-08 15:25:28 -04:00
drigato c2d1b788c5 Added missing opening php tag on billing - upgrades page 2015-09-08 11:03:33 -04:00
Albert Santoni de322171df CC-6118: Playlist crossfade panel needs restyling
* Fixed it as much as possible. Unfortunately, the milliseconds are dropped
  by Propel so we should probably restrict the fade time to whole
  seconds....
2015-09-04 18:35:11 -04:00
Albert Santoni 1db1af3f2e Merge branch 'saas-dev' into saas-showbuilder-fade-editor-restyling 2015-09-04 11:21:00 -04:00
Albert Santoni 274881c6e0 Add _pro macros to a bunch of billing page stuff 2015-09-04 11:17:01 -04:00
Duncan Sommerville 53b835715a Fix responsiveness of upload page 2015-09-03 15:51:09 -04:00