e4027c1e1f
Sweep pending podcast episodes after an hour; css tweaks to My Podcast page
2015-11-18 16:20:29 -05:00
0efaf836b0
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-18 12:37:44 -05:00
ba832ffe3a
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
2015-11-18 12:38:22 -05:00
965a78c54a
Merge branch 'saas-dev' into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/controllers/ApiController.php
2015-11-18 12:38:18 -05:00
bdeb173b21
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-18 12:37:34 -05:00
9218d76de9
SAAS-1214 - add Connect with Soundcloud button; Fix nav styling in some browsers
2015-11-18 12:37:29 -05:00
dc6c2893b4
Hide Soundcloud options from preferences for hobbyist plans
2015-11-18 12:31:31 -05:00
ceafccd685
Hide podcast from radio page for hobbyist plans
2015-11-18 12:12:57 -05:00
9a8e80f74b
Change station podcast RSS links back to https; style fix for menu in some browsers
2015-11-18 11:10:14 -05:00
eae8c7b638
Temporary fix to make enclosure urls iTunes compatible
2015-11-17 21:06:51 -05:00
ef87ad8a51
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
2015-11-17 20:12:26 -05:00
e915a4f1bb
Added iTunes owner field for the station podcast
2015-11-17 20:12:22 -05:00
ce7fdc2a85
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-17 19:51:46 -05:00
4828e82d2a
Change download key parameter regex
2015-11-17 19:51:41 -05:00
ddb2a225f8
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
...
Conflicts:
airtime_mvc/application/services/PodcastService.php
2015-11-17 19:35:05 -05:00
47193403ea
Added ATOM xmlns for iTunes support
2015-11-17 19:33:36 -05:00
6aafe25fd1
Change station RSS image title to match channel title
2015-11-17 19:28:52 -05:00
0d585e30db
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-17 18:59:03 -05:00
1571887928
Change how station logo default is returned
2015-11-17 18:58:58 -05:00
1ef9ee3073
Disable session starting for feeds controller
2015-11-17 18:55:53 -05:00
c89941d312
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
2015-11-17 18:34:06 -05:00
51d2f1dd0b
Added HTTP Range Request support to feeds/station-rss controller to make it work in iTunes
2015-11-17 18:34:02 -05:00
e75d614537
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-17 17:50:20 -05:00
bdddd6f6ce
Try to fix iTunes RSS compatibility
2015-11-17 17:50:16 -05:00
4fd61cb088
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
2015-11-17 17:34:33 -05:00
c5d9dfd93d
Restrict podcast hosting for some plans. Fixed error page colours.
2015-11-17 17:34:13 -05:00
30c9c730be
Bugfixes and itunes compatibility fix
2015-11-17 17:23:21 -05:00
f2fae3c67e
SAAS-1195 - fix calendar error; use baseurl in all internal links; css tweaks
2015-11-17 16:39:29 -05:00
ef1a57459c
Merge remote-tracking branch 'origin/saas-dev-publishing' into saas-dev-publishing
2015-11-17 16:18:57 -05:00
ff96eba9ea
Format podcast RSS XML with newlines
2015-11-17 16:18:38 -05:00
031c4dca41
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-17 15:20:17 -05:00
b268028e6a
SAAS-1213: Fix Podcast privacy settings radio button layout
2015-11-17 15:20:05 -05:00
57d9245fbf
SAAS-1214 - add link to preferences from publish dialog when source is disconnected; fix missing check in station rss generation
2015-11-17 12:35:31 -05:00
c12848b2de
* SAAS-1212 - fix validation errors in station podcast rss
...
* Append podcast title to heading in episodes view
2015-11-17 12:26:21 -05:00
041adb5c1f
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-17 11:53:07 -05:00
2523391d4d
Fix itunes duration format in station podcast xml
2015-11-17 11:53:02 -05:00
b94164107f
Podcast text overflow fix on radio page
2015-11-17 11:42:01 -05:00
9ddb33f2cd
Fix up title scaling on Radio Page
2015-11-17 10:48:16 -05:00
8ba7a5dbe9
Use flexbox for the Radio Page player bar
2015-11-17 10:33:43 -05:00
1a349c4ea1
Fixed non-trial suspension screen
2015-11-16 17:07:38 -05:00
7707378c2b
Improve the publish service implementation
2015-11-16 16:18:29 -05:00
957d0aebf2
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-16 15:29:11 -05:00
5828361465
Display message on radio page if no podcast tracks have been published yet.
2015-11-16 15:28:54 -05:00
2fb988a7cb
CSS fix for nav menu at small resolutions
2015-11-16 15:28:28 -05:00
f2ce22a1fa
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-16 14:40:46 -05:00
c453afc6f1
Fix toggling player bar and podcast playback on radio page
2015-11-16 14:40:31 -05:00
a34d74e7ce
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-16 14:23:16 -05:00
38d08a5661
SAAS-1208, SAAS-1209 - fix preferences and my podcast settings pages
2015-11-16 14:23:08 -05:00
16f252c2c8
Fix podcast title responsive layout on radio page
2015-11-16 14:16:10 -05:00
ae02fa6260
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-16 12:36:11 -05:00
90ac6367e4
Improve podcast title on radio page
2015-11-16 12:35:50 -05:00
64f62b1994
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-16 12:07:59 -05:00
08f5aa51a6
CSS and display fixes
2015-11-16 12:07:53 -05:00
03e90cdd3f
Fix podcast pagination highlighting on radio page
2015-11-16 11:44:06 -05:00
7569e936ce
Merge branch 'saas-dev-publishing' into saas-dev-publishing-station-podcast
2015-11-13 15:59:57 -05:00
840f446e07
Disable publish button unless at least one source is checked
2015-11-13 15:59:34 -05:00
8e867b522c
SAAS-1202 - move station podcast to top-level menu item
2015-11-13 14:57:32 -05:00
591f7d59f0
Slightly better error handling for uploads
2015-11-13 10:53:47 -05:00
50c0bc2c28
Fix podcast current track title escaping on radio page
2015-11-13 09:51:57 -05:00
d9d4ce884c
Small radio page tweak
2015-11-13 09:02:33 -05:00
5b59fecae9
Fix radio page description button
2015-11-13 08:26:44 -05:00
778904fdb5
Radio page css fixes
2015-11-13 07:48:14 -05:00
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
9fc4e1c603
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-12 15:28:51 -05:00
9dae535768
Radio page jPlayer fixes
2015-11-12 15:28:40 -05:00
ea887dd8f6
Disable publish checkbox for disconnected sources
2015-11-12 14:47:47 -05:00
26c9a19836
Fix bug with import status of podcst episodes
2015-11-12 11:37:39 -05:00
ae85c278ea
Remove a WIP label temporarily
2015-11-12 10:09:09 -05:00
071de55329
Add some additional error handling and prevent disabled buttons from being triggered
2015-11-11 19:26:51 -05:00
8a5c25291e
Lower poll interval for checking import status of podcast episodes
2015-11-11 18:52:12 -05:00
c43b45a7ba
Renamed Radio Archive to Radio Podcast
2015-11-11 18:39:00 -05:00
e5c198b61b
Some minor style changes for podcasting
2015-11-11 18:01:09 -05:00
5b325acb34
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-11 16:48:35 -05:00
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
bec55dc73e
Radio page fix for un-supported mime types
2015-11-11 15:53:42 -05:00
faeaf5450b
SAAS-1203: Sort published tracks on radio page by publication date DESC
2015-11-11 15:35:07 -05:00
59cf6f6238
Radio page jPlayer fixes
2015-11-11 14:55:47 -05:00
c5a5839eff
Better errors from podcast 'Add' dialog
2015-11-10 19:26:25 -05:00
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
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
b88bcfaa92
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-10 15:10:44 -05:00
bb7f8c1ed3
SAAS-1184 - bugfixes and polish
2015-11-10 15:10:36 -05:00
127eeda0b3
Improved styling of podcast subscribe dialog
2015-11-10 15:10:08 -05:00
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
48f09c44ca
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-09 13:57:17 -05:00
372e28f82e
SAAS-1158: Station podcast on Radio Page design implementation
...
Fix some pagination functionality
2015-11-09 13:44:45 -05:00
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
ef5fd271e0
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-09 10:21:38 -05:00
4c3e05d5f0
SAAS-1158: Station podcast on Radio Page design implementation
2015-11-09 08:42:46 -05:00
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
0e6e82a0c6
Fixed session start issue with new API
2015-11-06 13:04:33 -05:00
e8a0ace018
Fixed up syntax error introduced by last commit
2015-11-06 12:57:35 -05:00
713a158bb3
Disable layout in recalculate-schedule API - XXXX-260
2015-11-06 12:50:47 -05:00
4a86544738
Skip non-files for XXXX-260
2015-11-06 12:50:30 -05:00
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
7072762dd9
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-06 09:44:29 -05:00
093de68edb
Add station rss subscribe link to radio page
2015-11-05 20:46:33 -05:00
901ded1441
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-05 18:16:27 -05:00
0be26d621b
SAAS-1165 - implement most functionality for left-hand podcast episodes view
2015-11-05 18:15:58 -05:00
1efd0b815b
Removed October educational discount banner from billing page
2015-11-05 16:47:58 -05:00
a35d3ad27c
SAAS-1175: Radio page should toggle playout between player bar and podcast tracks
2015-11-05 13:24:13 -05:00
685134d8bb
Better trial suspension notice
2015-11-05 12:45:09 -05:00
95fc432445
SAAS-1173 - Add escaping for XML elements
2015-11-04 17:08:25 -05:00
a984cee13a
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-04 15:58:11 -05:00
90ac2cc681
Fix bug where public station podcast feed would not display when logged out
2015-11-04 15:57:51 -05:00
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
df467a24bf
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-11-04 15:16:35 -05:00
866b88dbb2
Style tweaks to publishing and podcast dialogs
2015-11-04 15:16:29 -05:00
8d19e11343
SAAS-1173: Station RSS link does not work
...
Set charset to UTF-8
2015-11-04 15:08:47 -05:00
ee19d90930
Merge branch 'saas-dev-publishing' into saas-dev-publishing-episode-view
2015-11-04 13:24:42 -05:00
e7869b54c7
SAAS-1165 - initial work on left-hand pane for podcast episodes
2015-11-04 13:22:33 -05:00
a7370de832
Bump code version
2015-11-04 13:21:36 -05:00
8a03892ff8
Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing
2015-11-04 12:45:50 -05:00
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
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
b12b08f0f4
SAAS-1164 - styling for publishing frontend
2015-11-04 09:29:03 -05:00
6683b712c4
Fix a couple of station podcast bugs
2015-11-03 17:13:38 -05:00
a1d9902b2a
Cosmetic tweaks
2015-11-03 16:40:09 -05:00
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
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
569ea00787
Fix for PodcastController index action when station podcast does not exist
2015-11-03 11:45:01 -05:00
335c2fea11
Fix for radio page when station podcast does not exist yet
2015-11-03 11:40:22 -05:00
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
d20574dfb1
SAAS-1073: Schema upgrade for podcasts
...
Upgrade and downgrade done.
2015-11-03 10:57:55 -05:00
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
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
529a73d39d
Fun update for tab functionality - add tab sorting and close on middle mouse click
2015-11-02 11:04:30 -05:00
4f281a30ed
Add SoundCloud update and download tasks to Celery backend; requires airtime-celery reinstall
2015-10-30 16:10:16 -04:00
702ee97c7b
Refactored Facebook Widget stuff
2015-10-30 14:38:34 -04:00
9af7f6dcdd
Fix tabs bugs and podcast auto-ingest error
2015-10-30 10:29:22 -04:00
d08e19a93a
More small TaskManager and auto-ingest fixes
2015-10-29 18:26:20 -04:00
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
c92eceb60d
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-10-29 14:58:35 -04:00
b4db2ff4ca
SAAS-1083 - more work on publish dialog
2015-10-29 14:58:30 -04:00
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
40a2aa10d8
SAAS-1083 - Implement unpublishing
2015-10-29 13:09:50 -04:00
4b11979eff
Remove station podcast from podcast datatable; editor now opens from button in podcasts view
2015-10-29 12:17:52 -04:00
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
ada7212823
Add TaskManager task to fail pending imports over an hour old
2015-10-29 11:03:28 -04:00
b5f31065a7
Fix merge error
2015-10-29 10:18:53 -04:00
59ad4fd7f5
Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev
2015-10-29 10:12:31 -04:00
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
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
cd17a23d13
Fix download counter reset timer
2015-10-29 09:23:41 -04:00
1067e9f8ae
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing
2015-10-28 18:54:35 -04:00
e97aa199bd
SAAS-1083 - work on publish dialog
2015-10-28 18:54:30 -04:00
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
05f51a9a2d
Refresh podcast tabs on focus to have better synchronization with auto-ingest backend
2015-10-28 13:43:21 -04:00
e8643e04eb
Add colreorder fixed columns to podcast + episodes datatables so checkbox column is fixed
2015-10-28 12:17:29 -04:00
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
Duncan Sommerville
Albert Santoni
drigato