Commit Graph

5031 Commits

Author SHA1 Message Date
Egor
2eb2661848 Merge pull request #2167 from BEDOLAGA-DEV/dev5
Dev5
2025-12-19 07:23:00 +03:00
Egor
d7a935906e Merge pull request #2168 from Gy9vin/main
Фиксы
2025-12-19 07:22:42 +03:00
Mikhail
5f540d907e Merge branch 'BEDOLAGA-DEV:main' into main 2025-12-18 17:51:05 +03:00
gy9vin
c6175255a5 фикс кнопок конкурсов 2025-12-18 17:50:36 +03:00
gy9vin
71facd9624 Активация подписки после пополнения баланса! 2025-12-18 08:45:59 +03:00
Egor
89a5f5c6f7 Merge pull request #2166 from BEDOLAGA-DEV/j0zhkm-bedolaga/add-subscription-management-for-users-who-unsubscribed
Add toggle for trial deactivation on channel unsubscribe
2025-12-18 03:23:14 +03:00
Egor
7b60be1ec7 Add toggle for trial deactivation on channel unsubscribe 2025-12-18 03:04:13 +03:00
Egor
ed314ca19b Merge pull request #2165 from Gy9vin/main
Фиксы, правки и хотелки
2025-12-18 00:16:25 +03:00
Mikhail
0b714893e7 Merge branch 'BEDOLAGA-DEV:main' into main 2025-12-18 00:14:20 +03:00
gy9vin
5ca0f5fc27 Еще правки 2025-12-18 00:13:57 +03:00
Egor
31fa7b7072 Merge pull request #2164 from BEDOLAGA-DEV/main
ц
2025-12-17 20:23:29 +03:00
Egor
86d7003c33 Merge pull request #2161 from Gy9vin/main
Кнопка конкурсов + прототип налоговой. не трогайте налоговую еще!!!
2025-12-17 19:13:32 +03:00
Egor
753d77b4c2 Merge pull request #2162 from Vysokostnyi/main
Добавлено передача telegram_user_id в описание платежа
2025-12-17 19:13:05 +03:00
Vysokostnyi
4add298aab Добавлено передача telegram_user_id в описание платежа 2025-12-16 02:41:58 +03:00
gy9vin
e76f2f3d50 Кнопка конкурсов + прототип налоговой. не трогайте налоговую еще!!! 2025-12-16 00:59:23 +03:00
Egor
dcb0002f4a Merge pull request #2160 from Gy9vin/main
Конкурсные
2025-12-15 22:58:21 +03:00
gy9vin
332c20fc45 Merge branch 'main' of https://github.com/Gy9vin/remnawave-bedolaga-telegram-bot 2025-12-15 21:36:23 +03:00
gy9vin
305a3c4490 Фиксы по конкурсам. 2025-12-15 21:34:56 +03:00
Mikhail
a9ecd5f620 Merge branch 'BEDOLAGA-DEV:main' into main 2025-12-15 20:05:03 +03:00
gy9vin
2f0594e361 Конкурсная система. 2025-12-15 20:04:39 +03:00
Egor
65b36c3a5f Merge pull request #2159 from BEDOLAGA-DEV/revert-2158-c8yqa8-bedolaga/add-subscription-settings-for-happ_cryptolink
Revert "Add limited Happ cryptolink support"
2025-12-15 11:12:22 +03:00
Egor
f8ef2b9f5a Revert "Add limited Happ cryptolink support" 2025-12-15 11:12:14 +03:00
Egor
70a283d1f1 Merge pull request #2158 from BEDOLAGA-DEV/c8yqa8-bedolaga/add-subscription-settings-for-happ_cryptolink
Add limited Happ cryptolink support
2025-12-15 11:00:54 +03:00
Egor
f2a5032f15 Refresh Happ link before displaying subscription 2025-12-15 11:00:39 +03:00
Egor
0f5fcdd067 Merge pull request #2157 from BEDOLAGA-DEV/revert-2156-2gz1mq-bedolaga/add-subscription-settings-for-happ_cryptolink
Revert "Add limited Happ cryptolink support"
2025-12-15 11:00:26 +03:00
Egor
80388be54f Revert "Add limited Happ cryptolink support" 2025-12-15 11:00:17 +03:00
Egor
47f0b77138 Merge pull request #2156 from BEDOLAGA-DEV/2gz1mq-bedolaga/add-subscription-settings-for-happ_cryptolink
Add limited Happ cryptolink support
2025-12-15 10:41:18 +03:00
Egor
162e7da350 Add cooldown for Happ device reset links 2025-12-15 10:40:59 +03:00
Egor
07e1e08b1d Merge pull request #2154 from BEDOLAGA-DEV/revert-2153-49fvja-bedolaga/add-web-admin-button-for-admins
Revert "Add admin web panel miniapp toggle"
2025-12-15 07:24:51 +03:00
Egor
fc955bd3b2 Revert "Add admin web panel miniapp toggle" 2025-12-15 07:24:41 +03:00
Egor
1b504063d2 Merge pull request #2153 from BEDOLAGA-DEV/49fvja-bedolaga/add-web-admin-button-for-admins
Add admin web panel miniapp toggle
2025-12-15 07:19:01 +03:00
Egor
174f9b8517 Add admin web panel miniapp toggle 2025-12-15 07:18:45 +03:00
Egor
3706d5ceb4 Merge pull request #2152 from BEDOLAGA-DEV/main
w
2025-12-14 19:35:39 +03:00
Egor
3577054d79 Merge pull request #2151 from Gy9vin/main
Коркурсная система + АПИ
2025-12-14 19:32:41 +03:00
gy9vin
afd4fe8d1d Конкурсы +АПИ 2025-12-14 14:37:29 +03:00
gy9vin
1409a0ab8d Конкурсы 2025-12-14 01:38:22 +03:00
Egor
9df8ca52d6 Merge pull request #2150 from BEDOLAGA-DEV/dev5
Dev5
2025-12-12 08:54:47 +03:00
Egor
0902efc007 Merge pull request #2149 from BEDOLAGA-DEV/9ks456-bedolaga/fix-url-validation-error-in-bot
Restrict blacklist URL input to waiting state
2025-12-12 08:52:51 +03:00
Egor
0b4fea02a1 Restrict blacklist URL input to waiting state 2025-12-12 08:52:36 +03:00
Egor
01580aae74 Merge pull request #2148 from BEDOLAGA-DEV/dev5
Dev5
2025-12-12 06:58:03 +03:00
Egor
7e022a1eca Merge pull request #2147 from BEDOLAGA-DEV/om94g5-bedolaga/update-subscription-link-display
Wrap Happ CryptoLink subscription link in blockquote
2025-12-12 06:56:36 +03:00
Egor
f31c64602c Wrap Happ CryptoLink subscription link in blockquote 2025-12-12 06:55:58 +03:00
Egor
f193b0bfcf Update Python version argument to v2.9.1 v2.9.1 2025-12-12 06:29:18 +03:00
Egor
b961529001 Update version to v2.9.1 in docker-registry.yml 2025-12-12 06:29:09 +03:00
Egor
afa172f3cc Update docker-hub.yml 2025-12-12 06:28:52 +03:00
Egor
8be1d7e423 Delete app/handlers/.DS_Store 2025-12-12 06:10:15 +03:00
Egor
8c4db0a0e6 Delete app/.DS_Store 2025-12-12 06:09:46 +03:00
Egor
1e56e4eaa6 Merge pull request #2146 from BEDOLAGA-DEV/main
w
2025-12-12 06:08:29 +03:00
Egor
a8da98c35e Update docker-compose.yml 2025-12-12 06:07:54 +03:00
Egor
7ca6942443 Rename vpn_logo (1).png to vpn_logo.png 2025-12-12 06:07:06 +03:00