Mirrors/Dispatcharr
1
0
Fork 1
mirror of https://github.com/Dispatcharr/Dispatcharr.git synced 2026-07-22 09:37:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
1376 commits 23 branches 55 tags 68 MiB
Commit graph

1376 commits

This branch
This branch
All branches
Author SHA1 Message Date
dekzter
72542bf0fd default cidrs in network access form, added proxy settings to ui 2025-06-14 08:52:56 -04:00
SergeantPanda
fa3ee35d4d Prepopulate settings in database. 2025-06-13 14:51:56 -05:00
SergeantPanda
cfff51a9eb Add missing import. 2025-06-13 14:40:28 -05:00
SergeantPanda
c4a6b1469e Change to JSON settings 2025-06-13 14:36:08 -05:00
SergeantPanda
10cc9de31b Merge branch 'proxy-settings' of https://github.com/Dispatcharr/Dispatcharr into proxy-settings 2025-06-13 10:28:00 -05:00
SergeantPanda
8eec41cfbb Fixes a bug where heartbeat thread will exit if channel is in shutdown delay. 
This may also fix #129
 2025-06-13 10:27:51 -05:00
dekzter
c4c1b8a629 Merge remote-tracking branch 'origin/dev' into proxy-settings 2025-06-13 10:33:40 -04:00
SergeantPanda
1e9ab54609 Use new methods for getting settings. 2025-06-12 16:11:43 -05:00
SergeantPanda
2f91e0ce1c Properly populate default values. 2025-06-12 16:02:08 -05:00
SergeantPanda
b4ae6911c9 Pull settings from database 2025-06-12 15:42:26 -05:00
SergeantPanda
08c04e710a Merge branch 'main' of https://github.com/Dispatcharr/Dispatcharr into dev 2025-06-12 11:17:23 -05:00
SergeantPanda
a99a6431b2 More merge fixes. 2025-06-12 10:45:57 -05:00
SergeantPanda
ada1d51aaa Merge branch 'dev' of https://github.com/Dispatcharr/Dispatcharr into proxy-settings 2025-06-12 10:45:44 -05:00
SergeantPanda
59e4a28b31 Merge branch 'dev' of https://github.com/Dispatcharr/Dispatcharr into dev 2025-06-11 17:36:47 -05:00
SergeantPanda
1bf16355c1
Merge pull request #183 from Dispatcharr/ffmpeg-stats 
Ffmpeg stats
 2025-06-11 17:35:19 -05:00
SergeantPanda
34ceffb86a Merge branch 'ffmpeg-stats' of https://github.com/Dispatcharr/Dispatcharr into dev 2025-06-11 17:33:22 -05:00
SergeantPanda
bd53837f80 Better detection of input vs output stream information. 2025-06-11 17:20:27 -05:00
SergeantPanda
743cf4e297 Smarter parsing of ffmpeg stats output. 2025-06-11 16:55:14 -05:00
dekzter
1864b5d34c
Merge pull request #180 from Dispatcharr/user-management 
User and Access Management
 2025-06-11 08:39:59 -04:00
dekzter
30b2a19eb0 merged in main 2025-06-11 08:38:00 -04:00
dekzter
788667b687 better error checking, only warn for UI blocking 2025-06-11 08:24:32 -04:00
dekzter
e2e8b7088a Fixed bad merge conflict 2025-06-11 08:23:51 -04:00
SergeantPanda
a19f29b464
Merge pull request #177 from Dispatcharr/ffmpeg-stats 
Ffmpeg stats
 2025-06-10 21:26:16 -05:00
SergeantPanda
2add2c1dd2 Add new settings to database. 2025-06-10 21:23:04 -05:00
SergeantPanda
7812a410b3 Allow users to change proxy settings. 2025-06-10 21:17:30 -05:00
SergeantPanda
e753d9b9f8 Fixes a bug where stream profile name wouldn't update in stats. (Was outputting name string instead of ID 2025-06-10 19:16:52 -05:00
SergeantPanda
a2c7fc3046 [New feature] 
Switch streams when buffering is detected.
 2025-06-10 17:43:37 -05:00
SergeantPanda
2ec7d21bb9 Merge branch 'dev' of https://github.com/Dispatcharr/Dispatcharr into dev 2025-06-10 15:50:04 -05:00
SergeantPanda
d850166a80 Add conditional channel_group_id assignment in ChannelViewSet. This fixes an issue where if a group isn't assigned to a stream it would fail to create a channel from the stream. 
Closes #122
 2025-06-10 15:47:27 -05:00
SergeantPanda
4fc306620a
Merge pull request #167 from maluueu/fix/ip-geo_rate-limit 
core: api_views.py: add fallback IP geo provider
 2025-06-10 15:20:48 -05:00
SergeantPanda
11d3d7a15a Add case-insensitive attribute lookup for M3U parsing 2025-06-10 14:45:49 -05:00
SergeantPanda
ae01440a15 Better error messaging for unsupported codecs in the web player. Also don't block controls with error messages. 2025-06-10 13:58:34 -05:00
SergeantPanda
0a994bbe3f Merge branch 'ffmpeg-stats' of https://github.com/Dispatcharr/Dispatcharr into dev 2025-06-10 11:42:51 -05:00
SergeantPanda
62ac134359 Move stream type to after audio. 2025-06-10 11:38:52 -05:00
SergeantPanda
a56efa9ef5
Merge pull request #174 from Dispatcharr/ffmpeg-stats 
Ffmpeg stats
 2025-06-10 10:26:09 -05:00
SergeantPanda
3522066867 Changed some badge colors and added tooltips. 2025-06-10 10:17:28 -05:00
SergeantPanda
1f6f15ed73 Add stream type to stats page. 2025-06-10 10:10:05 -05:00
SergeantPanda
f869daa37c Add stream type for stream (HLS/MPEGTS, ETC) 2025-06-10 09:51:56 -05:00
SergeantPanda
b8992bde64 Add audio channels to stats page. 2025-06-10 09:23:43 -05:00
SergeantPanda
efaa64d00b Fix resolution not always parsing correctly. 2025-06-10 09:08:04 -05:00
dekzter
a1576bd493 merged in dev 2025-06-10 08:55:14 -04:00
dekzter
82f35d2aef check and warn before saving a network access setting that could block current client access 2025-06-10 08:46:36 -04:00
SergeantPanda
8acb31bbe8
Merge pull request #172 from Dispatcharr/ffmpeg-stats 
Ffmpeg stats
 2025-06-09 20:02:42 -05:00
SergeantPanda
cd47e76245 Add FFmpeg speed display and audio codec to channel card 2025-06-09 19:56:37 -05:00
SergeantPanda
0fed65a478 Add FFmpeg speed and audio codec information to channel details 2025-06-09 19:55:10 -05:00
SergeantPanda
677fbba1ac FFmpeg stats added to channel card. 2025-06-09 19:42:58 -05:00
SergeantPanda
71079aead3 Add ffmpeg stats to channel status api. 2025-06-09 19:36:27 -05:00
SergeantPanda
47500daafa Moved some functions to channel_service 2025-06-09 19:10:52 -05:00
SergeantPanda
7e25be0717 Store video and audio information in redis. 2025-06-09 18:57:36 -05:00
SergeantPanda
7d0c32ef3f Break line breaking for stats. 2025-06-09 17:45:00 -05:00