428 Commits

Author SHA1 Message Date
vexorian
9f194e62c6 #18 Allowing to play audio files in channels. They actually play now, but requires editing the channel json manually because there is no UI to import them yet. 2021-01-23 13:03:53 -04:00
vexorian
f32a6d1397
Merge pull request #247 from vexorian/20210121_dev
Align 1.2.x into 1.3.x
2021-01-21 23:58:25 -04:00
vexorian
755cf3ada8 Merge branch 'dev/1.2.x' into dev/1.3.x 2021-01-21 23:56:46 -04:00
vexorian
6c88a9f414
Merge pull request #246 from vexorian/20210121_dev
Fix enabling watermark not always loading the defaults.
2021-01-21 23:55:43 -04:00
vexorian
027e9faaa8 Fix enabling watermark not always loading the defaults. 2021-01-21 23:54:19 -04:00
vexorian
b7b489791a
Merge pull request #245 from vexorian/20210121_dev
Tweaks to image upload . Now supports watermark as well. The api has changed. Dialog browses for Images.
2021-01-21 19:38:07 -04:00
vexorian
54a6f14ff6 Tweaks to image upload . Now supports watermark as well. The api has changed. Dialog browses for Images. 2021-01-21 19:36:17 -04:00
vexorian
15f3da9434
Merge pull request #244 from rafaelvieiras/ft/channel-logo-upload
Channel Logo Upload
2021-01-20 10:55:33 -04:00
Rafael Vieira
f69b23e10e Fixed images on readme.md for docker hub 2021-01-20 00:38:48 -03:00
Rafael Vieira
3bf63be768 Create a upload for channel logos 2021-01-20 00:30:46 -03:00
vexorian
e64dc93dca
Merge pull request #241 from vexorian/20210117_dev
20210117 dev
2021-01-17 16:34:31 -04:00
vexorian
d40831a019 Audio-only streams with /radio?channel=x endpoint 2021-01-17 16:19:45 -04:00
vexorian
1b264b48b2 Fix db-migration after merge 2021-01-17 16:15:11 -04:00
vexorian
1d502f212a Merge remote-tracking branch 'fork/dev/1.2.x' into dev/1.3.x 2021-01-17 16:14:27 -04:00
vexorian
a29c1ce8dc
Merge pull request #240 from vexorian/20210117_dev
20210117 dev
2021-01-17 16:12:12 -04:00
vexorian
c7703a2b77 Try to play error stream when offline stream fails 2021-01-17 16:10:05 -04:00
vexorian
4c3e8f8d83 Use correct input file indexes in offline filters. Fix white noise, beep sometimes not making a sound at all. 2021-01-17 16:10:05 -04:00
vexorian
c495a5ae36 Fix typo in logs. 2021-01-17 16:10:05 -04:00
vexorian
62cf02addf
Merge pull request #238 from vexorian/20210116_dev
Visual Update
2021-01-16 15:18:24 -04:00
vexorian
f6537bad61 Visual Update 2021-01-16 15:15:17 -04:00
vexorian
6da809a57f
Merge pull request #237 from rafaelvieiras/fix/direct-play
Fixed Direct Play with Transcoding
2021-01-16 15:12:56 -04:00
Rafael Vieira
f0ad76b76c Fixed Direct Play with Transcoding 2021-01-15 17:28:03 -03:00
vexorian
edbfce11e7
Merge pull request #235 from jasongdove/ffmpeg-deinterlace
add ffmpeg deinterlace options
2021-01-14 17:17:54 -04:00
Jason Dove
6696d626fc add ffmpeg deinterlace options 2021-01-14 13:18:11 -06:00
vexorian
c8109aaa71 Merge branch 'dev/1.2.x' into dev/1.3.x 2021-01-10 19:04:46 -04:00
vexorian
52af53eed9 Prepare 1.2.4 development 2021-01-10 19:01:59 -04:00
vexorian
41baddedba Update PR template to point to 1.3.x 2021-01-10 18:52:19 -04:00
vexorian
4d3998b5a6
Merge pull request #229 from rafaelvieiras/fix/web-errors
Improvements on Add Plex Server UX and fixed 'of null' common errors
2021-01-10 18:49:09 -04:00
vexorian
9755d11689 Prepare 1.3.0 development 2021-01-10 18:39:00 -04:00
Rafael Vieira
dfac30b4ce Improvement of UX with a Plex Authorization Modal 2021-01-10 18:50:47 -03:00
Rafael Vieira
73cc9fb772 Fixed browser errors on Plex configuration 2021-01-10 18:48:57 -03:00
Rafael Vieira
5f4ef4386d Removed unnecessary spaces on package.json 2021-01-10 18:44:18 -03:00
vexorian
3661aa9aba
Merge pull request #227 from vexorian/20200110_main
1.2.3
1.2.3
2021-01-10 14:06:59 -04:00
vexorian
d0ac96acf4 Merge branch 'edge' into main 2021-01-10 14:04:24 -04:00
vexorian
ee50957974
Merge pull request #226 from vexorian/20200110_edge
1.2.3
2021-01-10 14:01:46 -04:00
vexorian
526b18275b 1.2.3 2021-01-10 13:57:46 -04:00
vexorian
9169ec65e3 Merge remote-tracking branch 'dev/1.2.x' into edge 2021-01-10 13:56:44 -04:00
vexorian
90e45ee707
Merge pull request #225 from vexorian/20200110_dev
Ability to change the scaling algorithm and default is now bicubic instead of fast_bilinear. Related to #116
2021-01-10 13:50:03 -04:00
vexorian
17e565ee6f Ability to change the scaling algorithm and default is now bicubic instead of fast_bilinear. Related to #116 2021-01-10 13:48:04 -04:00
vexorian
59253cd9ca
Merge pull request #224 from vexorian/20210109_dev
#212 add CUID tag to channels in the m3u
2021-01-09 23:32:44 -04:00
vexorian
2ac71e5864 #212 add CUID tag to channels in the m3u 2021-01-09 23:29:48 -04:00
vexorian
c30f5713ba
Merge pull request #223 from vexorian/20210109_dev
#185 : animated watermark causes stream to lock when switching between videos.
2021-01-09 20:20:29 -04:00
vexorian
1a26be30d6 #185 : animated watermark causes stream to lock when switching between videos. 2021-01-09 20:18:26 -04:00
vexorian
5fc2f7a00f
Merge pull request #222 from vexorian/20210109_dev
20210109 dev
2021-01-09 18:29:47 -04:00
vexorian
de4a80d39f #221 Fix ghost ffmpeg processes 2021-01-09 18:26:48 -04:00
vexorian
86d1329b8c Fix bug introduced with #219 , it wasn't reading a normal ffmpeg process' output 2021-01-09 18:26:15 -04:00
vexorian
a1ca124c5a
Merge pull request #220 from vexorian/20210109_dev
20210109 dev
2021-01-09 10:09:29 -04:00
vexorian
a3b74e8af5 #219 Better ffmpeg version handling. 2021-01-09 10:08:49 -04:00
vexorian
7bea25db75 Prepare 1.2.3 development 2021-01-09 10:08:38 -04:00
vexorian
1989f5ca83 1.2.2 1.2.2 2020-11-22 21:51:49 -04:00