Commit graph

15851 commits

Author SHA1 Message Date
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
mikeopensauce
fd97b5744a
Merge pull request #1 from LibreTime/master
catch up to main repo
2019-02-16 11:28:55 +00: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
frecuencialibre
9d9b47004d
Merge pull request #731 from Robbt/change-default-library-sort
added uploaded and genre column, removed album and sorted by uploaded to default library view
2019-02-11 10:24:33 -06: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
frecuencialibre
008631cb3a
Merge pull request #728 from Robbt/podcast-import-file-fix
fix podcast non audio enclosure problem
2019-02-08 16:53:19 -06:00
Robbt
c92bb14799 added Genre and removed Album as an decision about what to prioritize for new users 2019-02-08 10:50:18 -05:00
Robbt
ff5998417f added Uploaded column to default library view and sorted by newest track 2019-02-08 10:30:52 -05:00
Robb
1cb6e09075
Merge pull request #351 from celianvdb/patch-1
Backup script
2019-02-08 09:20:33 -05: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
71315cf925 added missing fields to test array 2019-02-04 10:15:47 -05:00
Robbt
1fe711f511 created new sql edition to avoid conflict with already merged 2019-02-04 09:52:17 -05:00
Robbt
8e70199f16 Merge branch 'tests/block_test' of https://github.com/robbt/libretime into fix-smartblock-multi-criteria 2019-02-04 09:44:57 -05:00
r
b532fe564e clarify smartblock OR vs AND 2019-02-03 16:16:47 -06:00
Kyle Robbertze
a92c75023c
Merge pull request #720 from greenjon/master
change "Airtime" to "Libretime" except where it refers to code.
2019-01-24 14:53:15 +02:00
greenjon
371ccd6b9d change "Airtime" to "Libretime" except where it refers to code.
Remove some references to things that don't exist (watched folders, for example).
Fixed a typo or two.
2019-01-23 19:09:34 -08:00
Robb
4b672f742b
Merge pull request #718 from greenjon/master
change "Airtime" to "Libretime" except where it refers to code.
2019-01-23 06:45:28 -05:00
greenjon
126288af6e change "Airtime" to "Libretime" except where it refers to code. 2019-01-22 22:48:52 -08: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
Robb
ccdd447ddc
Merge pull request #712 from paddatrapper/vagrant-doc
Fix vagrant libvirt instructions
2019-01-22 07:52:34 -05:00
Kyle Robbertze
cf6b7ffd25 Fix vagrant libvirt instructions 2019-01-22 14:13:30 +02: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
Lucas Bickel
70c66e75eb
Merge pull request #710 from paddatrapper/docs
Update help doc
2019-01-21 12:28:10 +01:00
Kyle Robbertze
d6d28df9a7 update help doc 2019-01-21 11:21:02 +02: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
6b00c15439 removed idea files 2019-01-20 19:55: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
Robb
e84a980492
Merge pull request #705 from radiorabe/chore/show-settings-menu-for-all-users
Make Settings menu visible to all users
2019-01-20 15:08:14 -05:00
Robbt
6631dd994f working with start form 2019-01-20 14:12:52 -05:00
Kyle Robbertze
1a7eed1412
Merge pull request #706 from radiorabe/chore/cleanup-aac
Cleanup aac code
2019-01-20 19:16:52 +02:00
Lucas Bickel
a526a59ef4 ♻️ cleanup aac code
Removes unsupported codecs from our liquidsoap code
2019-01-20 15:37:21 +01: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