2261 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
SantaSpeen	2aaec2ca58	Merge pull request #1 from SantaSpeen/slave ... Merge into main	2025-09-30 17:20:56 +03:00
SantaSpeen	5efe36878d	[~] Update upstream	2025-09-30 17:20:08 +03:00
SantaSpeen	b9861249b7	Merge remote-tracking branch 'origin/main' ... # Conflicts: # app/handlers/subscription.py	2025-09-30 17:11:32 +03:00
Egor	2c9b585f4b	Merge pull request #597 from Fr1ngg/dev2 ... fix	2025-09-30 16:51:54 +03:00
Egor	dd5b36ff4a	Merge pull request #596 from Fr1ngg/bedolaga/fix-all-merge-conflicts ... Resolve duplicate handlers and cleanup imports	2025-09-30 16:41:09 +03:00
Egor	144a942a97	Resolve duplicate handlers and cleanup imports	2025-09-30 16:40:08 +03:00
SantaSpeen	ff661d84ee	[+] Update app-config.json: new get_apps_for_device	2025-09-30 14:46:55 +03:00
SantaSpeen	ab1b8619f8	[+] Update get_apps_for_device: Allow app-config.json just from panel	2025-09-30 14:26:22 +03:00
Egor	b6a383b5d8	Merge pull request #593 from Fr1ngg/dev2 ... Логи в боте	2025-09-30 04:37:25 +03:00
Egor	a8215ddec5	Update system_logs.py	2025-09-30 04:34:09 +03:00
Egor	954c96ed16	Merge pull request #592 from Fr1ngg/bedolaga/add-log-section-to-admin-panel ... Add system logs view to admin panel	2025-09-30 04:30:47 +03:00
Egor	ed9a3613f5	Add system logs view to admin panel	2025-09-30 04:30:30 +03:00
Egor	29743351de	Delete app/webapi/vpn-admin-dashboard.html v2.4.1	2025-09-30 03:52:57 +03:00
Egor	fd897464f5	Update Dockerfile	2025-09-30 03:52:36 +03:00
Egor	d9b0420202	Update docker-registry.yml	2025-09-30 03:52:24 +03:00
Egor	527d907035	Update docker-hub.yml	2025-09-30 03:52:11 +03:00
Egor	6c3270e6d7	Merge pull request #590 from Fr1ngg/dev2 ... Dev to main	2025-09-30 03:36:11 +03:00
Egor	b7382eb7c3	Merge pull request #589 from Fr1ngg/bedolaga/update-bot-configuration-menu ... Update admin bot configuration menu grouping	2025-09-30 03:32:04 +03:00
Egor	0cd7d45338	Refine bot configuration menu structure	2025-09-30 03:31:37 +03:00
Egor	23dcb9699c	Merge pull request #588 from Fr1ngg/bedolaga/fix-duplicate-cryptolink-display ... Remove duplicate Happ CryptoLink link display	2025-09-30 03:17:49 +03:00
Egor	9603952b2a	Adjust Happ CryptoLink message formatting	2025-09-30 03:17:17 +03:00
Egor	299eeee9d3	Merge pull request #587 from Fr1ngg/bedolaga-xjizv4 ... Convert Happ cryptolink message to happ scheme	2025-09-30 03:11:48 +03:00
Egor	63c7e9c08b	Adjust Happ cryptolink message formatting	2025-09-30 03:11:28 +03:00
Egor	42131457bf	Merge pull request #586 from Fr1ngg/revert-585-bedolaga-uswi1l ... Revert "feat: update Happ cryptolink subscription link handling"	2025-09-30 03:11:17 +03:00
Egor	a7370fbe52	Revert "feat: update Happ cryptolink subscription link handling"	2025-09-30 03:11:08 +03:00
Egor	41f0a15cea	Merge pull request #585 from Fr1ngg/bedolaga-uswi1l ... feat: update Happ cryptolink subscription link handling	2025-09-30 03:08:59 +03:00
Egor	dd92f37fc1	feat: adjust Happ cryptolink presentation	2025-09-30 03:08:42 +03:00
Egor	46d4d699dd	Merge pull request #584 from Fr1ngg/revert-583-bedolaga-bsbzht ... Revert "Update Happ CryptoLink message formatting"	2025-09-30 03:07:37 +03:00
Egor	76b594363b	Revert "Update Happ CryptoLink message formatting"	2025-09-30 03:07:28 +03:00
Egor	107b18d642	Merge pull request #583 from Fr1ngg/bedolaga-bsbzht ... Update Happ CryptoLink message formatting	2025-09-30 03:05:01 +03:00
Egor	9973491503	Update Happ CryptoLink message formatting	2025-09-30 03:04:26 +03:00
Egor	418081048e	Merge pull request #582 from Fr1ngg/bedolaga/add-language-selection-toggle-in-bot-config ... feat: allow disabling language selection	2025-09-30 02:51:53 +03:00
Egor	f22838b99f	feat: make language selection optional	2025-09-30 02:51:31 +03:00
Egor	9bdacea568	Update .env.example	2025-09-30 02:50:26 +03:00
Egor	6bec0ed0c8	Merge pull request #581 from Fr1ngg/bedolaga/add-language-selection-at-start ... Add language selection workflow and menu option	2025-09-30 02:38:29 +03:00
Egor	4363955443	Add language selection workflow and menu option	2025-09-30 02:37:57 +03:00
Egor	47a272c7e8	Merge pull request #580 from Fr1ngg/bedolaga/fix-subscription-renewal-error ... Prevent async session errors when extending subscriptions	2025-09-30 02:17:24 +03:00
Egor	07ce852917	Fix subscription extension notifications and bot init	2025-09-30 02:17:06 +03:00
Egor	a6ada5c9e3	Merge pull request #579 from Fr1ngg/bedolaga/add-admin-notifications-for-promo-groups-zboyk5 ... feat: expand admin promo notifications	2025-09-30 02:06:47 +03:00
Egor	90c5b1d003	feat: expand admin notifications for promo events	2025-09-30 02:06:31 +03:00
Egor	326aca31d7	Merge pull request #578 from Fr1ngg/revert-577-bedolaga/add-admin-notifications-for-promo-groups ... Revert "Enhance admin notifications with promo group context"	2025-09-30 02:06:20 +03:00
Egor	4fd5ba863b	Revert "Enhance admin notifications with promo group context"	2025-09-30 02:06:11 +03:00
Egor	4bd0b221e7	Merge pull request #577 from Fr1ngg/bedolaga/add-admin-notifications-for-promo-groups ... Enhance admin notifications with promo group context	2025-09-30 01:57:14 +03:00
Egor	f47511f26a	Enhance admin notifications with promo group context	2025-09-30 01:56:52 +03:00
Egor	2d409eaa1f	Merge pull request #576 from Fr1ngg/bedolaga/update-subscription-status-to-icons ... Move subscription status icons into server user buttons	2025-09-30 01:41:16 +03:00
Egor	9d42c4fb7d	Adjust server user list status icons	2025-09-30 01:41:03 +03:00
Egor	d3ced8f7e2	Merge pull request #575 from Fr1ngg/bedolaga/add-pagination-to-users-list-page ... Add pagination to admin server users list	2025-09-30 01:34:24 +03:00
Egor	a5715b2ca8	Add pagination to server users admin view	2025-09-30 01:34:07 +03:00
Egor	c18dd604d8	Merge pull request #574 from Fr1ngg/bedolaga/fix-user-count-display-on-server-list-g9vyec ... Fix server user list to account for JSON-based connections	2025-09-30 01:28:59 +03:00
Egor	c2656f4ee6	Fix server users list by including JSON connections	2025-09-30 01:28:43 +03:00