a2a30e5c42
Merge branch 'saas-dev' into saas-dev-facebook-radio
2015-11-24 11:22:18 -05:00
04167c103b
Fix parameter name in api/bandwidth-usage
2015-11-23 11:37:08 -05:00
bac1e553d9
SAAS-1229 - add comments in Preference and set update timer
2015-11-23 10:53:25 -05:00
6c2d1f008b
SAAS-1229 - initial work on bandwidth limit within Airtime; overhaul TaskFactory to get tasks reflectively
2015-11-19 16:08:25 -05:00
25c54ce974
Merge branch 'saas-dev' into saas-dev-facebook-radio
2015-11-19 15:09:29 -05:00
c328515f4b
SAAS-1135 - fix help button url for logged out users
2015-11-19 11:08:35 -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
dc6c2893b4
Hide Soundcloud options from preferences for hobbyist plans
2015-11-18 12:31:31 -05:00
eae8c7b638
Temporary fix to make enclosure urls iTunes compatible
2015-11-17 21:06:51 -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
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
c5d9dfd93d
Restrict podcast hosting for some plans. Fixed error page colours.
2015-11-17 17:34:13 -05:00
5828361465
Display message on radio page if no podcast tracks have been published yet.
2015-11-16 15:28:54 -05:00
38d08a5661
SAAS-1208, SAAS-1209 - fix preferences and my podcast settings pages
2015-11-16 14:23:08 -05:00
90ac6367e4
Improve podcast title on radio page
2015-11-16 12:35:50 -05:00
8e867b522c
SAAS-1202 - move station podcast to top-level menu item
2015-11-13 14:57:32 -05:00
5b59fecae9
Fix radio page description button
2015-11-13 08:26:44 -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
8a5c25291e
Lower poll interval for checking import status of podcast episodes
2015-11-11 18:52:12 -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
faeaf5450b
SAAS-1203: Sort published tracks on radio page by publication date DESC
2015-11-11 15:35:07 -05:00
c5a5839eff
Better errors from podcast 'Add' dialog
2015-11-10 19:26:25 -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
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
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
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
0be26d621b
SAAS-1165 - implement most functionality for left-hand podcast episodes view
2015-11-05 18:15:58 -05:00
685134d8bb
Better trial suspension notice
2015-11-05 12:45:09 -05:00
90ac2cc681
Fix bug where public station podcast feed would not display when logged out
2015-11-04 15:57:51 -05:00
8d19e11343
SAAS-1173: Station RSS link does not work
...
Set charset to UTF-8
2015-11-04 15:08:47 -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
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
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
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
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
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
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
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
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
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
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
6580c12ad3
Add station podcast privacy toggle
2015-10-21 17:30:24 -04:00
16a0172542
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-21 16:26:04 -04:00
a4b42344dd
CC-6140: Switch to Windows linebreaks for stream M3U
2015-10-21 16:25:59 -04:00
eba99728ae
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-10-21 16:14:54 -04:00
cb8c34c3d5
SAAS-1126: Make player widget localizable
2015-10-21 16:14:36 -04:00
3b81ea02c8
Merge branch 'saas-dev' of github.com:sourcefabric/Airtime into saas-dev
2015-10-21 16:14:11 -04:00
4d1d96c8f7
CC-6140: M3U streaming link
2015-10-21 16:14:06 -04:00
92ffa955c3
SAAS-1081 - implement station podcast download counter that resets monthly
2015-10-21 12:54:50 -04:00
b98f573531
Merge branch 'saas-dev' of https://github.com/sourcefabric/Airtime into saas-dev
2015-10-21 11:01:20 -04:00
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
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
f79ca8650f
Unpaid invoice usability hint and invoice page style fix - SAAS-1134
2015-10-20 15:44:24 -04:00
3a791ef9b5
Remove unnecessary field
2015-10-19 17:00:03 -04:00
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
d98459a55d
Fix head title on Radio Page
2015-10-14 15:20:49 -04:00
eea5fff1fa
Fixed jQuery being broken on Radio Page
2015-10-14 15:15:25 -04:00
2713bd7beb
Merge branch 'saas-dev' into saas-3.x-sessionoptimizations
2015-10-14 14:50:54 -04:00
591b3d1539
Fix SAAS-1128 more robustly to fix timezone/lang popup for sign up too
2015-10-14 14:40:23 -04:00
a90b97fb55
SAAS-1128: Logging in from www.airtime.pro doesn't trigger lang/timezone setup dialog
2015-10-14 14:28:39 -04:00
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
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
efa3999041
SAAS-1016 - fix some stream settings not being saved correctly
2015-09-30 10:30:32 -04:00
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
c08994a60b
Fix bug where user could open mutiple copies of same webstream tab
2015-09-29 16:34:23 -04:00
b00ac6750c
Testing
2015-09-29 13:04:22 -04:00
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
67c20630a3
UI revamp what's new dialog
2015-09-28 17:19:02 -04:00
e03428327c
Fixed missing return statement
2015-09-25 15:54:26 -04:00
8b6833180d
Refactored double Set-Cookie prevention code, and session reopening code
2015-09-25 12:03:10 -04:00
91c584ba16
Test alternate session reopening code to alleviate double Set-Cookie header
2015-09-25 11:37:36 -04:00
c03e9cbe9a
SAAS-1085: Optimization - Don't start sessions unless we actually need them.
2015-09-25 10:41:51 -04:00
43e9fb59ce
SAAS-1071 - more work on celery backend for podcasts; add upgrade to make file_id field in third_party_track_references nullable
2015-09-24 15:57:38 -04:00
778b67982b
Remove duplicate imports and add new table imports to ScheduleController
2015-09-24 12:56:32 -04:00
a86e3ed4a8
Improvements to the preferences screen
2015-09-23 18:21:30 -04:00
3790b0fa81
Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing
...
Conflicts:
airtime_mvc/public/js/airtime/library/podcast.js
2015-09-22 18:37:41 -04:00
drigato
Duncan Sommerville
Albert Santoni