e873e0d8da
Merge branch 'fix/live-stream-source' of https://github.com/Robbt/libretime into Robbt-fix/live-stream-source
2017-03-14 19:22:32 -04:00
67ffd2d34a
Making show and master source ports and mount points editable.
2017-03-14 01:15:14 +00:00
61cde1557f
Make password reset work for eveyone
...
This stops distinguishing between superadmin users from whmcs vs regular local users on the password reset page.
2017-03-13 20:39:21 +01:00
b2c30ed3a5
Merge pull request #68 from radiorabe/feature/product-name-in-widgets
...
Problem: Pro widgets contain ads for legacy upstream
2017-03-12 15:20:28 -04:00
8823e76f5c
Use PRODUCT_NAME in pro widgets
2017-03-12 15:30:58 +01:00
260ebe2476
Fix listenerstat page
...
Deactivates the bandwidth limit stuff if none is configured.
2017-03-12 15:13:45 +01:00
2be8ef0f2b
Merge pull request #55 from radiorabe/feature/autodj
...
Robbs AutoDJ
2017-03-11 18:41:08 -05:00
2a53241ba3
Whitespace and deadcode nitpick
2017-03-10 16:27:46 +01:00
32a1a66378
Added AutoPlaylist Functionality to Show Scheduler enabling shows to have tracks added automatically.
2017-03-10 15:33:32 +01:00
baa0f9ba77
Make CORS great again
...
This fixes CORS to work properly with most 2.5 api endpoints while keeping the JSONP format available.
* [x] return JSONP or JSON with proper CORS headers from API
* [x] Field in Genereal Preferences Form to configure CORS enabled URLs
See #17 for what triggered this refactor. I beleive this should make integrating the APIs on the client side trivial without mandating the use of JSONP.
2017-03-10 15:10:56 +01:00
70e6135e93
Restore full disk usage not based on quota
...
This is mostly a restore of how this used to be implemented.
2017-03-08 15:56:43 +01:00
7315af0304
restore /systemstatus page
...
All it needed was a new controller, and some small ui tweaks + re-adding to the menu. I put it in Settings » Status where I believe it belongs.
2017-03-08 14:46:33 +01:00
f8bf67792c
Re-enable record line in feature
...
I did a quick check and added a show, ecasound is also still being installed, I see no further reason why this should not work but we will need to get some real tests done to be sure.
Fixes #42
2017-03-06 17:51:19 +01:00
6e03863fa1
Problem: Billing is always on
...
Solution: Make billing configurable through LIBRETIME_ENABLE_BILLING and deactivate it
This should catch all the changes needed to deactive billing in LibreTime.
* [x] only call billing when it is enabled
* [x] let super admins edit their info
* [x] dont link to billing if it is disabled
2017-03-03 15:34:54 +01:00
7b04f413a0
Remove zend dep check from status and config output
...
It's LibreTime's responsability to ensure this (ie in packages...) and the user should not need to know about this.
2017-03-02 14:31:51 +01:00
c5429df59c
Holiday promo update for billing page
2015-12-08 15:44:41 -05:00
3254be6f91
Added holiday offer blurb
2015-11-30 18:31:20 -05:00
819a882c31
Temporarily hide bandwidth usage and move it down in the page
2015-11-26 17:30:28 -05:00
21846be7ed
SAAS-1243: Bandwidth usage status on Listener Stats page
2015-11-26 13:25:44 -05:00
a2a30e5c42
Merge branch 'saas-dev' into saas-dev-facebook-radio
2015-11-24 11:22:18 -05:00
aabd1f3186
Updated stream qualities in pricing grid
2015-11-20 17:07:58 -05:00
e91eece092
Added podcast episode downloads to plans grid
2015-11-20 16:27:23 -05:00
641cfb9432
SAAS-1234 - bind station feed url to angular data model
2015-11-19 17:09:49 -05:00
7545c91ca4
SAAS-1181: Finalize the Facebook widget
2015-11-19 15:55:12 -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
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
eae8c7b638
Temporary fix to make enclosure urls iTunes compatible
2015-11-17 21:06:51 -05:00
1571887928
Change how station logo default is returned
2015-11-17 18:58:58 -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
f2fae3c67e
SAAS-1195 - fix calendar error; use baseurl in all internal links; css tweaks
2015-11-17 16:39:29 -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
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
5828361465
Display message on radio page if no podcast tracks have been published yet.
2015-11-16 15:28:54 -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
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
ae85c278ea
Remove a WIP label temporarily
2015-11-12 10:09:09 -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
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
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
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
866b88dbb2
Style tweaks to publishing and podcast dialogs
2015-11-04 15:16:29 -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
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
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
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
702ee97c7b
Refactored Facebook Widget stuff
2015-10-30 14:38:34 -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
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
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
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
e8980e7a79
Bugfixes and more work on station podcast frontend
2015-10-22 18:03:38 -04:00
3e97ee5d62
Localization and verbiage improvements for adding podcasts
2015-10-22 14:39:12 -04:00
23ccc268d1
Forgot to add station podcast phtml
2015-10-22 10:44:47 -04:00
6580c12ad3
Add station podcast privacy toggle
2015-10-21 17:30:24 -04:00
cb8c34c3d5
SAAS-1126: Make player widget localizable
2015-10-21 16:14:36 -04:00
92ffa955c3
SAAS-1081 - implement station podcast download counter that resets monthly
2015-10-21 12:54:50 -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
f441f2d385
SAAS-1136: Disk usage div overflows if your disk usage is over 100%
2015-10-20 16:57:31 -04:00
f79ca8650f
Unpaid invoice usability hint and invoice page style fix - SAAS-1134
2015-10-20 15:44:24 -04:00
885f47c20e
Better solution for upgrade problems (SAAS-1133)
2015-10-20 14:52:17 -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
c8069aaedd
Initial publishing fixes and tweaks
2015-10-19 13:42:27 -04:00
30d742af92
Added msising publish-dialog.phtml and fixed .gitignore file
2015-10-15 18:03:03 -04:00
9a03b1b50a
Force users to click OK in the language/timezone popup
2015-10-14 11:58:44 -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
2ee7e4bf71
SAAS-1088 - move 'All My Shows' checkbox to dropdown instead
2015-09-30 11:38:33 -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
c1a16d7973
Add filter string to generic Table object; add call to refetch podcast episode table data
2015-09-28 14:14:01 -04:00
ca51dcf3ae
SAAS-1071 - more work on backend podcast implementation
2015-09-24 12:58:02 -04:00
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
479153df17
Merge branch 'saas' into saas-dev
...
Conflicts:
airtime_mvc/public/css/billing.css
2015-09-21 18:01:56 -04:00
a21c4612c9
Renamed a podcast.js function for clarity
2015-09-21 17:59:31 -04:00
4115f4939e
Frontend tweaks
2015-09-21 15:37:57 -04:00
373ff55923
Frontend tweaks to podcasting + new abstract datatables functionality
2015-09-21 12:40:05 -04:00
0710accbe2
SAAS-1062 - more work on podcasting frontend
2015-09-18 18:29:50 -04:00
a6450353e5
Add missing phtml file
2015-09-18 15:52:54 -04:00
6de6e2767c
SAAS-1062 - Podcast skeleton work; slight rework to backend functionality
2015-09-18 15:39:12 -04:00
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
a810010448
Dropped percentage from educational discount
2015-09-18 14:01:30 -04:00
2cad7c1848
Added educational pricing page link
2015-09-18 13:59:55 -04:00
8308ce9cac
October promo banner
2015-09-17 15:38:00 -04:00
3d07260a9d
Small VAT checker bugfix
2015-09-17 15:17:18 -04:00
Robb Ebright
Robb Ebright
Lucas Bickel
Albert Santoni
drigato
Duncan Sommerville