Commit Graph

5905 Commits

Author SHA1 Message Date
Robbt 8a7d6f805d Merge branch 'podcastservice-fix' of https://github.com/ciaby/libretime into ciaby-podcastservice-fix 2019-02-27 13:10:43 -05:00
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
r b6e554edfe include gemerated smartblock/playlist name in success message 2019-02-23 01:55:38 -06:00
frecuencialibre 53907e7c20
Merge pull request #748 from xabispacebiker/podcast-interface-fix
Podcast interface fix
2019-02-22 23:17:52 -06:00
Xabi Spacebiker 5abeb95ab7
Update station.phtml 2019-02-22 13:04:08 +01:00
Kyle Robbertze 2cda6fa8aa
Merge pull request #745 from Robbt/fix-null-autoloading-playlist
fixed autoloading playlist to avoid errors when trying to schedule empty playlist
2019-02-19 14:56:38 +02:00
Robbt 7d1acab7b6 fixed autoloading playlist to avoid errors when trying to schedule empty playlist 2019-02-19 07:49:11 -05:00
Kyle Robbertze 978a5865e5
Merge pull request #744 from Robbt/fix-count-warning-in-schedule
Fix count warning in schedule
2019-02-19 12:28:19 +02:00
Robbt 48a2a49b30 this fixes a count warning in null condition new with 7.2 2019-02-18 18:53:51 -05: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
Robbt 1bdd27077c add audio/flac to mimetype in filedatahelper 2019-02-15 16:25:51 -05: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
Lucas Bickel cc1f3c62e6 📦 (mvc) switch to zf1s zf1 2019-02-11 16:44:03 -05:00
Your Name 7f69b1adf1 Bugfix for #726. Fixes onAirLightAction returning 500 error 2019-02-10 09:58:10 +00:00
Robb 17e12f023d
Merge pull request #715 from frecuencialibre/user-settings
masterpanel ui tweaks
2019-02-09 11:41:17 -05:00
Robb a4d0fcd8f3
Merge pull request #704 from Robbt/fix-smartblock-multi-criteria
Fix smartblock multi criteria
2019-02-09 11:22:29 -05:00
Robbt 6f7c2f2cc9 refactored autoplaylist and updated showinstance to make sequential adds possible 2019-02-09 10:58:00 -05:00
r fcbe097f83 Revert "remove red logout button from left sidebar"
This reverts commit aa6ac77491.
2019-02-08 16:58:06 -06:00
Robbt a832440e0a added an end condition for the exit loop if it didnt succeed in finding an audio file it continues 2019-02-07 23:45:45 -05:00
Robbt d8eeb9a0f9 did additional checking before attempting to process non-audio items as array 2019-02-07 23:33:48 -05:00
Robbt 55bc9d3a46 modified podcast to search for audio enclosure if it finds a non-audio enclosure 2019-02-04 23:45:42 -05:00
r c083cfb2be Merge branch 'fix-smartblock-multi-criteria' of github.com:Robbt/libretime into fix-smartblock-multi-criteria 2019-02-04 14:18:20 -06:00
r 3f43c9abb5 group smartblock search criteria fields to accurately reflect query 2019-02-04 14:18:02 -06:00
Robbt b09c175a25 removed code and database change that was not being used to avoid future confusion 2019-02-04 11:57:13 -05:00
Robbt 1fe711f511 created new sql edition to avoid conflict with already merged 2019-02-04 09:52:17 -05:00
r b532fe564e clarify smartblock OR vs AND 2019-02-03 16:16:47 -06:00
ryan 42c1731273 Improve general settings labels 2019-01-22 19:54:34 -06:00
ryan aadc254c88 remove individual podcast "overwrite" checkbox, improve layout 2019-01-22 19:06:41 -06:00
ryan aa6ac77491 remove red logout button from left sidebar 2019-01-22 17:45:31 -06:00
ryan 80d4801d0f restore account name and logout in header, remove timezone, simplify 2019-01-22 17:42:35 -06:00
Lucas Bickel ea3b87085e
Merge pull request #711 from Robbt/fix-playlist-remaining-time-block
passed $show variable when smartblock added via playlist
2019-01-21 22:20:10 +01:00
frecuencialibre c26e15fd70
Merge pull request #659 from Robbt/podcast-metadata-override
added track title and artist override for podcasts
2019-01-21 14:09:39 -06:00
Robbt 1d994f5daf passed $show variable when smartblock added via playlist 2019-01-21 11:07:16 -05:00
Robbt 8de94a670f trying different things for autoplaylist 2019-01-21 11:06:04 -05:00
Robbt eb2d463672 Merge branch 'master' of https://github.com/LibreTime/libretime into fix-smartblock-multi-criteria 2019-01-20 19:56:21 -05:00
Robbt f9a5da2ba3 intro playlist scaffolding in place but needs refinement to get working 2019-01-20 19:20:13 -05:00
Robb 17e69cf0fa
Merge pull request #670 from radiorabe/dev/zf1s
Use zf1s packages to gain php 7.2 compatibility
2019-01-20 16:21:28 -05:00
Robbt 6631dd994f working with start form 2019-01-20 14:12:52 -05:00
Robbt eff7a19409 further work on groupval 2019-01-20 09:04:46 -05:00
Lucas Bickel 287cd28546 🐛 Make Settings menu visible to all users 2019-01-20 14:52:50 +01:00
Lucas Bickel 54b1a70249 📦 (mvc) switch to zf1s zf1 2019-01-20 14:46:33 +01:00
Robbt d03aa5bd86 starting on startForm to maintain criteria grouping during reload 2019-01-19 22:05:31 -05:00
Robbt 8095f6e627 Enable smartblocks with same criteria to stay separate if created with new criteria 2019-01-19 21:41:00 -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 1e7a8dce8c started along route of using extra to group modifiers 2019-01-19 19:27:24 -05:00