Commit graph

2734 commits

Author SHA1 Message Date
dekzter
412b799d7b new environment settings endpoint, added added in support for conditionally building video URL since we don't want dev env to proxy the stream through the react server 2025-03-05 11:08:04 -05:00
dekzter
ca676206a4 Merge branch 'main' into uwsgi 2025-03-05 08:33:52 -05:00
dekzter
5467041606 reverted latest changes, re-added back in logic for proper profile lock as well as determining available profiles - no mutli-stream channel support yet 2025-03-05 08:33:24 -05:00
dekzter
59f8ec033c init npm / node on dev environment setup, run npm server (need to make this configurable), more init items for dispatcharr 2025-03-05 08:33:12 -05:00
dekzter
6b0becce62 first attempt to switch to uwsgi 2025-03-04 20:02:40 -05:00
SergeantPanda
f1f8b3d6ce Merge branch 'main' of https://github.com/Dispatcharr/Dispatcharr 2025-03-04 13:25:45 -06:00
SergeantPanda
853f7834ec Merge branch 'main' of https://github.com/Dispatcharr/Dispatcharr into Proxy 2025-03-04 13:11:28 -06:00
SergeantPanda
f976a045a9 Closes channel when no clients are connected. 2025-03-04 12:09:08 -06:00
SergeantPanda
3b3e5f7b52 Waits for api to return status until stream is running. 2025-03-04 12:03:09 -06:00
SergeantPanda
0750b7dd80 Fixes CRSF issues. 2025-03-04 11:38:01 -06:00
SergeantPanda
5e5f087013 Fixes clients not disconnecting. 2025-03-04 11:08:12 -06:00
SergeantPanda
d7652080c3 Updated views 2025-03-04 10:57:19 -06:00
SergeantPanda
4b349d1051 Updated urls and views to allow for initializing the channels. 2025-03-04 10:13:54 -06:00
dekzter
6681b57a63 fixed entrypoint for dev 2025-03-04 11:06:29 -05:00
dekzter
3cca3a22f6 fixed lock identifier to applly only to profile and index, not channel and stream 2025-03-04 11:00:39 -05:00
SergeantPanda
15c277e0d4 Reordered and cleaned up urls. 2025-03-04 09:28:07 -06:00
SergeantPanda
aa74d5a9fd Adds an extra redirect. 2025-03-04 09:19:38 -06:00
SergeantPanda
8a20258ad5 Merge branch 'main' of https://github.com/Dispatcharr/Dispatcharr into Proxy 2025-03-04 08:53:42 -06:00
dekzter
c0635ade23 removed hardcoded local IP that was used for testing 2025-03-04 09:34:36 -05:00
SergeantPanda
32462672bd Merge branch 'main' of https://github.com/SergeantPanda/Dispatcharr into Proxy 2025-03-04 08:13:27 -06:00
SergeantPanda
93a359f141 Merge branch 'main' of https://github.com/Dispatcharr/Dispatcharr 2025-03-04 08:09:55 -06:00
SergeantPanda
53f3c07076 Merge branch 'main' of https://github.com/SergeantPanda/Dispatcharr 2025-03-04 08:09:45 -06:00
SergeantPanda
b8884c851b Don't sync custom AIO 2025-03-04 08:09:41 -06:00
dekzter
b8b58d29bd removed extra requirements files 2025-03-04 08:53:42 -05:00
dekzter
d1954638f6
Merge pull request #14 from SergeantPanda/main
Fixes manage commands not working
2025-03-04 08:52:53 -05:00
dekzter
6cf535b5a0
Merge branch 'main' into main 2025-03-04 08:52:44 -05:00
dekzter
a9fdb90ac5 Removed duplicate sentence-transformers install 2025-03-04 08:30:52 -05:00
dekzter
23788ffcbe fixing csrf origins 2025-03-04 08:22:14 -05:00
SergeantPanda
1ad84164a6 Fixed issues with not being able to create a super user. 2025-03-03 19:43:12 -06:00
SergeantPanda
063ec0c520 Merge branch 'main' of https://github.com/Dispatcharr/Dispatcharr 2025-03-03 18:55:51 -06:00
SergeantPanda
c318b52f10 Merge branch 'main' of https://github.com/Dispatcharr/Dispatcharr into Proxy 2025-03-03 18:51:09 -06:00
SergeantPanda
2711f5181f Fixed a couple errors. 2025-03-03 18:42:06 -06:00
SergeantPanda
85e41d5def Initial integration. 2025-03-03 18:40:30 -06:00
dekzter
79377c0d7f collecstatic isn't working in the dockerfile 2025-03-03 19:32:01 -05:00
dekzter
59fd80bb8a ahhhhhhh 2025-03-03 18:44:23 -05:00
dekzter
81728d346a updated aio with new values 2025-03-03 18:39:38 -05:00
dekzter
7968ac7b32 more revertedf iles 2025-03-03 18:32:06 -05:00
dekzter
87e5a6f27f missing collectstatic 2025-03-03 18:29:52 -05:00
SergeantPanda
604ff238d6 Merge branch 'main' of https://github.com/SergeantPanda/Dispatcharr into Proxy 2025-03-03 16:49:53 -06:00
dekzter
1c5d13bab2 another file to revert 2025-03-03 17:48:34 -05:00
SergeantPanda
a36d06766d Combined requirements back in to 1 file. 2025-03-03 16:42:51 -06:00
dekzter
8603aa5069 file was somehow reverted 2025-03-03 17:39:12 -05:00
dekzter
51df25b9b0 Added back reverted file 2025-03-03 17:30:54 -05:00
dekzter
857d62db28 merged in main 2025-03-03 17:13:54 -05:00
Dispatcharr
b5cc5dcb37 Revert "Merge branch 'main' of https://github.com/Dispatcharr/Dispatcharr"
This reverts commit dc4de65cbf, reversing
changes made to 814d6a6cda.

Attempt to fix
2025-03-03 15:18:11 -06:00
Dispatcharr
dc4de65cbf Merge branch 'main' of https://github.com/Dispatcharr/Dispatcharr 2025-03-03 15:01:12 -06:00
Dispatcharr
814d6a6cda Added Super User Creator
Added creator
Corrected license in swagger
2025-03-03 14:57:38 -06:00
dekzter
2c85ee8026 fixing up for final docker build 2025-03-03 15:16:12 -05:00
dekzter
9abc2fb925 fixing static files for nginx serving 2025-03-03 15:14:37 -05:00
dekzter
9feccc76cc need separate requirements files 2025-03-03 12:45:30 -05:00