0d218980f7
Revert "Adjust zero-traffic audience filters"
2025-09-23 03:32:31 +03:00
73d8c30d9c
Merge pull request #215 from Fr1ngg/bedolaga-0l8zql
...
Adjust zero-traffic audience filters
2025-09-23 03:31:37 +03:00
7abafbeaa1
Merge branch 'dev5' into bedolaga-0l8zql
2025-09-23 03:31:28 +03:00
2a7728a76c
Adjust zero-traffic audience filters
2025-09-23 03:30:37 +03:00
d266997720
Merge pull request #214 from Fr1ngg/bedolaga-hyr7z5
...
Add extended broadcast filters for subscription states
2025-09-23 03:24:47 +03:00
d6fb26d425
Add extended broadcast filters for subscription states
2025-09-23 03:24:28 +03:00
1eb3658ce5
Merge pull request #213 from Fr1ngg/revert-212-bedolaga-99q9z7
...
Revert "Add broadcast filters for expired and zero traffic subscriptions"
2025-09-23 03:23:20 +03:00
badf679bc3
Revert "Add broadcast filters for expired and zero traffic subscriptions"
2025-09-23 03:23:12 +03:00
1e542a0aa1
Merge pull request #212 from Fr1ngg/bedolaga-99q9z7
...
Add broadcast filters for expired and zero traffic subscriptions
2025-09-23 03:21:29 +03:00
cdbeca245f
Add broadcast filters for expired and zero traffic subscriptions
2025-09-23 03:21:02 +03:00
5a75626625
Merge pull request #210 from Fr1ngg/wy1u0m-bedolaga/add-referral-system-enhancements-and-analytics
...
Fix campaign stats to include subscription payments
2025-09-23 03:08:51 +03:00
17e3985671
Fix campaign stats to include subscription payments
2025-09-23 03:08:15 +03:00
5a5f151b38
Merge pull request #209 from Fr1ngg/xbnsin-bedolaga/add-referral-system-enhancements-and-analytics
...
Add advertising campaign stats to admin user info
2025-09-23 02:54:41 +03:00
97c8ddf4e1
Add advertising campaign stats to admin user info
2025-09-23 02:54:19 +03:00
df7414b670
Merge pull request #208 from Fr1ngg/revert-207-sha36e-bedolaga/add-referral-system-enhancements-and-analytics
...
Revert "Enhance campaign analytics and registration visibility"
2025-09-23 02:54:00 +03:00
8dfe2f2934
Revert "Enhance campaign analytics and registration visibility"
2025-09-23 02:53:52 +03:00
3f3968dda2
Merge pull request #207 from Fr1ngg/sha36e-bedolaga/add-referral-system-enhancements-and-analytics
...
Enhance campaign analytics and registration visibility
2025-09-23 02:50:33 +03:00
3930564f9b
Fix duplicate campaign registration assignment
2025-09-23 02:49:16 +03:00
90edc1dc49
Merge pull request #206 from Fr1ngg/dev5
...
Фикс текстовой надписи (14 дней) при продлении
2025-09-23 02:28:08 +03:00
c9f7906e10
Merge pull request #205 from Fr1ngg/yebrv1-bedolaga/remove-1-month-from-renewal-button
...
Fix 14-day period description
2025-09-23 02:25:38 +03:00
1758eabe0e
Fix 14-day period description
2025-09-23 02:25:18 +03:00
7ec73c9bc7
Merge pull request #204 from Fr1ngg/dev5
...
Обновление мониторинга серверов в режиме xray
2025-09-23 02:14:09 +03:00
1b0ad8f8b6
Merge pull request #203 from Fr1ngg/9j3nj4-bedolaga/add-refresh-button-and-server-status
...
feat: enhance server status view
2025-09-23 02:10:22 +03:00
555f76a4ec
feat: enhance server status view
2025-09-23 02:09:22 +03:00
bfb9c5d09c
Create docker-compose.local.yml
2025-09-23 01:37:58 +03:00
9a72a7e3e7
Merge pull request #198 from Fr1ngg/dev5
...
Фикс блокировки/разблокировки в тикет системе + дополнение переводов
2025-09-23 01:28:36 +03:00
b48c3f1235
Merge pull request #197 from Fr1ngg/oz3a4v-bedolaga/fix-localization-key-issues-for-russian
...
Add missing ticket management localization strings
2025-09-23 01:27:48 +03:00
85f59566a6
Add missing ticket management localization strings
2025-09-23 01:27:30 +03:00
1c3f2c7500
Update texts.py
2025-09-23 01:21:47 +03:00
47ca096e48
Merge pull request #196 from Fr1ngg/vxzeis-bedolaga/fix-user-unblock-errors-in-ticket-system
...
Fix admin ticket rendering after user block toggles
2025-09-23 01:16:24 +03:00
a9da2a0e63
Merge branch 'dev5' into vxzeis-bedolaga/fix-user-unblock-errors-in-ticket-system
2025-09-23 01:16:07 +03:00
aaea98049e
Fix FSM context usage in admin ticket handlers
2025-09-23 01:15:26 +03:00
93668da99f
Resolve merge conflicts: integrate server status and ticket system features
...
- Added server status handler and service
- Integrated server status keyboard functions
- Merged support settings and ticket configurations
- Updated bot.py with new handler registrations
- Resolved conflicts in config.py and inline.py
2025-09-23 01:13:49 +03:00
53c7df0b8e
Merge pull request #195 from Fr1ngg/q3k8jm-bedolaga/fix-user-unblock-errors-in-ticket-system
...
Fix admin ticket rendering after user block toggles
2025-09-23 01:08:57 +03:00
86e8ac39c3
Handle admin ticket view after block toggles
2025-09-23 01:08:28 +03:00
a9a10e3e90
Merge pull request #187 from Fr1ngg/dev5
...
Полноценная тикет-система by @PEDZEO
2025-09-23 00:39:57 +03:00
1de81a6aa4
Merge pull request #185 from yazhog/main
...
Автовыбор количества устройств в заказе, если TRIAL_DEVICE_LIMIT < DEFAULT_DEVICE_LIMIT
2025-09-23 00:38:22 +03:00
540a0e35a1
Merge pull request #184 from PEDZEO/dev3
...
Fix ticket system: add noop handlers, pagination, validation, and adm…
2025-09-23 00:30:09 +03:00
f0ae702933
Fix ticket system: add noop handlers, pagination, validation, and admin back button routing
2025-09-22 21:40:10 +03:00
19be4348aa
Fix ticket system: add noop handlers, pagination, validation, and admin back button routing
2025-09-22 21:20:50 +03:00
84ed1fc5ca
Merge pull request #182 from Fr1ngg/dev3
...
Мониторинг серверов
2025-09-22 17:51:11 +03:00
de38f8219c
Merge pull request #181 from Fr1ngg/h47qjb-bedolaga/add-server-status-button-with-modes
...
Add server status menu integration
2025-09-22 17:29:52 +03:00
12061f0752
Add server status menu integration
2025-09-22 17:29:20 +03:00
a5174f10d5
Merge pull request #180 from Fr1ngg/dev3
...
Фикс отключения скидки на дл. периоды для базовых юзеров
2025-09-22 14:54:40 +03:00
69eeaf6c46
Merge pull request #179 from Fr1ngg/v2tigz-bedolaga/fix-discount-settings-in-env
...
Respect base promo period discount flag
2025-09-22 14:53:43 +03:00
ac25e1b4c6
Respect base promo period discount flag
2025-09-22 14:53:23 +03:00
51ba5b980c
Merge branch 'Fr1ngg:main' into DEV
2025-09-21 10:57:47 +05:00
26e0800d70
Update Dockerfile
2025-09-21 08:19:43 +03:00
d0197aacd7
Update docker-registry.yml
2025-09-21 08:19:16 +03:00
b097c5db44
Update docker-hub.yml
2025-09-21 08:19:06 +03:00
Egor