5947 Commits

Author SHA1 Message Date
Egor
3937bbffc9 Merge pull request #2345 from BEDOLAGA-DEV/dev5
Update auth.py
2026-01-19 23:36:06 +03:00
Egor
70441da7de Update auth.py 2026-01-19 23:35:12 +03:00
Egor
df2626adae Merge pull request #2344 from BEDOLAGA-DEV/dev5
Update subscription.py
2026-01-19 23:17:18 +03:00
Egor
9bffeb4151 Update subscription.py 2026-01-19 23:17:00 +03:00
Egor
8524e2c023 Merge pull request #2343 from BEDOLAGA-DEV/dev5
Dev5
2026-01-19 23:06:38 +03:00
Egor
3553ff615d Update subscription.py 2026-01-19 23:06:21 +03:00
Egor
ca0682e48f Merge pull request #2342 from BEDOLAGA-DEV/main
w
2026-01-19 22:52:58 +03:00
Egor
1e1c0e89bc Update subscription.py 2026-01-19 22:51:57 +03:00
Egor
93227b7f41 Update yookassa.py 2026-01-19 22:49:58 +03:00
Egor
0a51e4d9ea Merge pull request #2339 from BEDOLAGA-DEV/dev5
Update branding.py
2026-01-19 10:22:50 +03:00
Egor
9e69b0cf22 Update branding.py 2026-01-19 10:17:33 +03:00
Egor
aaaaa25231 Merge pull request #2338 from BEDOLAGA-DEV/dev5
Update admin_promocodes.py
2026-01-19 09:32:03 +03:00
Egor
10fea329ad Update admin_promocodes.py 2026-01-19 09:31:41 +03:00
Egor
408c5c520e Merge pull request #2337 from BEDOLAGA-DEV/dev5
Update admin_stats.py
2026-01-19 09:17:15 +03:00
Egor
6775b06b2e Update admin_stats.py 2026-01-19 08:51:48 +03:00
Egor
9460c86f7a Merge pull request #2336 from BEDOLAGA-DEV/dev5
Dev5
2026-01-19 07:53:16 +03:00
Egor
f8d7b3288c Update cloudpayments.py 2026-01-19 07:52:54 +03:00
Egor
bd6498fb73 Update subscription.py 2026-01-19 07:52:16 +03:00
Egor
cdb3507a56 Update tariff_purchase.py 2026-01-19 06:26:15 +03:00
Egor
0b18c16f47 Update subscription_auto_purchase_service.py 2026-01-19 06:25:30 +03:00
Egor
f452434b13 Merge pull request #2335 from BEDOLAGA-DEV/main
w
2026-01-19 06:24:22 +03:00
PEDZEO
e6e688a395 fix(routes): reorder notification and ticket routers to prevent route conflicts
- Moved the notifications router to be included before the tickets router to avoid conflicts.
- Updated comments for clarity regarding the order of router inclusion.
2026-01-19 01:30:31 +03:00
PEDZEO
b1206a84c7 feat(notifications): enhance notification security and ownership checks
- Added ownership verification for user notifications to ensure only the rightful owner can mark them as read.
- Implemented checks to confirm that admin notifications are correctly identified before allowing them to be marked as read.
- Introduced a new method to retrieve notifications by ID in the TicketNotificationCRUD for improved data handling.
2026-01-19 00:39:36 +03:00
PEDZEO
63e45e12de Merge pull request #2334 from BEDOLAGA-DEV/test
feat(notifications): implement ticket notifications for users and admins
2026-01-19 00:34:03 +03:00
PEDZEO
792ff22471 Merge branch 'main' into test 2026-01-19 00:33:21 +03:00
PEDZEO
346806bce0 feat(notifications): integrate WebSocket notifications for ticket replies and new tickets
- Added WebSocket notifications for admins on new ticket creation and user replies.
- Implemented notification handling in the ticket management routes.
- Enhanced error logging for notification failures.
2026-01-19 00:28:57 +03:00
PEDZEO
5630e99812 Merge branch 'main' of https://github.com/Fr1ngg/remnawave-bedolaga-telegram-bot 2026-01-19 00:03:43 +03:00
PEDZEO
67c3dba1cc feat(notifications): implement ticket notifications for users and admins
- Added a new TicketNotification model to handle notifications for ticket events.
- Implemented user and admin notifications for new tickets and replies in the cabinet.
- Introduced settings to enable or disable notifications for users and admins.
- Enhanced ticket settings to include notification preferences.
- Integrated WebSocket notifications for real-time updates.
2026-01-19 00:02:41 +03:00
Egor
c1e901ba5e Merge pull request #2333 from BEDOLAGA-DEV/dev5
Update auth.py
2026-01-18 23:34:02 +03:00
Egor
b6f2052464 Update auth.py 2026-01-18 23:33:45 +03:00
PEDZEO
c63db708cc feat(tickets): notify admins on new ticket creation and replies
- Added functionality to notify admins when a new ticket is created.
- Implemented notification for admins when a user replies to a ticket.
- Included error handling for notification failures.
2026-01-18 23:23:46 +03:00
Egor
3fc702ec65 Merge pull request #2332 from BEDOLAGA-DEV/dev5
Dev5
2026-01-18 22:15:37 +03:00
Egor
0aff94de74 Update main.py 2026-01-18 22:15:03 +03:00
Egor
d8c60ce19f Merge pull request #2331 from BEDOLAGA-DEV/main
w
2026-01-18 22:14:34 +03:00
Egor
f3995c7ca8 Merge pull request #2330 from DrillUser/patch-1
+убрать очепятку
2026-01-18 21:31:22 +03:00
Egor
1330f394bb Merge pull request #2328 from Gy9vin/main
fix(contests): исправлены критические баги системы конкурсов
2026-01-18 21:31:01 +03:00
Vladislav
ec27d63f70 +убрать очепятку 2026-01-18 14:09:04 +03:00
gy9vin
78d785f83f fix(contests): исправлены критические баги системы конкурсов
- Исправлен вызов get_active_rounds в админ-панели (передавалось 2 параметра вместо 1)
- Обновлены кнопки редактирования призов с prize_days на prize_type/prize_value
- Мигрирован Cabinet API с устаревшего prize_days на новые поля
- Добавлена поддержка нескольких типов призов (дни, баланс, кастом)
- Обновлена документация API конкурсов
2026-01-18 10:15:45 +03:00
Egor
04bb20c1e7 Update Dockerfile v3.1.0 2026-01-18 07:33:22 +03:00
Egor
7fdf2dcd51 Update docker-registry.yml 2026-01-18 07:33:13 +03:00
Egor
6d5462b084 Update docker-hub.yml 2026-01-18 07:32:52 +03:00
Egor
956b90e95e Merge pull request #2327 from BEDOLAGA-DEV/dev5
Dev5
2026-01-18 06:01:18 +03:00
Egor
15e7725cf7 Update tariff.py 2026-01-18 05:47:59 +03:00
Egor
4205eed54f Update admin_tariffs.py 2026-01-18 05:46:50 +03:00
Egor
921ae25dd3 Merge pull request #2326 from BEDOLAGA-DEV/main
w
2026-01-18 05:43:05 +03:00
Egor
cee4139a64 Update README.md 2026-01-17 19:49:19 +03:00
Egor
92339ec55a Merge pull request #2323 from libkitdev/main
feat(promocodes): добавить тип DISCOUNT для одноразовых процентных скидок
2026-01-17 19:45:10 +03:00
Egor
3372736fa3 Merge pull request #2325 from BEDOLAGA-DEV/dev5
Dev5
2026-01-17 10:52:16 +03:00
Egor
cd0ce908a1 Add files via upload 2026-01-17 10:31:40 +03:00
Egor
b7f8469895 Add files via upload 2026-01-17 10:31:21 +03:00