311 Commits

Author SHA1 Message Date
vexorian
cdc9ebceff Merge branch 'dev/1.1.x' into dev/1.2.x 2020-10-10 10:59:30 -04:00
vexorian
40a34d2bba
Merge pull request #159 from vexorian/20201010_dev
Update the favicon so that it (hopefully) looks less like ebay's colorful shopping bag that looks bizaringly a lot like a TV
2020-10-10 10:32:33 -04:00
vexorian
1d853d73f5 Update the favicon so that it (hopefully) looks less like ebay's colorful shopping bag that looks bizaringly a lot like a TV 2020-10-10 10:31:27 -04:00
vexorian
8c35d09895
Merge pull request #158 from vexorian/20201010_dev
20201010 dev
2020-10-10 09:35:02 -04:00
vexorian
70078c0140 Time Slots 2020-10-10 09:10:15 -04:00
vexorian
a827316723 Fix bufSize bug 2020-10-07 10:29:02 -04:00
vexorian
8ccbef998a
Merge pull request #156 from vexorian/20201006_dev
Channel resolution and bitrate settings.
2020-10-06 23:35:58 -04:00
vexorian
7aef9f21c7 Channel resolution and bitrate settings. 2020-10-06 23:33:29 -04:00
vexorian
5962022ef3
Merge pull request #155 from vexorian/20201005_dev
Fixerror when channels don't have the watermark enabled.
2020-10-05 18:39:20 -04:00
vexorian
3b5eb0475c Fix that crash when channels don't have the watermark enabled. 2020-10-05 18:36:44 -04:00
vexorian
31b1c4b9b1
Merge pull request #154 from vexorian/20201005_dev
FFMPEG channel editor tab. Channel watermark options.
2020-10-05 18:04:46 -04:00
vexorian
1067d03442 FFMPEG channel editor tab. Channel watermark options. 2020-10-05 18:03:20 -04:00
vexorian
de73640753
Merge pull request #152 from vexorian/20201004_dev
FF/REW channel tools
2020-10-04 00:19:21 -04:00
vexorian
35f0d814db FF/REW channel tools 2020-10-04 00:17:49 -04:00
vexorian
de04fa2c15
Merge pull request #151 from vexorian/20201004_dev
Channel tools can be changed. The editor will remember tools being open and their position. Some visual tweaks
2020-10-03 18:03:50 -04:00
vexorian
fa3cea0d52 Channel tools can be changed. The editor will remember tools being open and their position. Some visual tweaks 2020-10-03 18:01:03 -04:00
vexorian
0c5e54195f
Merge pull request #148 from TimeBomb/tools-button-polish
Polish styles for Tools buttons
2020-10-03 14:28:38 -04:00
Jason Baler
624de57ae9 Implement custom select into tools 2020-10-03 10:09:53 -07:00
vexorian
189deacba0
Merge pull request #150 from vexorian/20201003_dev
Flex tab for channel editor. Can change how flex time and short videos behave in the TV guide
2020-10-03 11:50:42 -04:00
vexorian
8077d7de53 Flex tab for channel editor. Can change how flex time and short videos behave in the TV guide 2020-10-03 11:44:27 -04:00
vexorian
0435787761
Merge pull request #149 from vexorian/20201003_dev
Flex tab in channel editor
2020-10-03 10:11:17 -04:00
vexorian
6cc0cce2d2 Flex tab in channel editor 2020-10-03 10:09:36 -04:00
Jason Baler
0378577fc6 Polish styles for Tools buttons 2020-10-02 22:27:03 -07:00
vexorian
398ee0e83f
Merge pull request #147 from vexorian/20201002_dev
Channel Editor Rework
2020-10-02 23:20:07 -04:00
vexorian
f719fc2a91 Channel Editor Rework 2020-10-02 23:18:47 -04:00
vexorian
23449b5021
Merge pull request #145 from vexorian/20200929_dev
Option  to limit the framerate of dizqueTV's output
2020-09-29 11:52:46 -04:00
vexorian
bd0ca01281 Option to limit the framerate of dizqueTV's output 2020-09-29 11:50:04 -04:00
vexorian
5a1db96837 Prepare 1.2.0 development 2020-09-28 20:07:58 -04:00
vexorian
715088ef0a
Merge pull request #143 from vexorian/20200926_dev
20200926 dev
2020-09-26 15:56:07 -04:00
vexorian
7a4c3bd709 Merge branch 'dev/1.0.x' into dev/1.1.x 2020-09-26 15:53:15 -04:00
vexorian
e9a269e1f2
Merge pull request #142 from vexorian/20200926_dev
20200926 dev
2020-09-26 15:05:24 -04:00
vexorian
435e151258 Phonetic pronuntiation to avoid confusion 2020-09-26 15:02:35 -04:00
vexorian
c5a3a0de89 Tweak default bitrates a bit. Clarify that they are in Kbps in Plex settings 2020-09-26 15:02:35 -04:00
vexorian
10e231adb1 Add explanations to EPG settings. 2020-09-26 15:02:35 -04:00
vexorian
c2a8bdc4c9 Fix xmltv writer crashing when a rating in the channel json is null for some reason (usually because of the python library) 2020-09-26 15:02:35 -04:00
vexorian
c114cab269 #110 expose url-tvg and x-tvg-url fields in m3u 2020-09-26 15:02:35 -04:00
vexorian
04107ab652
Merge pull request #140 from vexorian/20200926_dev
Fix anamorphic video (again), when audio is transcoded by plex but video is direct played. #127
2020-09-26 12:11:20 -04:00
vexorian
18bd87dcaf Fix anamorphic video (again), when audio is transcoded by plex but video is direct played. #127 2020-09-26 12:09:03 -04:00
vexorian
8ab7a29e02
Merge pull request #139 from vexorian/20200926_dev
Align dev/1.0.x into dev/1.1.x
2020-09-26 08:08:52 -04:00
vexorian
2557b78c6b Add limit to plex-library, it is now mandatory after the 1.0.x merge. 2020-09-26 08:05:52 -04:00
vexorian
c6454aa227 Merge branch 'dev/1.0.x' into dev/1.1.x 2020-09-26 08:05:17 -04:00
vexorian
c498223642
Merge pull request #138 from vexorian/20200926_dev
Fix #123. Deal with channel limits. Channel numbers 0-9999 allowed now
2020-09-26 07:53:13 -04:00
vexorian
a0693c934a Fix #123. Deal with channel limits. Tools and library will be limited to a maximum channel size 2020-09-26 07:46:47 -04:00
vexorian
df7200b20e
Merge pull request #136 from vexorian/20200924_dev
20200924 dev
2020-09-24 19:02:00 -04:00
vexorian
cd3012a042 Merge branch 'dev/1.0.x' into dev/1.1.x 2020-09-24 19:00:17 -04:00
vexorian
a9e0eb2014 Merge branch 'main' into dev/1.0.x 2020-09-24 18:57:39 -04:00
vexorian
0df7622a32 dizqueTV license 2020-09-24 18:49:41 -04:00
vexorian
837780fde9 Merge remote-tracking branch 'origin/master' into main 2020-09-24 18:12:39 -04:00
Dan Ferguson
665e71e24e
Create LICENSE 2020-09-24 17:02:41 -04:00
vexorian
c6fab8def4
Merge pull request #134 from vexorian/20200923_dev
20200923 dev
2020-09-23 19:17:38 -04:00