-
-
Notifications
You must be signed in to change notification settings - Fork 8.1k
Comparing changes
Open a pull request
base repository: MHSanaei/3x-ui
base: main
head repository: Wasdalt/3x-ui
compare: main
- 19 commits
- 71 files changed
- 4 contributors
Commits on Dec 14, 2025
-
Docker авто-конфигурация через переменные окружения
Функции: - Авто-настройка из .env через init-config.sh - Автоматический выпуск/обновление SSL через Certbot - Проверка DNS перед выпуском сертификата - Настройка Fail2ban через переменные окружения - Поддержка отдельного домена для подписки Новые файлы: - init-config.sh - применение .env к БД SQLite - docker-entrypoint-wrapper.sh - entrypoint с Fail2ban - certbot-init.sh - авто SSL с проверкой DNS - check-dns.sh - скрипт проверки DNS - .env.example - шаблон конфигурации - Документация: SETTINGS.md, ADVANCED.md, TODO.md Удалённые файлы: - Скриншоты, переводы README, GitHub workflows - Windows файлы, скрипты установки Защита через .gitattributes merge=ours: - Кастомные файлы не перезапишутся при merge с upstream - Удалённые файлы не восстановятся
Configuration menu - View commit details
-
Copy full SHA for c863766 - Browse repository at this point
Copy the full SHA c863766View commit details -
Configuration menu - View commit details
-
Copy full SHA for b8a6061 - Browse repository at this point
Copy the full SHA b8a6061View commit details -
Configuration menu - View commit details
-
Copy full SHA for ffc6b3a - Browse repository at this point
Copy the full SHA ffc6b3aView commit details
Commits on Dec 20, 2025
-
feat: Admin credentials via ENV + auto-domain detection
EN: - Added XUI_ADMIN_USERNAME, XUI_ADMIN_PASSWORD, XUI_SECRET_KEY - Auto-detect domain from database backup - Auto-request SSL certificate for detected domain - Cleaned up scripts (bilingual comments) - Protected custom files from upstream merge RU: - Добавлены XUI_ADMIN_USERNAME, XUI_ADMIN_PASSWORD, XUI_SECRET_KEY - Автодетект домена из бэкапа БД - Автозапрос SSL сертификата для домена - Очищены скрипты (двуязычные комментарии) - Защита кастомных файлов от merge upstream
Configuration menu - View commit details
-
Copy full SHA for 1a2f8f6 - Browse repository at this point
Copy the full SHA 1a2f8f6View commit details
Commits on Dec 21, 2025
-
feat: HTTP fallback + SSH tunnel docs
- Добавлен XUI_ALLOW_HTTP для доступа по IP - Добавлены инструкции SSH туннеля в README - Подсказки при старте если нет SSL
Configuration menu - View commit details
-
Copy full SHA for bddb2ab - Browse repository at this point
Copy the full SHA bddb2abView commit details
Commits on Dec 27, 2025
-
feat: улучшена настройка логов Xray через ENV
- Добавлен jq в Dockerfile для работы с JSON конфигом - Переписан init-config.sh для настройки логов через БД - Добавлены переменные XUI_XRAY_ERROR_LOG и XUI_XRAY_LOG_LEVEL - XUI_XRAY_LOG_LEVEL=info по умолчанию для torrent/iplimit блокировщиков - ARG CACHEBUST добавлен для инвалидации Docker кэша
Admin committedDec 27, 2025 Configuration menu - View commit details
-
Copy full SHA for a34fba4 - Browse repository at this point
Copy the full SHA a34fba4View commit details
Commits on Feb 26, 2026
-
fix: исправлен volume, перекрывающий /app, добавлен webDomain в init-…
…config - docker-compose: volume xray-logs с /app на /app/xray-logs - Dockerfile: симлинки ./access.log -> /app/xray-logs/ для шаринга логов - init-config: добавлен webDomain в БД из XUI_DOMAIN - entrypoint: init-config запускается ДО старта панели (предотвращает перезапись) - README: обновлены инструкции по перезапуску, приоритет .env над БД
Admin committedFeb 26, 2026 Configuration menu - View commit details
-
Copy full SHA for 3d2e163 - Browse repository at this point
Copy the full SHA 3d2e163View commit details -
feat: нативная установка (systemd) — альтернатива Docker
- native-install.sh: установка через оригинальный install.sh + .env конфигурация - native-uninstall.sh: удаление .env-дополнений без удаления 3x-ui - init-config.sh: пути БД и xray config настраиваемые через env - README: инструкции для обоих вариантов (Docker и нативная)
Admin committedFeb 26, 2026 Configuration menu - View commit details
-
Copy full SHA for a4cc554 - Browse repository at this point
Copy the full SHA a4cc554View commit details
Commits on Feb 27, 2026
-
fix: бэкап БД при переустановке нативного режима
Admin committedFeb 27, 2026 Configuration menu - View commit details
-
Copy full SHA for e00e195 - Browse repository at this point
Copy the full SHA e00e195View commit details
Commits on May 31, 2026
-
feat: унифицировать нативную установку и SSL-обновление
usermain committedMay 31, 2026 Configuration menu - View commit details
-
Copy full SHA for 2aa3b8f - Browse repository at this point
Copy the full SHA 2aa3b8fView commit details -
fix: создавать x-ui service при нативной установке
usermain committedMay 31, 2026 Configuration menu - View commit details
-
Copy full SHA for 8ab5894 - Browse repository at this point
Copy the full SHA 8ab5894View commit details -
fix: не включать SSL без выпущенного сертификата
usermain committedMay 31, 2026 Configuration menu - View commit details
-
Copy full SHA for c9ec7c8 - Browse repository at this point
Copy the full SHA c9ec7c8View commit details -
Mark Grayson committed
May 31, 2026 Configuration menu - View commit details
-
Copy full SHA for 02d77b8 - Browse repository at this point
Copy the full SHA 02d77b8View commit details -
Доработка выпуска сертов финал
Mark Grayson committedMay 31, 2026 Configuration menu - View commit details
-
Copy full SHA for a8bed3f - Browse repository at this point
Copy the full SHA a8bed3fView commit details -
feat: sync fork overlay before x-ui start
Mark Grayson committedMay 31, 2026 Configuration menu - View commit details
-
Copy full SHA for 14b8a89 - Browse repository at this point
Copy the full SHA 14b8a89View commit details -
Merge branch 'main' of https://github.com/Wasdalt/3x-ui
# Conflicts: # README.md # init-config.sh
Mark Grayson committedMay 31, 2026 Configuration menu - View commit details
-
Copy full SHA for 0c1ad39 - Browse repository at this point
Copy the full SHA 0c1ad39View commit details -
feat: auto-apply fork config on database changes
Mark Grayson committedMay 31, 2026 Configuration menu - View commit details
-
Copy full SHA for f60412c - Browse repository at this point
Copy the full SHA f60412cView commit details -
fix: enable x-ui autostart in native setup
Mark Grayson committedMay 31, 2026 Configuration menu - View commit details
-
Copy full SHA for 7215890 - Browse repository at this point
Copy the full SHA 7215890View commit details
Commits on Jun 22, 2026
-
fix: cert validity check, SIGHUP reload, fork-db-apply resilience
- init-config.sh: try_use_domain() now skips DNS check when a valid cert already exists — a transient ipify/ifconfig.me failure no longer clears cert paths from the DB and breaks SSL for clients - init-config.sh: wrap jq/sqlite Xray-logging pipeline in a subshell (_configure_xray_logging) so a jq exit-5 system error cannot abort the entire script via set -e - fork-db-apply.sh: protect init-config.sh call with || echo so the service no longer fails with exit code 5 on transient errors - certbot-domain.sh: certbot_issue_domain_cert() checks cert validity (not just file existence) — expired cert triggers renew/reissue, valid cert is skipped entirely without calling certbot - certbot-domain.sh: deploy hook uses SIGHUP (in-process reload ~1-2s) instead of systemctl restart (~10s), falling back to restart only if the service is not running - README.md: add native-update.sh as the primary update command; update SSL section to reflect SIGHUP reload and validity-gated cert issue
Mark Grayson committedJun 22, 2026 Configuration menu - View commit details
-
Copy full SHA for fdf43dc - Browse repository at this point
Copy the full SHA fdf43dcView commit details
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff main...main