Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MHSanaei/3x-ui
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: Wasdalt/3x-ui
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: main
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 71 files changed
  • 4 contributors

Commits on Dec 14, 2025

  1. 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
    - Удалённые файлы не восстановятся
    Wasdalt committed Dec 14, 2025
    Configuration menu
    Copy the full SHA
    c863766 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b8a6061 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    ffc6b3a View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2025

  1. 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
    Wasdalt committed Dec 20, 2025
    Configuration menu
    Copy the full SHA
    1a2f8f6 View commit details
    Browse the repository at this point in the history

Commits on Dec 21, 2025

  1. feat: HTTP fallback + SSH tunnel docs

    - Добавлен XUI_ALLOW_HTTP для доступа по IP
    - Добавлены инструкции SSH туннеля в README
    - Подсказки при старте если нет SSL
    Wasdalt committed Dec 21, 2025
    Configuration menu
    Copy the full SHA
    bddb2ab View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2025

  1. 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 committed Dec 27, 2025
    Configuration menu
    Copy the full SHA
    a34fba4 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2026

  1. 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 committed Feb 26, 2026
    Configuration menu
    Copy the full SHA
    3d2e163 View commit details
    Browse the repository at this point in the history
  2. feat: нативная установка (systemd) — альтернатива Docker

    - native-install.sh: установка через оригинальный install.sh + .env конфигурация
    - native-uninstall.sh: удаление .env-дополнений без удаления 3x-ui
    - init-config.sh: пути БД и xray config настраиваемые через env
    - README: инструкции для обоих вариантов (Docker и нативная)
    Admin committed Feb 26, 2026
    Configuration menu
    Copy the full SHA
    a4cc554 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2026

  1. Configuration menu
    Copy the full SHA
    e00e195 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2026

  1. Configuration menu
    Copy the full SHA
    2aa3b8f View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    8ab5894 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    c9ec7c8 View commit details
    Browse the repository at this point in the history
  4. Update init script

    Mark Grayson committed May 31, 2026
    Configuration menu
    Copy the full SHA
    02d77b8 View commit details
    Browse the repository at this point in the history
  5. Доработка выпуска сертов финал

    Mark Grayson committed May 31, 2026
    Configuration menu
    Copy the full SHA
    a8bed3f View commit details
    Browse the repository at this point in the history
  6. feat: sync fork overlay before x-ui start

    Mark Grayson committed May 31, 2026
    Configuration menu
    Copy the full SHA
    14b8a89 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'main' of https://github.com/Wasdalt/3x-ui

    # Conflicts:
    #	README.md
    #	init-config.sh
    Mark Grayson committed May 31, 2026
    Configuration menu
    Copy the full SHA
    0c1ad39 View commit details
    Browse the repository at this point in the history
  8. feat: auto-apply fork config on database changes

    Mark Grayson committed May 31, 2026
    Configuration menu
    Copy the full SHA
    f60412c View commit details
    Browse the repository at this point in the history
  9. fix: enable x-ui autostart in native setup

    Mark Grayson committed May 31, 2026
    Configuration menu
    Copy the full SHA
    7215890 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2026

  1. 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 committed Jun 22, 2026
    Configuration menu
    Copy the full SHA
    fdf43dc View commit details
    Browse the repository at this point in the history
Loading