Commit Graph

2158 Commits

Author SHA1 Message Date
Robb bc14230281
Merge pull request #716 from frecuencialibre/podcast-ui-2
Clarify podcast settings and workflow
2019-02-27 13:09:42 -05:00
r c903a6dfd3 Add missing translateable strings in js to php translation method 2019-02-25 10:59:14 -06:00
Robb f3b1133c3b
Merge pull request #742 from mikeopensauce/apistatus
Apistatus
2019-02-18 12:22:17 -05:00
Mike Cox 9e36dda855 Add new features to API on air call which shows the status of the two streams and whether they are switched to live output 2019-02-18 12:19:41 +00:00
Kyle Robbertze e13fc6b3d9
Merge pull request #734 from mikeopensauce/726apionairfix
Bugfix for #726. Fixes onAirLightAction returning 500 error
2019-02-17 18:45:10 +02:00
frecuencialibre 4d0fea34fc
Merge pull request #707 from Robbt/intro-playlist
Add Intro and Outro playlist to Autoloading Playlists
2019-02-14 10:49:15 -06:00
r eb4763c839 remove debug logging 2019-02-13 12:42:28 -06:00
Your Name 7f69b1adf1 Bugfix for #726. Fixes onAirLightAction returning 500 error 2019-02-10 09:58:10 +00:00
Robbt 1fe711f511 created new sql edition to avoid conflict with already merged 2019-02-04 09:52:17 -05:00
Robbt 8de94a670f trying different things for autoplaylist 2019-01-21 11:06:04 -05:00
Robbt f9a5da2ba3 intro playlist scaffolding in place but needs refinement to get working 2019-01-20 19:20:13 -05:00
Robbt 2b057472ca part of the way there towards grouping need to deal with OR value 2019-01-20 02:12:21 +00:00
Robbt e45349f390 removed not null constraint to avoid break upon upgrade of existing installs 2019-01-19 19:37:25 -05:00
Robbt a9ca4432f9 added upgrade and downgrade scripts 2019-01-13 00:02:07 -05:00
Lucas Bickel 08d2462730 📝 Remove outdated support docs 2019-01-02 20:28:27 +01:00
Robbt 79d5d98843 prevented shuffling from failing on playlists containing smartblocks 2018-12-23 07:08:35 -05:00
Robbt 2c3db00f12 removed the recaptcha 2018-12-18 08:35:17 -05:00
Robbt 1bf5fcc169 removed quote around column name 2018-12-12 09:44:52 -05:00
Robbt af441d4db4 added schema change to database controller 2018-12-11 21:40:09 -05:00
Lucas Bickel afa67eb96d 🔥 remove dead code 2018-10-06 21:18:44 +02:00
Lucas Bickel e6afd444a4
Merge pull request #393 from HammyHavoc/master
Changed 'System->Streams' to 'Settings->Streams'
2018-06-30 12:28:25 +02:00
Lucas Bickel 1c2aec95ea
Merge pull request #369 from rfb/feed-cors
Add CORS handling to podcast feed
2018-06-30 12:22:16 +02:00
Robb efe0aefddc
Merge pull request #433 from radiorabe/fix/429-ipv6-schema-updates
Fix/429 ipv6 schema updates
2018-02-10 16:34:23 -05:00
Robb 8d1da3bea5
Merge pull request #386 from radiorabe/fix/384-hard-upload-limit
Use max upload size from php config in frontend plupload js
2018-02-10 16:30:05 -05:00
Lucas Bickel 313342c297 Run schema update and add migration script 2018-02-03 16:43:10 +01:00
Lucas Bickel b7b581e6ec Merge remote-tracking branch 'robbt/fix/show_files_meet_criteria' into dev/merge-testing 2018-01-09 21:51:30 +01:00
Robb Ebright 927fcbc42d Pluralized file criteria, cleaned up CSS and removed dead code 2018-01-03 18:57:02 -05:00
Robb Ebright 0af56cc283 Added javascript text to localegenerator 2018-01-03 17:15:30 -05:00
Hammy Havoc 3c808aef45 Changed 'System->Streams' to 'Settings->Streams' 2018-01-02 01:01:57 +00:00
Lucas Bickel c342aef031 Use max upload size from php config in frontend plupload js 2017-12-26 13:14:01 +01: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
Xabi Spacebiker 2e47b00453 Fix missing translations 2017-09-27 10:13:44 +02:00
Robb Ebright 3515a898a7 Added option for Auto Smartblock and Playlist creation to preferences 2017-08-23 12:16:42 -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
Lucas Bickel 2ea19f20fe Re-assign files to first non deleted admin user 2017-05-22 00:20:02 +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 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
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 c12ad4ea4f added UI to toggle autoplaylist repeat option 2017-03-31 00:00:19 -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 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
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