Commit Graph

5649 Commits

Author SHA1 Message Date
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 4875bc37a8 Add missing argument to playlistNotFound call
Was on 2.5.x as 7dbf4cf5d2d37057e1f5ab72cb12ffcc5ddc1ccb
2017-03-03 15:34:21 +01:00
Lucas Bickel 8fbf4fec8b config to disable live chat
Problem: Live Chat points back to legacy upstream and I do not believe we can let them do support for us ;)

Solution: Deactivate live chat through constants.php so it never gets checked.

This is like 34db703381 but removes one more sql call and makes it easy to reactivate should anyone want to use the feature in future.
2017-03-03 15:33:19 +01:00
Lucas Bickel 10532dc4e8 Problem: Failed logins always try log in against legacy upstream
Solution: Make the login fallback optional and deactivate it in the default config.

I'm leaving the code in here mostly because I want to revisit it and make it modular so I can later on plug my own FreeIPA things :)
2017-03-03 15:32:31 +01:00
Lucas Bickel 898a1ce545 Let soudcloud fail gracefuly when unconfigured
This makes general preferences look nice again, even when no soundcloud id and secret is configured (those don't belong us).
2017-03-02 14:47:16 +01:00
Lucas Bickel 51960a891f Manual loading fix for more classes in Zend_ pseudo-ns 2017-03-02 14:40:29 +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
Lucas Bickel 4a7f3ea001 Fix preference page with customer ImageSize plugin
As noted in the code, this was getting loaded in a rather special way.
2017-03-02 14:29:19 +01:00
Lucas Bickel 021bf38c1b Remove phing StringHelper dependency
I had only really looked for requires previously, this one caught me off guard as using an include is quite anachronistic.

I did some digging and figured out, that this is the only occurence of such phing use I can find.
2017-03-02 13:25:50 +01:00
Lucas Bickel 21a319767f Fix missing AMQPConnection errors in setup
Also fixes them elsewhere, apart from having switched to a vendorized version, I also used one that is already namespaced.

The easy way out here is to use it in the namespaced fashion, it is only used in a few places and I know the library well enough to be certain that nothing much changed apart from the namespacing.
2017-03-02 12:38:44 +01:00
Lucas Bickel 1ca47d67d5 Use local configuration in tests
This way the tests should really run out of the box with what is described in TESTING.md.
2017-02-28 12:16:03 +01:00
Lucas Bickel 625f92fe44 Vendorize ZF1, fix PHPUnit and configure travis
This a a rather large commit due to the nature of the stuff it is touching. To get PHPUnit up and running again I had to update some deps and I did so by vendorizing them. The vendorizing of zf1 makes sense since distros are already considering to drop it from their repos.

* [x] install vendorized zf1 with composer
* [x] load composer autoloader before zf1
* [x] Implement headAction for all Zend_Rest_Controller based controllers
* [x] switch to yml dataset to get around string only limitations of xml sets (also removed warning in readme)
* [x] use year 2044 as hardcoded date for tests since it is in the future and has the same days like previously used 2016
* [x] make tests easier to run when accessing phpunit directly
* [x] clean up test helper to always use airtime.conf
* [x] switch test dbname to libretime_test
* [x] test db username password switched to libretime/libretime
* [x] install phpunit with composer in a clear version (make tests easier to reproduce on other platforms)
* [x] remove local libs from airtime repo (most of airtime_mvc/library was not needed of in vendor already)
* [x] configure composer autoloading and use it (also removed requires that are not needed anymore)
* [x] add LibreTime prefix for FileNotFoundException (phing had a similar class and these are all pre-namespace style)
* [x] add .travis.yml file
* [x] make etc and logdir configurable with LIBRETIME_CONF_DIR and LIBRETIME_LOG_DIR env (so travis can change it)
* [x] slight cleanup in config for travis not to fail
* [x] add cloud_storage.conf for during test runs
* [x] rewrite mvc testing docs and move them to docs/ folder
* [x] don't use `static::class` in a class that does not have a parent class, use `__CLASS__` instead.
* [x] don't use `<ClassName>::class`, since we already know what class we want `"<ClassName>"` ist just fine.
* [x] fix "can't use method in write context" errors on 5.4 (also helps the optimizer)
* [x] add build status badge on main README.md

Fixes https://github.com/LibreTime/libretime/issues/4

The PHP parts of https://github.com/LibreTime/libretime/pull/10 get obsoleted by this change and it will need rebasing.

This also contains https://github.com/LibreTime/libretime/pull/8, the late static binding compat code was broken for no reason and until CentOS drops php 5.4 there is no reason I'm aware of not to support it. I inlined #8 since the test would be failing on php 5.4 without the change.

If you want to run tests you need to run `composer install` in the root directory and then `cd airtime_mvc/tests && ../../vendor/bin/phpunit`. For the tests to run the user `libretime` needs to be allowed to create the `libretime_test` database. See `docs/TESTING.md` for more info on getting set up.
2017-02-27 17:59:01 +01:00
comiconomenclaturist 9017418b4e modified: airtime_mvc/application/forms/StreamSetting.php
modified:   install
2017-02-27 16:47:26 +00:00
Robb Ebright 276a69aa1b Porting commits from downloaded zip file of saas-dev branch 2017-02-13 18:22:22 +01:00
Albert Santoni db596d54b5 Fix bug in my last commit 2015-12-11 12:29:59 -05:00
Albert Santoni 2594105a5e Handle unknown plan types more gracefully with the bandwidth limit 2015-12-11 10:19:11 -05:00
Albert Santoni e3b0a93ebb Only suspend over bandwidth when station is active 2015-12-09 13:03:41 -05:00
Albert Santoni 09316041c6 Fix unnecessary HTTPS redirect to reduce traffic 2015-12-08 17:47:07 -05:00
Albert Santoni c5429df59c Holiday promo update for billing page 2015-12-08 15:44:41 -05:00
Albert Santoni 4cfdda46b4 SAAS-1266: Webstream metadata doesn't show in API or dashboard header 2015-12-03 16:57:18 -05:00
Duncan Sommerville 7edece1938 Remove station podcast from podcast table count 2015-12-02 12:25:04 -05:00
Albert Santoni 3254be6f91 Added holiday offer blurb 2015-11-30 18:31:20 -05:00
Duncan Sommerville 27df10cb5d Mute 'Waiting for Celery task' logging 2015-11-27 17:22:05 -05:00
Duncan Sommerville eff7cd2f07 Fix bug in podcast download 2015-11-27 16:48:44 -05:00
Duncan Sommerville 5eaf74bbd9 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-11-26 18:54:54 -05:00
Duncan Sommerville 042a9b1558 Fix bug creating track references 2015-11-26 18:54:49 -05:00
Albert Santoni 819a882c31 Temporarily hide bandwidth usage and move it down in the page 2015-11-26 17:30:28 -05:00
Duncan Sommerville 0f5233b32e Fix Celery callback URLs 2015-11-26 16:07:52 -05:00
Duncan Sommerville 17a03e088f SAAS-1244 - improve pending podcast episode sweeping; small bugfixes 2015-11-26 15:25:38 -05:00
drigato 21846be7ed SAAS-1243: Bandwidth usage status on Listener Stats page 2015-11-26 13:25:44 -05:00
Duncan Sommerville 786b357ed5 Add bandwidth limit for trial plan 2015-11-26 12:37:09 -05:00
Duncan Sommerville e68f6cadd6 Add bandwidth limits for awesome august plan levels 2015-11-26 12:31:59 -05:00
drigato 34eb7d6e22 Merge branch 'saas-dev' into saas-dev-bandwidth-limits 2015-11-26 11:30:03 -05:00
Duncan Sommerville a67ae0a5e4 Fix for Airtime bandwidth limit suspension code 2015-11-25 18:18:24 -05:00
Duncan Sommerville 0fc4f6c26f Fix Airtime bandwidth limit suspension code 2015-11-25 17:56:09 -05:00
Duncan Sommerville 24f488cac2 Fix typo in pref keys 2015-11-25 16:08:31 -05:00
Duncan Sommerville 3f241b2f25 SAAS-1229 - add default bandwidth limit values 2015-11-25 15:04:45 -05:00
Duncan Sommerville 82544f34d9 SAAS-1229, SAAS-1230 - initial implementation of station suspend when over bandwidth limit 2015-11-24 13:36:54 -05:00
drigato a2a30e5c42 Merge branch 'saas-dev' into saas-dev-facebook-radio 2015-11-24 11:22:18 -05:00
Duncan Sommerville 553299e9f5 Try to fix some schedule bugs 2015-11-23 14:55:37 -05:00
drigato 04167c103b Fix parameter name in api/bandwidth-usage 2015-11-23 11:37:08 -05:00
Duncan Sommerville bac1e553d9 SAAS-1229 - add comments in Preference and set update timer 2015-11-23 10:53:25 -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 2729998a16 Merge branch 'saas-dev' into saas-dev-bandwidth-limits 2015-11-19 17:10:07 -05:00
Duncan Sommerville 641cfb9432 SAAS-1234 - bind station feed url to angular data model 2015-11-19 17:09:49 -05:00
Duncan Sommerville 6c2d1f008b SAAS-1229 - initial work on bandwidth limit within Airtime; overhaul TaskFactory to get tasks reflectively 2015-11-19 16:08:25 -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
drigato ceafccd685 Hide podcast from radio page for hobbyist plans 2015-11-18 12:12:57 -05:00
Duncan Sommerville 9a8e80f74b Change station podcast RSS links back to https; style fix for menu in some browsers 2015-11-18 11:10:14 -05:00
Duncan Sommerville eae8c7b638 Temporary fix to make enclosure urls iTunes compatible 2015-11-17 21:06:51 -05:00
Albert Santoni ef87ad8a51 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing 2015-11-17 20:12:26 -05:00
Albert Santoni e915a4f1bb Added iTunes owner field for the station podcast 2015-11-17 20:12:22 -05:00
Duncan Sommerville ce7fdc2a85 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-17 19:51:46 -05:00
Duncan Sommerville 4828e82d2a Change download key parameter regex 2015-11-17 19:51:41 -05:00
Albert Santoni 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
Albert Santoni 47193403ea Added ATOM xmlns for iTunes support 2015-11-17 19:33:36 -05:00
Duncan Sommerville 6aafe25fd1 Change station RSS image title to match channel title 2015-11-17 19:28:52 -05:00
Duncan Sommerville 0d585e30db Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-17 18:59:03 -05:00
Duncan Sommerville 1571887928 Change how station logo default is returned 2015-11-17 18:58:58 -05:00
Albert Santoni 1ef9ee3073 Disable session starting for feeds controller 2015-11-17 18:55:53 -05:00
Albert Santoni c89941d312 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/Airtime into saas-dev-publishing 2015-11-17 18:34:06 -05:00
Albert Santoni 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
Duncan Sommerville e75d614537 Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-17 17:50:20 -05:00
Duncan Sommerville bdddd6f6ce Try to fix iTunes RSS compatibility 2015-11-17 17:50:16 -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 30c9c730be Bugfixes and itunes compatibility fix 2015-11-17 17:23:21 -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
Albert Santoni ef1a57459c Merge remote-tracking branch 'origin/saas-dev-publishing' into saas-dev-publishing 2015-11-17 16:18:57 -05:00
Albert Santoni ff96eba9ea Format podcast RSS XML with newlines 2015-11-17 16:18:38 -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
Duncan Sommerville 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
Duncan Sommerville 041adb5c1f Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-17 11:53:07 -05:00
Duncan Sommerville 2523391d4d Fix itunes duration format in station podcast xml 2015-11-17 11:53:02 -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
Albert Santoni 1a349c4ea1 Fixed non-trial suspension screen 2015-11-16 17:07:38 -05:00
Duncan Sommerville 7707378c2b Improve the publish service implementation 2015-11-16 16:18:29 -05:00
drigato 957d0aebf2 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-16 15:29:11 -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
Duncan Sommerville 2fb988a7cb CSS fix for nav menu at small resolutions 2015-11-16 15:28:28 -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