Commit Graph

2518 Commits

Author SHA1 Message Date
Egor
e623f9df3a Revert "Add trial and tariff settings to admin pricing" 2025-10-04 05:57:49 +03:00
Egor
2b79de7d82 Merge pull request #719 from Fr1ngg/bedolaga/add-trial-period-management-in-admin-panel-zipxk2
Add trial and tariff settings to admin pricing
2025-10-04 05:56:26 +03:00
Egor
cdcc3b4c4a Add trial and tariff settings to admin pricing 2025-10-04 05:56:07 +03:00
Egor
e757569628 Merge pull request #718 from Fr1ngg/revert-717-bedolaga/add-trial-period-management-in-admin-panel
Revert "Add trial and tariff configuration controls to admin pricing panel"
2025-10-04 05:55:34 +03:00
Egor
4f88cdf7db Revert "Add trial and tariff configuration controls to admin pricing panel" 2025-10-04 05:55:26 +03:00
Egor
406c13aea2 Merge pull request #717 from Fr1ngg/bedolaga/add-trial-period-management-in-admin-panel
Add trial and tariff configuration controls to admin pricing panel
2025-10-04 05:51:31 +03:00
Egor
c95b1e4fad feat(admin): extend pricing panel settings 2025-10-04 05:51:12 +03:00
Egor
43c480fa33 Merge pull request #716 from Fr1ngg/revert-713-revert-712-bedolaga/reorganize-admin-panel-menu-mzg1j9
Revert "Revert "Refactor admin menu for servers and pricing management""
2025-10-04 05:37:11 +03:00
Egor
cb25bbb2ed Revert "Revert "Refactor admin menu for servers and pricing management"" 2025-10-04 05:36:59 +03:00
Egor
2602a05fb2 Merge pull request #715 from Fr1ngg/revert-714-bedolaga/reorganize-admin-panel-menu-t36ykc
Revert "Reorganize admin menu and add pricing management"
2025-10-04 05:35:24 +03:00
Egor
c31da6c2ae Revert "Reorganize admin menu and add pricing management" 2025-10-04 05:35:06 +03:00
Egor
17d51ab286 Merge pull request #714 from Fr1ngg/bedolaga/reorganize-admin-panel-menu-t36ykc
Reorganize admin menu and add pricing management
2025-10-04 05:33:40 +03:00
Egor
e576cb97ec feat: reorganize admin menu with pricing section 2025-10-04 05:33:25 +03:00
Egor
217fed9c9c Merge pull request #713 from Fr1ngg/revert-712-bedolaga/reorganize-admin-panel-menu-mzg1j9
Revert "Refactor admin menu for servers and pricing management"
2025-10-04 05:33:14 +03:00
Egor
030f4efbe1 Revert "Refactor admin menu for servers and pricing management" 2025-10-04 05:33:06 +03:00
Egor
33b3828abc Merge pull request #712 from Fr1ngg/bedolaga/reorganize-admin-panel-menu-mzg1j9
Refactor admin menu for servers and pricing management
2025-10-04 05:30:27 +03:00
Egor
f2876fd02c Refactor admin menu for servers and pricing management 2025-10-04 05:30:08 +03:00
Egor
ee9ba71f3c Merge pull request #711 from Fr1ngg/revert-710-bedolaga/reorganize-admin-panel-menu
Revert "Reorganize admin panel pricing and server controls"
2025-10-04 05:29:48 +03:00
Egor
6a5d5d960f Revert "Reorganize admin panel pricing and server controls" 2025-10-04 05:29:41 +03:00
Egor
910409cdfb Merge pull request #710 from Fr1ngg/bedolaga/reorganize-admin-panel-menu
Reorganize admin panel pricing and server controls
2025-10-04 05:27:32 +03:00
Egor
d78b36b60e Add dedicated pricing management section to admin panel 2025-10-04 05:27:10 +03:00
Egor
bf591f55ea Merge pull request #708 from Fr1ngg/bedolaga-hw3yna
feat: enhance admin settings control panel
2025-10-04 04:49:29 +03:00
Egor
99aa09349e feat: enhance admin settings control panel 2025-10-04 04:49:15 +03:00
Egor
a391b635ed Merge pull request #707 from Fr1ngg/revert-704-bedolaga-8nay3u
Revert "Complete bot configuration dashboard actions"
2025-10-04 04:48:54 +03:00
Egor
4f1ff34dce Revert "Complete bot configuration dashboard actions" 2025-10-04 04:47:38 +03:00
Egor
9a23a305b5 Merge pull request #706 from Fr1ngg/revert-705-bedolaga/add-alembic-migration-for-system_settings_history-table
Revert "Add migration for system settings history audit table"
2025-10-04 04:47:20 +03:00
Egor
539e7e9066 Revert "Add migration for system settings history audit table" 2025-10-04 04:47:12 +03:00
Egor
6b1173a1b5 Merge pull request #705 from Fr1ngg/bedolaga/add-alembic-migration-for-system_settings_history-table
Add migration for system settings history audit table
2025-10-04 04:39:02 +03:00
Egor
23f8e158ad Add migration for system settings history audit table 2025-10-04 04:38:44 +03:00
Egor
578061be8c Merge pull request #704 from Fr1ngg/bedolaga-8nay3u
Complete bot configuration dashboard actions
2025-10-04 04:24:00 +03:00
Egor
84816b84e7 Complete bot configuration dashboard actions 2025-10-04 04:23:41 +03:00
Egor
0ad2f5bb8a Merge pull request #703 from Fr1ngg/revert-702-bedolaga-1gwn05
Revert "Implement admin bot configuration experience"
2025-10-04 04:23:22 +03:00
Egor
e415b4b2ee Revert "Implement admin bot configuration experience" 2025-10-04 04:23:14 +03:00
Egor
7d6ecaaa1b Merge pull request #702 from Fr1ngg/bedolaga-1gwn05
Implement admin bot configuration experience
2025-10-04 04:21:20 +03:00
Egor
588461c53a Implement admin bot configuration experience 2025-10-04 04:21:01 +03:00
Egor
25c23bd653 Merge pull request #701 from Fr1ngg/revert-700-bedolaga-i1q6pf
Revert "feat: enrich bot configuration admin panel"
2025-10-04 04:20:45 +03:00
Egor
1a033de259 Revert "feat: enrich bot configuration admin panel" 2025-10-04 04:20:36 +03:00
Egor
850f8d2b2e Merge pull request #700 from Fr1ngg/bedolaga-i1q6pf
feat: enrich bot configuration admin panel
2025-10-04 04:15:48 +03:00
Egor
39374095eb feat: enrich bot configuration admin panel 2025-10-04 04:15:31 +03:00
Egor
f4fe8913fa Merge pull request #699 from Fr1ngg/revert-698-bedolaga/add-subscription-plan-menu-in-admin-panel
Revert "Add admin tariffs menu scaffolding"
2025-10-04 03:48:07 +03:00
Egor
9a5203770b Revert "Add admin tariffs menu scaffolding" 2025-10-04 03:47:57 +03:00
Egor
64b0f5161c Merge pull request #698 from Fr1ngg/bedolaga/add-subscription-plan-menu-in-admin-panel
Add admin tariffs menu scaffolding
2025-10-04 02:40:28 +03:00
Egor
8e12609746 Add admin tariffs menu scaffolding 2025-10-04 02:39:16 +03:00
Egor
7b238a32b4 Merge pull request #696 from Fr1ngg/main
w
2025-10-04 00:40:34 +03:00
Egor
c72fa990fa Merge pull request #694 from Legacyyy777/DEV
Мулен правки 2
2025-10-04 00:39:28 +03:00
Egor
f8fc929cbf Merge pull request #695 from Fr1ngg/bedolaga/update-install_bot.sh-for-docker-compose
Add Docker Compose pull update option and display container status
2025-10-04 00:38:58 +03:00
Egor
744aaeb5d6 feat: add docker compose pull update 2025-10-04 00:38:34 +03:00
Legacyyy777
515088ff45 Merge branch 'Fr1ngg:main' into DEV 2025-10-04 02:33:07 +05:00
Legacyyy777
96b64df989 Добавлен return после цикла async for db in get_db().
Добавлена обработка случая, когда не удается получить соединение с БД.
2025-10-04 02:32:04 +05:00
Egor
f51c22c67e Merge pull request #693 from Fr1ngg/dev2
Dev2
2025-10-04 00:19:03 +03:00