Commit Graph

15987 Commits

Author SHA1 Message Date
frecuencialibre b1d59aa58b
Merge pull request #607 from Robbt/smartblock-overflow
fixed allow repeat tracks smartblock so it doesn't overflow time limit and add overflow option
2018-12-11 14:29:20 -06:00
frecuencialibre c7b55f60e4
Merge branch 'master' into smartblock-overflow 2018-12-11 14:17:18 -06:00
frecuencialibre 5ab35dda18
Merge pull request #627 from Robbt/fix-show-criteria
Smartblock criteria show # of matches fixes #541
2018-12-10 14:31:23 -06:00
Robbt d6796ade97 changed wording on displayed message to be more understandable 2018-12-10 15:24:18 -05:00
Robbt bfe88efdf3 fixed grammar 2018-12-10 15:11:26 -05:00
Robbt 6bae72345f removed dangling else statement 2018-12-03 20:27:45 -05:00
vagrant 2ee85f0546 made mp3 bitrate test a range vs. exact number because of variation in results from different mutagen versions 2018-12-04 00:35:24 +00:00
Robbt acc9952794 removed dead code that was not being used 2018-12-03 16:51:39 -05:00
Robbt 618ca4a559 fixed update.phtml to simplify code and show properly on 0 case 2018-12-03 16:48:16 -05:00
Lucas Bickel 29266b0c0d
Merge pull request #630 from Robbt/fix-criteria-escape
removed php escape of characters that broke smartblocks
2018-12-03 22:04:29 +01:00
Robbt 9904b61eda removed php escape of characters that broke smartblocks 2018-12-02 10:39:29 -05:00
Robb 49a715bc98
Merge pull request #629 from paddatrapper/dos-line-endings
Convert line endings to unix from dos
2018-12-02 06:20:53 -05:00
Robb 83051aa647
Merge pull request #628 from paddatrapper/clean-cruft
Remove old cruft
2018-12-02 06:16:31 -05:00
Kyle Robbertze eeed9441e9 convert line endings to unix from dos 2018-12-01 21:57:49 +02:00
Kyle Robbertze bcb9f2f965 remove old cruft 2018-12-01 21:35:09 +02:00
Robbt 641ba717cf redid refactor to pluralize output 2018-12-01 09:42:02 -05:00
Robbt 3d3391bea7 adding part of previous PR that was mistakenly lost 2018-12-01 09:21:52 -05:00
Robb 5d9ec43a85
Merge pull request #625 from frecuencialibre/add-show-scrollbar
make add show dialogue scrollable. fixes #338
2018-11-30 20:17:42 -05:00
ryan b49465d3a3 make add show dialogue scrollable. fixes #338 2018-11-30 16:08:44 -06:00
Robbt 6b0e6312af removed the version restriction on mutagen to take advantage of bug fixes 2018-11-28 07:47:54 -05:00
Robb 634ac9c846
Merge pull request #616 from frecuencialibre/remove-record-section
remove "Record & Rebroadcast" section from show edit modal
2018-11-27 17:29:00 -05:00
ryan a7bad21b0e remove "Record & Rebroadcast" section from show edit modal 2018-11-27 16:20:40 -06:00
Robb dbd71266e6
Merge pull request #615 from frecuencialibre/autoloading-playlist-icon
add clock icon for autoloading playlists in calendar, remove empty show alert
2018-11-27 17:10:51 -05:00
ryan cc8783b780 restore recent changes that would have been overwritten 2018-11-27 15:59:12 -06:00
ryan 3bdb2949e7 add styles for autoloading playlists tootip 2018-11-27 15:54:22 -06:00
ryan 8ed8a8827c remove partially empty icons if show has autoloading playlist 2018-11-27 15:17:34 -06:00
ryan fe5b722c7f use clock icon to represent autoloading playlist 2018-11-27 15:07:56 -06:00
Robb 82c724a334
Merge pull request #613 from frecuencialibre/spanish-autoloading-playlists
spanish translation for Autoloading Playlist section
2018-11-27 14:37:01 -05:00
Robbt 008530364b Added jquery to hide or remove limit value 2018-11-26 15:26:19 -05:00
frecuencialibre 87ac92102b
Merge pull request #612 from frecuencialibre/repeat-until-full
make "Repeat Playlist Until Show is Full ?" string translatable
2018-11-26 13:37:39 -06:00
ryan 36755e4288 spanish translation for Autoloading Playlist section 2018-11-26 13:34:51 -06:00
ryan 9b7e039772 make "Repeat Playlist Until Show is Full ?" string translatable 2018-11-26 13:24:25 -06:00
Robb b351a42b4e
Merge pull request #611 from frecuencialibre/autoloading-playlists
"Autoloading" playlists UI changes. closes #560
2018-11-26 13:15:30 -05:00
frecuencialibre 6dc40b8688
Merge pull request #608 from nikmartin/docfixes
docs: fix typos, airtime to libretime, getting started, import script
2018-11-26 11:39:58 -06:00
ryan 5372014fd4 delete file accidentally added to autoloading UI PR 2018-11-26 11:27:17 -06:00
ryan cc112531b5 add styles for autoloading playlists tootip 2018-11-26 11:22:19 -06:00
ryan 76f46def18 add autoloading playlists help text to translation files 2018-11-26 11:16:53 -06:00
ryan d3604592ce rename to "autoloading playlists" in translation files 1 2018-11-26 11:03:00 -06:00
ryan 1b537919a6 rename to "autoloading playlists" in docs 2018-11-26 11:01:25 -06:00
ryan 0cf27e91e2 Rename "autoloading playlists", add help texts 2018-11-26 10:56:56 -06:00
Nik Martin aa8a331fcf cleanup garbage on import script page and add note about current state of script 2018-11-26 00:38:01 +00:00
Robbt 4f41b539b5 Made overflow tracks set checked simpler 2018-11-25 18:28:14 -05:00
Nik Martin 0db186321e remove reference to pop-up on Master Panel
replace main menu screenshot
add master panel screen shot
revert added line breaks
2018-11-25 22:20:22 +00:00
Lucas Bickel faa06b14bd
Merge pull request #609 from nikmartin/extrafiles
delete editor temp files
2018-11-25 23:13:35 +01:00
Nik Martin 62348073d5 delete editor tmp files 2018-11-25 21:50:48 +00:00
Nik Martin d3ba5d46b0 add LibreTime login screenshot 2018-11-25 21:45:20 +00:00
Robbt e7c7f215d5 Added the option to allow smartblocks to overflow their time limits to the UI 2018-11-25 13:16:26 -05:00
nik.martin 08147a3ae7 Replace Airtime with LibreTime
Line breaks at 120ish columns
Fixes checkbox 2 of #376
2018-11-25 13:15:05 -05:00
nik.martin 93658cb6e8 typos 2018-11-25 13:01:31 -05:00
Robbt 74cd668301 fixed repeating smartblock to not overflow time limit 2018-11-25 11:36:18 -05:00