Commit Graph

7894 Commits

Author SHA1 Message Date
Robb Ebright 7584f07d48 fixed icon 2017-12-20 08:52:33 -05:00
Robb Ebright 703a0e8b9b Merge branch 'fix/display-autoplaylist-on-calendar' of https://github.com/Robbt/libretime into Robbt-fix/display-autoplaylist-on-calendar 2017-12-17 11:26:25 -05:00
Robb Ebright ee86112898 Removed debug code and rewrote SQL as ORM query and readded icon image file 2017-12-17 10:47:38 -05:00
miles75 0a4406fc6b Hungarian translation. New translations and error corrections. 2017-12-10 12:44:17 +01:00
Robb Ebright a294d66383 adding autoplaylist icon 2017-11-29 07:15:40 -05:00
Robb Ebright 01ec7ce797 inital attempt to add autoplaylist icon to calendar 2017-11-29 07:15:40 -05:00
Robb Ebright 91906e5b5d Moved files that meet criteria to top of track listing 2017-11-26 14:48:41 -05:00
Ryan Barber 62a85bbe77 Add CORS handling to podcast feed 2017-11-24 22:44:01 -08:00
Robb Ebright 6bdb570338 Modified smartblock form to allow preview of tracks meeting criteria for dynamic smartblocks 2017-11-21 21:22:06 -05:00
Robb Ebright bab3c235dc point to install file with hardcoded values to avoid broken setup 2017-11-16 22:02:30 -05:00
Lucas Bickel d356b754df
Merge pull request #359 from jerry924/issue350_advsearch_calendermode
issue 350 - change z-index to allow advanced search in calendar mode
2017-11-16 21:10:18 +01:00
Lucas Bickel e6238fed16
Merge pull request #358 from jerry924/issue349_previewseek
issue 349 - add missing code to allow preview seek
2017-11-16 21:07:55 +01:00
Jerry Russell fadefaa1bc issue 350 - change z-index to allow advanced search of library while editing a show from calendar 2017-11-16 00:55:50 +00:00
Jerry Russell 542c60c30b issue 349 - add missing code to allow preview seek 2017-11-16 00:38:44 +00:00
Robb Ebright b89f159fe8 modified the database code to allow custom pgsql password 2017-11-13 15:03:15 -05:00
Robb Ebright d58468185c Made rabbitmq settings write to tempfile upon check to fix install bug 2017-11-13 11:42:58 -05:00
Robb Ebright a541d1397c Added months to date time units 2017-10-15 00:03:36 -04:00
Robb Ebright d314117a09 Added check to hide datetime select on existing forms without relative smartblocks 2017-10-14 23:51:18 -04:00
Robb Ebright 8807dbcbfb Added input validation and fixed between relative date validation 2017-10-14 23:15:47 -04:00
Robb Ebright 67807bb4b3 fixed blatant errors in jquery and php validation 2017-10-14 21:01:58 -04:00
Robb Ebright 311ecd393d working relative dates with drop down selects 2017-10-14 01:00:06 -04:00
Robb Ebright 6c6b33b553 fixed jquery javascript regarding datetime select dynamic modification 2017-10-13 18:54:04 -04:00
Xabi Spacebiker de7432934c Adding logout button 2017-10-01 17:13:15 +02:00
Xabi Spacebiker 8d23a91ac0 Fixing layout in styles.css 2017-09-30 15:56:34 +02:00
Xabi Spacebiker c62eff2913 Hide Radio Page Menu Link, it is useless and 2017-09-30 13:24:20 +02:00
Xabi Spacebiker adbcdc496b Styles css fixes 2017-09-30 13:06:07 +02:00
Lucas Bickel b5b24f3464 Merge pull request #309 from xabispacebiker/pypo-permission-fix
Pypo permission fix
2017-09-29 20:43:27 +02:00
Xabi Spacebiker ff7ef7cdf4 Fix comments 2017-09-29 15:55:33 +02:00
Xabi Spacebiker 81896723ca Interface improvements https://github.com/LibreTime/libretime/issues/313 2017-09-29 15:53:40 +02:00
Xabi Spacebiker e2d5e6934c Interface improvements https://github.com/LibreTime/libretime/issues/313 2017-09-29 15:53:27 +02:00
Xabi Spacebiker 2fd1e71620 Interface improvements https://github.com/LibreTime/libretime/issues/313 2017-09-29 15:50:50 +02:00
Xabi Spacebiker 715df8418f Update HTTPHelper.php 2017-09-29 12:21:13 +02:00
Xabi Spacebiker 418e46c5d8 Update HTTPHelper.php
We want getStationUrl to return a slash at the end, so we add it if missing
2017-09-28 11:23:32 +02:00
Xabi Spacebiker 90e91b1a55 Update Schedule.php
Removing double slash from $uri, not the solution of permission issue but it won't hurt. 
getStationUrl will always return a slash at the end, so we do not need to add it again in line 1033
2017-09-28 11:21:35 +02:00
Xabi Spacebiker 5256e43e27 Update airtime.po 2017-09-27 14:42:26 +02:00
Xabi Spacebiker 23c7579017 Fix spanish translations 2017-09-27 13:25:23 +02:00
Xabi Spacebiker 3e8d893f01 Fix missing translations 2017-09-27 10:15:38 +02:00
Xabi Spacebiker cda9f17163 Fix missing translations 2017-09-27 10:13:51 +02:00
Xabi Spacebiker 2e47b00453 Fix missing translations 2017-09-27 10:13:44 +02:00
Lucas Bickel 9739d64063 Merge pull request #294 from miles75/master
Hunagrian language. New translations and error corrections.
2017-09-17 11:17:18 +02:00
miles75 a58bdc3159 Hunagrian language. New translations and error corrections. 2017-09-14 20:28:46 +02:00
Lucas Bickel 440e8ce8c9 Fix legacy constructors
These go way back to php 4 and don't need to be like this for any
reason. Currently error handling is acting up when these throw an
error.
2017-09-08 19:53:29 +02:00
miles75 ef7742f9d0 Hungarian translation. New translations and error corrections. 2017-09-01 22:41:35 +02:00
miles a3130c6390 Hungarian translation 2017-09-01 18:25:26 +02:00
miles 07258a68c0 Hungarian translations 2017-08-31 16:06:29 +02:00
Robb Ebright c78979c19c work in progress - need to write rules to parse when to show vs hide datetime select and add it to value field 2017-08-24 10:27:13 -04:00
Robb Ebright 9dae48702f Added some basic javascript based checking to require album override to be enabled for auto smartblock to be enabled 2017-08-23 12:43:48 -04:00
Robb Ebright 3515a898a7 Added option for Auto Smartblock and Playlist creation to preferences 2017-08-23 12:16:42 -04:00
Robb Ebright aec0e348c4 Working code to auto generated Smartblock and Playlist for new Podcasts 2017-08-18 00:46:59 -04:00
Robb Ebright 6a11253ce3 added code to duplicate criteria and type for duplicate smartblock 2017-08-17 01:21:26 -04:00
Robb Ebright c6cfd97b1a started on duplicate smartblock functionality 2017-08-16 23:32:54 -04:00
Robb Ebright c630a69b89 Added ability to text input relative date times w/o validation 2017-08-16 20:05:02 -04:00
Robb Ebright 0b80a429b3 added comments to document smartblock functions and added new options to permit datetime based select fields 2017-08-16 14:55:48 -04:00
Robb Ebright 7b1d224c1a added another test to the block test block 2017-08-16 00:12:16 -04:00
Robb Ebright e3f52ad968 added a time unit to SmartBlockCriteria 2017-08-15 23:25:11 -04:00
Robb Ebright 919c77d8f1 adding block model data 2017-08-09 13:24:23 -04:00
Robb Ebright 505871865a adding cc_music_dir to fix dependency on cc_file 2017-08-09 13:16:23 -04:00
Robb Ebright 742928f1c2 Added a test to block to test criteria for smartblock refactoring 2017-08-08 15:14:43 -04:00
Lucas Bickel e31d5077ac Fix rebasing typo 2017-07-21 13:28:08 +02:00
Lucas Bickel fa2018a2c5 Simplify configuration file structure
This removes most of the legacy upstream config madness by not using
weird config files spread all over the place.

This isn't the solution to other config reading fragility issues, but
it does move the whole config back to the central airtime.conf file.
2017-07-21 13:15:28 +02:00
Robb 320b128ad8 Merge pull request #247 from radiorabe/fix/update-warning
Fix update warning
2017-07-18 22:21:33 -04:00
Lucas Bickel 04e2402276 Fix non default local CORS URL case
I cleaned up the CORSHandler code a bit more and also rewrote the
helper to use the framework to access the request properly and
took care of also grabbing the request schema from the server.
2017-07-18 20:39:53 +02:00
Lucas Bickel 9c5b769cf0 Fix update warning
I fixed the manual installer to ensure that the VERSION file ends up
in the right directory on install.

I also took care of the pre-release parts of the naggingness. It shows
no updates as long there is no stable release for the current version.
As soon as one is available it uses the orange update icon to alert the
user that an update would be in order since a stable version has been
released.
2017-07-17 21:15:51 +02:00
Lucas Bickel d6a5cbd02e Remove assert() from rest module bootstrap
Problem: assert() is Language construct in php 7 and not a function anymore. It also seems to behave silghtly differently with regards to what kind of side effects assertions are allowed to have. This leads to all of the rest endpoints being broken in php 7 since the assertion silently fails and the routes never really get added to the front controllers router.

Solution: Don't wrap the addRouter call in assert(). The way assert was being uses was rather unusual for php code this age. It was also mostly checking zf1 rather than guarding against errors in LibreTime itself.

The php manual clearly states "As a rule of thumb your code should always be able to work correctly if assertion checking is not activated." giving even more reason to ot wrap critical paths in assertions.

There are some other instances of `assert()` being used in non test code, those don't seem to have any negative effects on php7.
2017-06-07 17:33:23 +02:00
Lucas Bickel b1f840ee0f Only update timescale pref in db on change
The /Schedule/set-time-scale/format/json was being hit every time a new calendar page was displayed. The isn't good for performance reasons and also makes race conditions like #210 much more likely.

With this change the preference is only updated on the server when the GUI state changes because the user clicked on one of the "Day", "Week", or "Month" buttons.

This does not fix the locking issue completely, but it should help because the cc_prefs time-scale row in the database will get locked much less often. After applying this I wasn't able to reproduce #210 any more on an install with an extensive schedule.
2017-06-03 23:05:18 +02:00
Lucas Bickel 2ea19f20fe Re-assign files to first non deleted admin user 2017-05-22 00:20:02 +02:00
Lucas Bickel 3233ccd151 Remove dead code in user model 2017-05-22 00:10:38 +02:00
Lucas Bickel f9a19d9e27 Uses the minimized angular from public dir instead of cdn
This uses the available minimized version of angular instead of using the non minimized version from the google cdn.
2017-04-18 08:43:44 +02:00
Lucas Bickel fd6f3230ed Always return proper file size
Legacy upstream had a weird way of doing this that could lead to empty files being requested with a range header that did not match what was available on the server. I'm assuming this code used to work aroud some media-monitor feature that has been since refactored into analyzer which handles these cases properly.
2017-04-17 23:03:44 +02:00
Lucas Bickel 458d5254ac Remove legacy upstream name from defaultdata 2017-04-16 00:14:54 +02:00
Lucas Bickel 9807e78f72 Use json_encode if we need to return js and not json
Turns out the zf1 jsonHelper whas doing some weird stuff to the content-type header under the hood.
2017-04-09 12:40:35 +02:00
Lucas Bickel 5fcd60415c Change to check celery user instead of www-data 2017-04-07 11:46:23 +02:00
Robb 8f372f5610 Merge pull request #136 from radiorabe/feature/freeipa-auth
FreeIPA Auth Adaptor for LibreTime
2017-04-03 11:50:23 -04:00
Lucas Bickel af2ca7f9a0 Only grab ldap config from ini if it exists
This is a workaround to make updating easier for folks who do not re-install. A proper solution would get rid of most of the Config class and use something based on Zend_Config_Ini instead. It would also have some sensible defaults in the code and nor error when new values get added.
2017-04-03 13:46:28 +02:00
Lucas Bickel 516f98dfcf Report on airtime-celery service in status
Adds celery checks to /?config and /systemstatus for completeness' sake.

Fixes #138
2017-04-01 10:25:12 +02:00
Robb Ebright 8a92c80bcb Fixed autoplaylist repeat to fill show 2017-04-01 01:00:00 -04:00
Robb Ebright 8bd93e3f6d modifying the test database files to include autoplaylist_repeat column 2017-03-31 12:11:38 -04:00
Robb Ebright 1ff48a32cd added missing dn function 2017-03-31 11:46:39 -04:00
Robb Ebright 4489b68d48 now with propel database autogen changes 2017-03-31 11:29:23 -04:00
Robb Ebright 8e3076190c keep db changes in alpha.1 2017-03-31 11:17:26 -04:00
Robb Ebright b42dd20e09 Merge remote-tracking branch 'origin/master' into feature/repeat-autoplaylist-until-show-is-full 2017-03-31 11:12:17 -04:00
Robb Ebright c0363145f9 added db column to schema.xml 2017-03-31 10:55:20 -04:00
Lucas Bickel 367fb3ae76 Add missing config for tests
Since conf assumes the ldap stuff to exist it also needs to be in the tests :(
2017-03-31 14:26:29 +02:00
Lucas Bickel aa5bc06d74 FreeIPA Auth Adaptor for LibreTime
Allow delegating user authentication to FreeIPA rather than having it be checked against the database.
2017-03-31 14:16:31 +02:00
Robb Ebright c12ad4ea4f added UI to toggle autoplaylist repeat option 2017-03-31 00:00:19 -04:00
Robb Ebright 7a944ac9ce code change to repeat autoplaylists lacking UI option to enable/disable 2017-03-30 23:01:31 -04:00
Robb Ebright 0fdd6d8d57 sort autoplaylists alphabetically 2017-03-30 22:45:29 -04:00
comiconomenclaturist f42401a6ad modified: airtime_mvc/application/controllers/ApiController.php 2017-03-27 16:04:20 +02:00
Robb e73a2941fd Merge pull request #121 from radiorabe/feature/restore-recording-feature-part-2
Fix recording through ecasound
2017-03-26 00:19:49 -04:00
Robb Ebright 4b9a105a89 Merge branch 'feature/restore-recording-feature-part-2' of https://github.com/radiorabe/libretime into radiorabe-feature/restore-recording-feature-part-2 2017-03-26 00:04:09 -04:00
Robb d6b7a86048 Merge pull request #123 from radiorabe/feature/translatable-radio-page
Translatable radio page
2017-03-26 00:02:36 -04:00
Lucas Bickel 7ac24870ce Regenerate strings
This contains some more strings that where mostly already waiting on master or added in the last commit.
2017-03-24 17:28:17 +01:00
Lucas Bickel c2deb94c16 Make radio page translatable
This makes the radio page use the station default language if one is set. Previously the pages where not really getting translated.
2017-03-24 17:23:21 +01:00
Lucas Bickel 0274920d14 Restore datatables-library from server on login
When localStorage is empty we try getting the data from the server. This is a bit hacky since the ui uses a very old version of datatables.
2017-03-24 16:21:39 +01:00
Robb 3196603dde Merge pull request #118 from radiorabe/feature/pull-ru-from-zanata
Update ru and de i18n
2017-03-24 10:57:48 -04:00
Lucas Bickel b267036483 Fix recording through ecasound
This is part 2 of fixing ecasound recordings from line-in. Part 1 restored the User-Interface, part 2 takes care of getting to the point where ecasound gets started, records something and uploads it through rest when done. Part 3 will take care of making sure that the recorded file is mapped to the show and not just stored as a new track.

I refactored api_clients to not use urllib2 for posting multipart data since I was loosing my sanity over it and requests seems to have a modern approach to doing this compared to what api_clients was previously doing.
2017-03-24 15:15:37 +01:00
Lucas Bickel 01e7b31ccb Add missing string to localcontroller 2017-03-24 13:36:31 +01:00
Lucas Bickel ee81a73817 Run more unstranslated Strings through _() 2017-03-24 13:32:15 +01:00
Lucas Bickel eda331c4b2 Make .personal-block.solo fit i18n texts 2017-03-24 13:18:52 +01:00
Lucas Bickel da9aa991b3 Dont let menu overlap onto content 2017-03-24 00:08:45 +01:00
Lucas Bickel c3e2dda3c1 Translatable sub-menu 2017-03-23 23:53:47 +01:00
Lucas Bickel 314c105508 Proper translation rendering for main menu 2017-03-23 23:41:47 +01:00
Robb 62388f7a09 Merge pull request #117 from radiorabe/feature/logo-replacement-for-oops-page
Remove legacy upstream branding from oops page
2017-03-23 18:15:04 -04:00
Lucas Bickel caaa0c0e2a Fix locale generation for js dicts 2017-03-23 23:01:20 +01:00
Lucas Bickel 559fdd0659 Update ru and de i18n 2017-03-23 22:16:44 +01:00
Robb 69347f227f Merge pull request #106 from radiorabe/feature/hideable-scheduled-shows
Hideable Scheduled Shows tab
2017-03-23 14:57:05 -04:00
Lucas Bickel 4a7d5be735 Wider max-width for more browser compat 2017-03-23 14:12:58 +01:00
Lucas Bickel 81cf904ce0 Remove legacy upstream branding from oops page 2017-03-23 14:06:50 +01:00
Lucas Bickel 42e0d40e62 Make version comparision robust
This needed to take various git version into account as per https://github.com/LibreTime/libretime/pull/102#issuecomment-288707322.

It also had a bug where it would do the completely wrong thing with the currentParts array if a git commit-ish was treated as a version by mistake.
2017-03-23 13:49:44 +01:00
Lucas Bickel 01aef516e4 Merge pull request #109 from Robbt/fix/auto-playlist-validation
Fixing dependence upon hard-coded password in AutoPlaylist
2017-03-23 10:59:58 +01:00
Robb 920179318b Merge pull request #108 from radiorabe/feature/update-i18n-strings
Update i18n strings
2017-03-22 20:05:30 -04:00
Lucas Bickel 1fc1e6a199 Get rid of session use in auto playlist
The user object was triggering the creation of a user context that tried to grab something from the session. The later code never tried to use this due to the checkPerm flag.

I'm assuming the user model used to have a sane constructor w/o side effects in the times where this code had it's heyday.
2017-03-22 12:26:18 +01:00
Robb Ebright 934cad44b5 Fixing dependence upon hard-coded password by modifying playlist build to not require authentication 2017-03-21 15:02:31 -04:00
Lucas Bickel 57ce6390bb Update po files
Basically I switched to the dev_tools dir and ran "bash update_po_files.sh". A quick check with the german translation shows me that they have about the same amount of missing strings.
2017-03-21 19:11:55 +01:00
Lucas Bickel ca382aedda Rename initial show back to "Untitled Show"
This is mainly so we don't have to retranslate this and that it matches with playlists and smart blocks again.
2017-03-21 19:06:01 +01:00
Lucas Bickel 6e712b4b82 Hideable Scheduled Shows tab
Makes the first tab remoeable and the tracks page be full width after removing the last tab. You can press the "Dashboard" link to open it back up again.
2017-03-21 00:19:25 +01:00
Lucas Bickel 06a3ad0ed3 Re-implement version check
This makes LibreTime check its version against github releases and lets the user know when to update. It uses the red exclamation point when there is a patch release or if LibreTime is more than one major release ahead. The orange icon is used when LibreTime is on a git install, a single major update is available, or a pre-release version is installed. The green update icon gets used to signify that a new minor release is available. Finally the green checkmark will be used when you are on a stable release.
2017-03-20 20:36:46 +01:00
Lucas Bickel 81d3c3e2b8 Merge pull request #84 from Robbt/fix/live-stream-source
[WIP] Making show and master source ports and mount points editable.
2017-03-20 02:06:58 +01:00
Robb Ebright 56dc67fe71 Merge branch 'fix/live-stream-source' of https://github.com/Robbt/libretime into fix/live-stream-source 2017-03-19 12:03:12 -04:00
Robb Ebright eb3a1b1ed5 Added port number validation to livestream preferences 2017-03-19 12:02:45 -04:00
Lucas Bickel b93a0eccc6 Build form early and reactivate ajaxy replacing
This makes subform validation work for everything again. I also had to slightly unhack the corresponding js. It's still not very nice in that it still reloads even though ajax would have been enough but I could figure out why the mast source field was not getting the proper values (You can reproduce this by commenting the window.location.reload() in the js).
2017-03-19 12:35:58 +01:00
Robb 6ad3fd87cc Merge pull request #95 from radiorabe/feature/per-podcast-album-override
per podcast album override
2017-03-18 14:49:49 -04:00
Robb Ebright 91290b5e43 Fixing CSS for podcast override 2017-03-18 14:34:21 -04:00
Lucas Bickel 5684689a12 Make some room for text to fit line
In some resolutions the line-height was not adding up to be enough space.
2017-03-18 17:38:58 +01:00
Lucas Bickel 4527b63c7b General fixes for TLS
This was tested in airtime web and with integration of media-monitor and silan up and running. It might work for pypo but that needs testing.
2017-03-18 15:47:50 +01:00
Lucas Bickel 1310c44d75 Fix: add missing upgrade scripts 2017-03-18 11:46:30 +01:00
Lucas Bickel b36b1ea63c Get rid of var_export in logs
This has been bugging me since I first saw it. Dumping the whole object has no value at all, whats left should suffice.
2017-03-18 11:38:58 +01:00
Lucas Bickel 7f00182913 Allow 0 file_id in third_party_trackrefs
The previous constraint of NOT NULL made it impossible to create a placeholder entry for later downloading. This uses a 0 default instead of the constraint and downloading as well as the green checkbox work again.
2017-03-18 11:37:45 +01:00
Lucas Bickel e1cf27664b Cleanup dead code 2017-03-17 15:09:21 +01:00
Lucas Bickel e3879b42a3 Send per podcast album override flag to celery 2017-03-17 14:56:33 +01:00
Lucas Bickel d68c95b144 Add db up/downgrade script for album_override field 2017-03-17 14:36:28 +01:00
Lucas Bickel a2eb4b2297 Add album_override field for imported_podcasts 2017-03-17 11:52:03 +01:00
Lucas Bickel 033e816015 Edit form 2017-03-17 11:45:10 +01:00
Robb Ebright 9fe31a5923 minor code clean-up 2017-03-16 22:30:08 -04:00
Lucas Bickel 8a8c54c21f Remove redundant call to setDescription 2017-03-17 02:28:45 +01:00
Lucas Bickel ae4c9203e6 Refactor override preference
Properly defaults the preference to be true and always return a boolean value since that is what celery will be expecting.
2017-03-17 02:10:04 +01:00
Robb Ebright fefc53c000 basic podcast album override option in preferences 2017-03-16 16:48:31 -04:00
Robb Ebright 4c8f2ad435 fixed default and override URL settings and removed unused validation 2017-03-16 10:18:43 -04:00
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 44d3d46904 Merge pull request #80 from radiorabe/feature/reset-password-without-whmcs
Make password reset work for eveyone
2017-03-14 19:07:27 -04:00
Robb 3eaa999130 Merge pull request #81 from radiorabe/feature/email-from-header-config
Change default email sender
2017-03-14 00:06:30 -04:00
Robb Ebright 67ffd2d34a Making show and master source ports and mount points editable. 2017-03-14 01:15:14 +00:00
Robb Ebright 99a3150db5 changed default streamsetting to match the baseurl vs. out.airtime.pro 2017-03-13 20:37:51 +00:00
Lucas Bickel 88b3eb22a0 Change default email sender
The new noreply@ address is now libretime.org and the address gets moved to contants.php rather than being hardcoded in the email model.
2017-03-13 20:46:39 +01: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 f52f0e7ff0 Merge pull request #77 from radiorabe/feature/disable-google-tracking
Disable all google tracking per default
2017-03-13 14:50:26 -04:00
Lucas Bickel 38d4fdcdda Disable all google tracking per default 2017-03-13 17:30:05 +01:00
Robb Ebright ba9f7879a4 modified smart block to not exceed the time limits. 2017-03-12 22:36:36 -04:00
Robb a583d8fa1e Merge pull request #64 from radiorabe/feature/debian-and-experimental-centos
Vagrant Debian support (and experimental CentOS)
2017-03-12 21:42:37 -04: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
Robb c1251b4c1b Merge pull request #67 from radiorabe/feature/fix-saving-prefs
Problem: sad tape error when saving prefs w/o soundcloud config
2017-03-12 15:04:04 -04:00
Lucas Bickel 8823e76f5c Use PRODUCT_NAME in pro widgets 2017-03-12 15:30:58 +01:00
Lucas Bickel 8afdf2808d Fix sad tape error when saving prefs w/o soundcloud 2017-03-12 15:19:16 +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
Lucas Bickel c29285ae48 Vagrant Debian support (and experimental CentOS)
This changes the Vagrant setup to support multiple installations as multiple
boxes. In addition to Ubuntu Vagrant can now be used to install on Debian
as well as on CentOS.

I took the chance to clean up the .deb install a bit and backported analyzer
and celery to SysV proper so it runs there. Some of the distro specfics were
moved to the install script from the python setup scripts to acheive this.

For the CentOS support I added a rather involved OS prepare script. In the
long term this will be added to the preparing-the-server docs we already have.

I had to switch the default port to http-alt (8080). On CentOS 9080 is registered
for ocsp and getting it to work for apache without hacking SELinux is hard. I
think 8080 is the RFC way to go anyhow. If anyone want to override this it
should be rather easy using the --web-port arg and by hacking Vagrantfile.

The PyOpenSSL code has been refactored for all the distros that the Vagrantfile
now supports.

As far as my checks go, I tried this code with all the distros, uploaded a track
and downloaded a unicode and a ssl podcast and was able to listen to them
in each case.

In the experimental CentOS case, the UI is not up to spec since services
need to get scheduled through systemctl and the status overview (ie. on the /?config page)
do not work properly. They need to be as follows:

```
sudo systemctl start airtime-playout
sudo systemctl start airtime-liquidsoap
sudo systemctl start airtime_analyzer.service
sudo systemctl start airtime-celery.service
```
2017-03-12 13:42:22 +01:00
Robb ff83784864 Merge pull request #56 from radiorabe/feature/version-reporting
Harmonize version reporting in ui and api
2017-03-11 19:06:28 -05:00
Robb 2be8ef0f2b Merge pull request #55 from radiorabe/feature/autodj
Robbs AutoDJ
2017-03-11 18:41:08 -05:00
Robb c12f6c6f03 Merge pull request #61 from radiorabe/feature/default-stream-wording
Replace Airtime Pro wording
2017-03-11 17:48:50 -05:00
Lucas Bickel 1c1f7587a3 Fix _isTask method in taskmanager
The is_a fix from 09aea8b747 was not quite the way to go, with array_key_exists and class_implements implements the TaskManager finds all tasks again.
2017-03-11 22:49:05 +01:00
Lucas Bickel d8c663ef7a Change inline manual links
Fixes #59
2017-03-11 21:20:06 +01:00
Lucas Bickel 095ddaed38 Add new columns to schema.xml and regenerate sql 2017-03-10 21:18:50 +01:00
Lucas Bickel bd18caf69d Harmonize version reporting in ui and api
Everything should use the version from the VERSION file created by the installer like this.
2017-03-10 20:38:43 +01:00
Lucas Bickel c4541b7ce7 Replace Airtime Pro wording
Let's just call this "default" streaming for now. Fixes #31
2017-03-10 20:35:09 +01:00
Lucas Bickel 86ff6e8e12 Remove remainder of legacy doctrine code 2017-03-10 18:37:11 +01:00
Lucas Bickel 03c73065bf Add new fields to tests 2017-03-10 18:33:21 +01:00
Lucas Bickel 288473e4fc Run database upgrades when setting up tests 2017-03-10 18:27:11 +01:00
Lucas Bickel 2a53241ba3 Whitespace and deadcode nitpick 2017-03-10 16:27:46 +01:00
Lucas Bickel a7d25e1960 Register and reversion update, add downgrade 2017-03-10 15:49:36 +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 e3785e25f9 Merge pull request #52 from Robbt/fix-rabbitmq-ini-install
adding the default rabbitmq-analyzer.ini file to fix install script
2017-03-10 09:37:35 +01:00
Robb be00c68ed0 Merge pull request #45 from radiorabe/feature/remove-pref-cache-in-mvc
completely remove deactivated cache
2017-03-09 20:37:42 -05:00
Robb Ebright d46e961a5f adding the default rabbitmq-analyzer.ini file to fix install script 2017-03-09 15:57:11 -05:00
Robb 945998f836 Merge pull request #49 from radiorabe/feature/refactor-help-menu
Update naming and links in constants
2017-03-08 20:30:12 -05:00
Robb 0f909a9ec8 Merge pull request #48 from radiorabe/feature/systemstatus
re-implement /systemstatus
2017-03-08 20:29:12 -05:00
Lucas Bickel 779081f4e0 Debrand big gray from old error page 2017-03-08 16:47:07 +01:00
Lucas Bickel 8f27f6c8e3 Debrand favicon.ico as well 2017-03-08 16:45:40 +01:00
Lucas Bickel c8c3f89a4b quick and dirty logo debranding
I'm replacing them all with empty images under the assumption that we will want to re-add a new logo. This is just to ensure that we can release LibreTime without infringing upon the sourcefabric trademark for now.
2017-03-08 16:37:26 +01:00
Lucas Bickel 272c295974 Update naming and links in constants
This is to get the help section to look better and point to somewhere users can find us. It also takes care of /dashboard/about and maybe more.

Some of the links I'm adding are 404 as we have yet to write them, I'd rather link something we have under our control rather than legacy transifex or others.
2017-03-08 16:26:18 +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 21356d1894 completely remove deactivated cache
Cache handling has been disabled on saas-dev and 2.5.x at least for a while. This gets completely rid of it.

You should do caching on the byte-code level in PHP using the tool best fitting your needs and depending on the exact PHP version you are running this on.

Proper cache hygiene ist a routine part of maintenance and may need seperate addressing depending on the needs of your station.
2017-03-07 05:43:05 +01:00
Robb 7a32d5534d Merge pull request #43 from radiorabe/feature/record-line-in
Re-enable record line in feature
2017-03-06 18:45:54 -05:00
Robb 1279ce62d8 Merge pull request #37 from radiorabe/feature/no-sad-tape-for-facebook
Add empty default Facebook config
2017-03-06 18:34:03 -05:00
Robb d86e223c45 Merge pull request #28 from radiorabe/feature/robbt/podcast-naming
Podcast naming feature as per #26
2017-03-06 18:12:57 -05: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 e69bc9dc00 Merge pull request #41 from radiorabe/comiconomenclaturist/hw-output
Re-enable hw output
2017-03-06 13:14:15 +01:00
Lucas Bickel 9e05e91dde Add empty default Facebook config
This will get rid of the sad tape error on the facebook widgets page `/embeddablewidgets/facebook`. We will probably end up having to document how to set up facebook properly, but I'd like to take care of that while I'm testing against real facebook.
2017-03-05 14:13:01 +01:00
Lucas Bickel d374ab2b3b Fix call to get_author()
This was introduced by the zf1 mega commit 625f92fe44.

625f92fe44 (commitcomment-21156925)
2017-03-05 12:26:54 +01:00
Lucas Bickel bd7091ae59 Merge pull request #35 from Robbt/install_script_fixes
Added sample cloud_storage.conf to build dir and install script, chan…
2017-03-05 11:49:13 +01:00
Robb 0abfa7f018 Merge pull request #23 from radiorabe/feature/stop-using-reflection-inproduction-code
stop using reflection in production code
2017-03-04 22:25:34 -05:00
Robb 6085a8fd27 Merge pull request #22 from radiorabe/feature/use-zend-file-transfer-for-plupload
Use Zend_File_Transfer instead of $_FILES
2017-03-04 22:15:19 -05:00
Robb Ebright 86b1fcbf7c Added sample cloud_storage.conf to build dir and install script, changed production dir to symlink, added libretime ASCII art logo 2017-03-04 19:44:01 -05:00
Robb da1181e6ca Merge pull request #25 from radiorabe/feature/default-soundcloud-config
Add default soundcloud config
2017-03-04 17:56:17 -05:00
Lucas Bickel 7c86991c50 Merge pull request #11 from radiorabe/feature/disable-billing
Problem: Billing is always on
2017-03-04 16:10:50 +01:00
Lucas Bickel 01a954481c Merge pull request #10 from radiorabe/feature/config-rewrite-airtime-saas-folder
Rewrite config from /etc/airtime-saas to plain /etc/airtime
2017-03-04 15:56:29 +01:00
Lucas Bickel 96eb746f18 Merge pull request #9 from radiorabe/feature/missing-arg
Add missing argument to playlistNotFound call
2017-03-04 15:48:22 +01:00
Lucas Bickel e55b95cc3b Merge pull request #7 from radiorabe/feature/turn-off-live-chat-per-default
config to disable live chat
2017-03-04 15:48:00 +01:00
Robb Ebright 481c049c97 added passing podcast title to download function 2017-03-04 13:38:36 +01:00
Robb Ebright 2cebb7dfa2 first part of the adding album tags to podcast downloads 2017-03-04 13:38:36 +01:00
Lucas Bickel c7ab886d2a Add default soundcloud config 2017-03-04 12:33:37 +01:00
Lucas Bickel 0b704e95f1 Use Zend_File_Transfer instead of $_FILES
This should give us more information in the case of an error and is the framework idiomatic way to handle a RESTful file upload.

I'm hoping this helps debug https://github.com/LibreTime/libretime/issues/3
2017-03-04 11:09:06 +01:00
Lucas Bickel 09aea8b747 stop using reflection in prooduction code
Problem: Reflection is a debugging tool and not really meant for use on production. There are easier ways to check if a class implements an interface with `is_a()`.

Solution: Get rid of reflection use and switch to `is_a()` in TaskManager, refactor the Enum thing that does not make sense since it is not being used.

The `is_a()` solution is really straightforward and has been supported in php for ages.

The Enum thing was a copy paste hack from stackoverflow and ignored the simple solution mentioned there while not using the features of the advanced one.
2017-03-03 22:48:19 +01:00
Lucas Bickel e28ad471f9 Rewrite config from /etc/airtime-saas to plain /etc/airtime
This is the results of sed -i -e 's|/etc/airtime-saas/|/etc/airtime/|' `grep -irl 'airtime-saas' airtime_mvc/ python_apps/` :P

It might need more testing, the airtime-saas part never really made sense, zf1 has environments for that, ie you would create a saas env based on production for instance.

I beleive legacy upstream was using this to share configuration between customers (ie. analyser runs only once and writes to a shared S3 bucket). I assume they mount the airtime-saas folder onto individual customers instances with a global config. Like I said, I don't feel that this makes sense since all it does is make hacking at the configs in airtime-saas a bit easier. A serious SaaS operation should be using something like puppet or ansible to achieve this.
2017-03-03 15:57:41 +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 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 39fb738945 Always log locally during test run 2017-03-02 16:45:34 +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 693f1f6e51 Remove system zf1 from test include path 2017-03-02 13:57:56 +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 7f3f420763 Regression: travis db is on localhost
This is one of the "small" things I need to take care of on my local env. Once the value is changeable through more than just the config file, I'll won't be touching these in my docker envs as much.
2017-02-28 12:29:40 +01:00
Lucas Bickel 4936b16bc1 Load autoloader early so setup can use it
Also fixes a @include_once check that is now much easier.
2017-02-28 12:25:24 +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 68252a078b SAAS-1258: Long track titles hide play button and icon on radio page 2015-12-01 16:03:44 -05:00
Albert Santoni 3254be6f91 Added holiday offer blurb 2015-11-30 18:31:20 -05:00
Duncan Sommerville f857183247 Fix layout for disk quota error message 2015-11-30 13:13:06 -05:00
Duncan Sommerville b4b4cd265e SAAS-1236 - show duration text 2015-11-30 12:24:14 -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
Duncan Sommerville d4d152c670 Merge branch 'saas-dev' of github.com:sourcefabric/airtime into saas-dev 2015-11-23 07:55:23 -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 7f5e41c885 Add basic 403 handling to table.js 2015-11-20 13:41:23 -05:00
Duncan Sommerville f4e6c2dd7a Merge branch 'saas-dev' into saas-dev-bandwidth-limits 2015-11-20 11:49:20 -05:00
Duncan Sommerville fb3d83cc40 Change 'Learn about podcasts' link 2015-11-20 11:49:03 -05:00
Duncan Sommerville aa3d0ea7ae Merge branch 'saas-dev' into saas-dev-bandwidth-limits 2015-11-20 11:29:30 -05:00
Duncan Sommerville fff7ef371d Add fnDrawCallback to podcasts table to fix placeholder 2015-11-20 11:27:11 -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
Albert Santoni 6a668f79af Tighten up Radio Page CSS transitions 2015-11-17 11:42:08 -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
Duncan Sommerville 62a3251fb4 Style tweak for episode view dialog 2015-11-16 18:25:10 -05:00
Duncan Sommerville be7c60253b Disable publish button when finished publishing to selected source(s) 2015-11-16 17:27:51 -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
Duncan Sommerville 42e55f193c SAAS-1211 - fix columns in oColVis dropdown for My Podcast episode table 2015-11-16 15:54:20 -05:00
Duncan Sommerville 6d9859c025 SAAS-1210 - Fix broken link 2015-11-16 15:48:30 -05:00
Duncan Sommerville dc5e81ee9b Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 15:44:13 -05:00
Duncan Sommerville 43b1ce6520 Fix broken check for import status 2015-11-16 15:44:06 -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
Duncan Sommerville 28d378abfa Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 12:45:04 -05:00
Duncan Sommerville 130c5f570b Fix podcast table bug 2015-11-16 12:44:57 -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 08afb54f89 Merge branch 'saas-dev-publishing' of https://github.com/sourcefabric/Airtime into saas-dev-publishing 2015-11-16 11:44:30 -05:00
drigato 03e90cdd3f Fix podcast pagination highlighting on radio page 2015-11-16 11:44:06 -05:00
Duncan Sommerville 610d860d6a Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-16 11:36:24 -05:00
Duncan Sommerville 3010fa01fa Add processing div to podcast episodes table 2015-11-16 11:36:18 -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 1d8ebab147 Merge branch 'saas-dev-publishing' into saas-dev-publishing-station-podcast 2015-11-13 14:58:24 -05:00
Duncan Sommerville d0265367bf Add forgotten png file 2015-11-13 14:58:06 -05:00
Duncan Sommerville 8e867b522c SAAS-1202 - move station podcast to top-level menu item 2015-11-13 14:57:32 -05:00
Albert Santoni 591f7d59f0 Slightly better error handling for uploads 2015-11-13 10:53:47 -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 0514a5d789 Frontend tweaks + fixes 2015-11-12 19:29:55 -05:00
Duncan Sommerville 69109e171c Fix bad css 2015-11-12 19:03:32 -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
Duncan Sommerville 0e74229975 Fix bug where 'Add' dialog appends to the dom multiple times 2015-11-12 15:42:41 -05:00
Duncan Sommerville 5a573d3d9e Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-12 15:32:45 -05:00
Duncan Sommerville 607176276a Fix invalid reference bug 2015-11-12 15:32:38 -05:00
Duncan Sommerville 28e95d5c16 Add publish button to library table 2015-11-12 15:29:01 -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
Duncan Sommerville 0951afcbb3 SAAS-1188 - add empty placeholder for podcast episodes table 2015-11-12 14:14:42 -05:00
Duncan Sommerville 26c9a19836 Fix bug with import status of podcst episodes 2015-11-12 11:37:39 -05:00
Duncan Sommerville c7dcd4f00a Merge branch 'saas-dev-publishing' of github.com:sourcefabric/airtime into saas-dev-publishing 2015-11-12 10:27:03 -05:00
Duncan Sommerville 1b4ae9bb83 Quick fix for bug on calendar 2015-11-12 10:26:57 -05:00
Albert Santoni ae85c278ea Remove a WIP label temporarily 2015-11-12 10:09:09 -05:00
Duncan Sommerville 071de55329 Add some additional error handling and prevent disabled buttons from being triggered 2015-11-11 19:26:51 -05:00
Duncan Sommerville 8a5c25291e Lower poll interval for checking import status of podcast episodes 2015-11-11 18:52:12 -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 86b7dec6fb SAAS-1200 - remove context menu from schedule tracks dialog (calendar) 2015-11-11 17:07:24 -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 faeaf5450b SAAS-1203: Sort published tracks on radio page by publication date DESC 2015-11-11 15:35:07 -05:00
drigato 59cf6f6238 Radio page jPlayer fixes 2015-11-11 14:55:47 -05:00
Duncan Sommerville 5264bebe57 SAAS-1199 - stop user from dragging unimported podcast episodes 2015-11-11 11:16:02 -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
Albert Santoni f4e9328e57 Renamed View Podcasts to View Episodes 2015-11-10 10:57:56 -05:00
Duncan Sommerville f352b61707 Add prefixes for flex properties 2015-11-09 18:32:46 -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 1bc0f9e54b Fix small bugs in table.js 2015-11-09 13:59:36 -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 a7881b8941 SAAS-1165 - implement simple one-item drag and drop for podcast episodes table; still needs work 2015-11-06 17:47:46 -05:00
Duncan Sommerville 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
Albert Santoni 0e6e82a0c6 Fixed session start issue with new API 2015-11-06 13:04:33 -05:00
Albert Santoni e8a0ace018 Fixed up syntax error introduced by last commit 2015-11-06 12:57:35 -05:00
Albert Santoni 713a158bb3 Disable layout in recalculate-schedule API - XXXX-260 2015-11-06 12:50:47 -05:00
Albert Santoni 4a86544738 Skip non-files for XXXX-260 2015-11-06 12:50:30 -05:00
Albert Santoni 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
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 e496072541 Small css fix 2015-11-05 14:42:52 -05:00
drigato c476b69958 Add podcast icon to radio page 2015-11-05 14:41:31 -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