Commit Graph

3130 Commits

Author SHA1 Message Date
Egor ce22df4d60 Update inline.py 2025-09-20 02:45:49 +03:00
Egor 7c4567ae70 Merge pull request #150 from Fr1ngg/dev3
Фиксы покупки подписки в апдейте с локалью
2025-09-20 02:24:19 +03:00
Egor af1125f6ed Merge pull request #151 from Fr1ngg/codex/fix-subscription-country-change-issue
Fix NameError in manage countries keyboard
2025-09-20 02:23:54 +03:00
Egor ee65e65108 Fix missing texts initialization in manage countries keyboard 2025-09-20 02:23:20 +03:00
Egor 5c1f7d54ba Merge pull request #149 from Fr1ngg/codex/fix-subscription-purchase-button-issue
Fix subscription checkout resume callbacks registration
2025-09-20 02:15:48 +03:00
Egor 21e5af9e9e Fix subscription checkout resume callbacks registration 2025-09-20 02:15:38 +03:00
Egor f7d674adf4 Merge pull request #148 from Fr1ngg/codex/fix-subscription-purchase-error
Add missing localization for subscription checkout button
2025-09-20 02:09:10 +03:00
Egor 5a7de9731a Add missing subscription checkout localization 2025-09-20 02:08:10 +03:00
Egor f987dc2716 фикс регистрации
Dev3
2025-09-20 01:58:14 +03:00
Egor bbdc1274e4 Merge pull request #146 from Fr1ngg/codex/fix-registration-issue-for-new-users-1a7pwj
Fix async rules loading for new users
2025-09-20 01:49:46 +03:00
Egor feb95fe105 Fix async rules loading for new users 2025-09-20 01:49:29 +03:00
Egor 91b0d3782a Merge pull request #131 from yazhog/feature/locale
Feature/locale
2025-09-20 01:02:40 +03:00
Legacyyy777 d297e9b6d1 Add deploy workflow 2025-09-19 22:08:52 +05:00
yazhog 6d613cab85 Merge pull request #41 from yazhog/codex/set-device-limit-on-subscription-upgrade
Ensure trial-to-paid upgrade defaults to paid device limit
2025-09-19 19:17:09 +03:00
yazhog a0b6aa13a3 Adjust default device selection when upgrading from trial 2025-09-19 18:28:36 +03:00
yazhog a794f5da70 Merge pull request #40 from yazhog/codex/add-localization-for-campaign-keys
Add campaign localization strings to internal locales
2025-09-19 18:06:47 +03:00
yazhog e571edb354 Remove legacy YAML locale files 2025-09-19 18:06:37 +03:00
yazhog 84dece39a7 Add campaign localization strings to internal locales 2025-09-19 18:04:28 +03:00
yazhog f49bf21caa Merge branch 'main' into feature/locale 2025-09-19 18:03:17 +03:00
Egor 64da0ef94f Merge pull request #142 from Fr1ngg/dev3
Правки в меню редактирования профиля юзера
2025-09-19 15:48:46 +03:00
Egor 3177b5ab80 Merge pull request #141 from Fr1ngg/codex/refactor-user-edit-menu-for-subscriptions
Unify admin subscription and settings menu
2025-09-19 15:36:55 +03:00
Egor ec1b459689 Unify admin subscription and settings menu 2025-09-19 15:36:11 +03:00
Egor 08f7f87035 Merge pull request #140 from Fr1ngg/main
w
2025-09-19 15:25:12 +03:00
Egor 59189cae2a Merge pull request #114 from Gy9vin/dev
Добавлена фильтрация пользователей по балансу
2025-09-19 15:16:26 +03:00
Egor 573dcd034a Merge pull request #138 from Fr1ngg/dev_test
Редактирование РК + фикс удаления
2025-09-19 13:40:12 +03:00
Egor 0f29a8a33b Merge pull request #137 from Fr1ngg/codex/fix-editing-of-ad-campaigns
Fix campaign edit menu for captioned messages
2025-09-19 13:36:38 +03:00
Egor 98ec7e4165 Fix campaign edit menu for captioned messages 2025-09-19 13:36:27 +03:00
Egor 46c7d53f6e Merge pull request #136 from Fr1ngg/revert-135-codex/fix-campaign-deletion-and-add-editing-yipzjx
Revert "Handle campaign edit menu for media messages"
2025-09-19 13:27:07 +03:00
Egor 61758b8c2a Revert "Handle campaign edit menu for media messages" 2025-09-19 13:26:54 +03:00
Egor 42ac9555ac Merge pull request #135 from Fr1ngg/codex/fix-campaign-deletion-and-add-editing-yipzjx
Handle campaign edit menu for media messages
2025-09-19 13:25:20 +03:00
Egor f7416f2255 Merge branch 'dev_test' into codex/fix-campaign-deletion-and-add-editing-yipzjx 2025-09-19 13:25:12 +03:00
Egor 509c92217f Fix campaign edit menu fallback for non-text messages 2025-09-19 13:23:30 +03:00
Egor c0d5ae1e9e Merge pull request #134 from Fr1ngg/codex/fix-campaign-deletion-and-add-editing
Fix campaign deletion confirmation and add editing workflow
2025-09-19 13:15:35 +03:00
Egor cf9fbc5ccc Fix campaign deletion confirmation and add editing workflow 2025-09-19 13:15:17 +03:00
gy9vin ad19be83d2 Merge branch 'dev' of https://github.com/Gy9vin/remnawave-bedolaga-telegram-bot into dev 2025-09-19 13:14:00 +03:00
yazhog 3dd5e41bda Merge pull request #39 from yazhog/codex/fix-syntaxerror-in-subscription.py
Fix subscription success text formatting
2025-09-19 12:38:27 +03:00
yazhog 639a45611e Fix subscription success text formatting 2025-09-19 12:38:08 +03:00
Egor 773299c317 Merge pull request #130 from Fr1ngg/dev_test
Рекламные компании
2025-09-19 12:34:53 +03:00
yazhog ff39b10761 Merge pull request #38 from yazhog/codex/fix-f-string-syntaxerror-in-subscription.py
Fix trial success text formatting
2025-09-19 12:33:32 +03:00
yazhog 5fd5472fd3 Fix trial success text formatting 2025-09-19 12:33:20 +03:00
Egor adf94802b0 Merge pull request #129 from Fr1ngg/codex/add-advertising-link-functionality-to-admin-eu5f3n
Refresh user state after campaign bonuses
2025-09-19 12:30:22 +03:00
Egor 15378a412f Merge branch 'dev_test' into codex/add-advertising-link-functionality-to-admin-eu5f3n 2025-09-19 12:30:06 +03:00
Egor 32da16f652 Refresh user state after campaign bonuses 2025-09-19 12:29:28 +03:00
yazhog 075d92e4bd Merge pull request #37 from yazhog/codex/extract-text-for-localization
Localize user-facing texts and payment method copy
2025-09-19 12:28:04 +03:00
yazhog a7cbcd284c Localize subscription, referral, and payment texts 2025-09-19 12:27:42 +03:00
Egor 5682d508a3 Merge pull request #128 from Fr1ngg/codex/add-advertising-link-functionality-to-admin
Clean up campaign-related imports
2025-09-19 12:16:12 +03:00
Egor c738b5703f Fix import cleanup 2025-09-19 12:15:56 +03:00
yazhog 6875fce2cb Merge pull request #36 from yazhog/codex/locate-missing-localization-keys
Add missing English localization strings for trial activation
2025-09-19 12:09:31 +03:00
yazhog 57b7ad6732 Add missing English localizations for trial activation 2025-09-19 12:09:11 +03:00
yazhog 8377db323b Merge pull request #35 from yazhog/codex/fix-language-setting-in-interface
Respect DEFAULT_LANGUAGE in onboarding
2025-09-19 12:01:13 +03:00