Commit Graph

1226 Commits

Author SHA1 Message Date
Robb Ebright f31236fe66 Fixed Override Javascript and Functionality 2017-03-14 23:03:37 -04:00
Robb Ebright 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
Robb Ebright 67ffd2d34a Making show and master source ports and mount points editable. 2017-03-14 01:15:14 +00:00
Lucas Bickel 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
Robb 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
Lucas Bickel 8823e76f5c Use PRODUCT_NAME in pro widgets 2017-03-12 15:30:58 +01:00
Lucas Bickel 260ebe2476 Fix listenerstat page
Deactivates the bandwidth limit stuff if none is configured.
2017-03-12 15:13:45 +01:00
Robb 2be8ef0f2b Merge pull request #55 from radiorabe/feature/autodj
Robbs AutoDJ
2017-03-11 18:41:08 -05:00
Lucas Bickel 2a53241ba3 Whitespace and deadcode nitpick 2017-03-10 16:27:46 +01:00
Robb Ebright 32a1a66378 Added AutoPlaylist Functionality to Show Scheduler enabling shows to have tracks added automatically. 2017-03-10 15:33:32 +01:00
Lucas Bickel 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
Lucas Bickel 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
Lucas Bickel 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
Lucas Bickel 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
Lucas Bickel 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
Lucas Bickel 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
Albert Santoni c5429df59c Holiday promo update for billing page 2015-12-08 15:44:41 -05:00
Albert Santoni 3254be6f91 Added holiday offer blurb 2015-11-30 18:31:20 -05:00
Albert Santoni 819a882c31 Temporarily hide bandwidth usage and move it down in the page 2015-11-26 17:30:28 -05:00
drigato 21846be7ed SAAS-1243: Bandwidth usage status on Listener Stats page 2015-11-26 13:25:44 -05:00
drigato a2a30e5c42 Merge branch 'saas-dev' into saas-dev-facebook-radio 2015-11-24 11:22:18 -05:00
Albert Santoni aabd1f3186 Updated stream qualities in pricing grid 2015-11-20 17:07:58 -05:00
Albert Santoni e91eece092 Added podcast episode downloads to plans grid 2015-11-20 16:27:23 -05:00
Duncan Sommerville 641cfb9432 SAAS-1234 - bind station feed url to angular data model 2015-11-19 17:09:49 -05:00
Albert Santoni 7545c91ca4 SAAS-1181: Finalize the Facebook widget 2015-11-19 15:55:12 -05:00
Albert Santoni 25c54ce974 Merge branch 'saas-dev' into saas-dev-facebook-radio 2015-11-19 15:09:29 -05:00
Duncan Sommerville c328515f4b SAAS-1135 - fix help button url for logged out users 2015-11-19 11:08:35 -05:00
Duncan Sommerville e4027c1e1f Sweep pending podcast episodes after an hour; css tweaks to My Podcast page 2015-11-18 16:20:29 -05:00
Duncan Sommerville 0efaf836b0 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-18 12:37:44 -05:00
Albert Santoni ba832ffe3a Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing 2015-11-18 12:38:22 -05:00
Albert Santoni 965a78c54a Merge branch 'saas-dev' into saas-dev-publishing
Conflicts:
	airtime_mvc/application/controllers/ApiController.php
2015-11-18 12:38:18 -05:00
Duncan Sommerville bdeb173b21 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-18 12:37:34 -05:00
Duncan Sommerville 9218d76de9 SAAS-1214 - add Connect with Soundcloud button; Fix nav styling in some browsers 2015-11-18 12:37:29 -05:00
drigato dc6c2893b4 Hide Soundcloud options from preferences for hobbyist plans 2015-11-18 12:31:31 -05:00
Duncan Sommerville eae8c7b638 Temporary fix to make enclosure urls iTunes compatible 2015-11-17 21:06:51 -05:00
Duncan Sommerville 1571887928 Change how station logo default is returned 2015-11-17 18:58:58 -05:00
Albert Santoni 4fd61cb088 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing 2015-11-17 17:34:33 -05:00
Albert Santoni c5d9dfd93d Restrict podcast hosting for some plans. Fixed error page colours. 2015-11-17 17:34:13 -05:00
Duncan Sommerville f2fae3c67e SAAS-1195 - fix calendar error; use baseurl in all internal links; css tweaks 2015-11-17 16:39:29 -05:00
drigato 031c4dca41 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-17 15:20:17 -05:00
drigato b268028e6a SAAS-1213: Fix Podcast privacy settings radio button layout 2015-11-17 15:20:05 -05:00
Duncan Sommerville 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
drigato b94164107f Podcast text overflow fix on radio page 2015-11-17 11:42:01 -05:00
Albert Santoni 9ddb33f2cd Fix up title scaling on Radio Page 2015-11-17 10:48:16 -05:00
Albert Santoni 8ba7a5dbe9 Use flexbox for the Radio Page player bar 2015-11-17 10:33:43 -05:00
drigato 5828361465 Display message on radio page if no podcast tracks have been published yet. 2015-11-16 15:28:54 -05:00
drigato f2ce22a1fa Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-16 14:40:46 -05:00
drigato c453afc6f1 Fix toggling player bar and podcast playback on radio page 2015-11-16 14:40:31 -05:00
Duncan Sommerville a34d74e7ce Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 14:23:16 -05:00
Duncan Sommerville 38d08a5661 SAAS-1208, SAAS-1209 - fix preferences and my podcast settings pages 2015-11-16 14:23:08 -05:00
drigato 16f252c2c8 Fix podcast title responsive layout on radio page 2015-11-16 14:16:10 -05:00
drigato ae02fa6260 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-16 12:36:11 -05:00
drigato 90ac6367e4 Improve podcast title on radio page 2015-11-16 12:35:50 -05:00
Duncan Sommerville 64f62b1994 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 12:07:59 -05:00
Duncan Sommerville 08f5aa51a6 CSS and display fixes 2015-11-16 12:07:53 -05:00
drigato 03e90cdd3f Fix podcast pagination highlighting on radio page 2015-11-16 11:44:06 -05:00
Duncan Sommerville 7569e936ce Merge branch 'saas-dev-publishing' into saas-dev-publishing-station-podcast 2015-11-13 15:59:57 -05:00
Duncan Sommerville 840f446e07 Disable publish button unless at least one source is checked 2015-11-13 15:59:34 -05:00
Duncan Sommerville 8e867b522c SAAS-1202 - move station podcast to top-level menu item 2015-11-13 14:57:32 -05:00
drigato 50c0bc2c28 Fix podcast current track title escaping on radio page 2015-11-13 09:51:57 -05:00
drigato d9d4ce884c Small radio page tweak 2015-11-13 09:02:33 -05:00
drigato 5b59fecae9 Fix radio page description button 2015-11-13 08:26:44 -05:00
drigato 778904fdb5 Radio page css fixes 2015-11-13 07:48:14 -05:00
Duncan Sommerville 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
drigato 9fc4e1c603 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-12 15:28:51 -05:00
drigato 9dae535768 Radio page jPlayer fixes 2015-11-12 15:28:40 -05:00
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