rms/Marzban
1
0
Fork 0
mirror of https://github.com/Gozargah/Marzban.git synced 2026-05-17 08:35:56 +03:00
Code Issues Packages Projects Releases Wiki Activity
1,337 Commits 2 Branches 31 Tags
master
Commit Graph

79 Commits

Author SHA1 Message Date
Nikita Korotaev
ff663266be add HAPP proxy app custom json (#1549) 2024-12-29 21:38:47 +03:30
v-kamerdinerov
036fb114a9 Add UVICORN_SSL_CA_TYPE 2024-10-21 21:35:59 +03:00
Mohammad
262a33f441 fix: default value for NOTIFY_REACHED_USAGE_PERCENT and NOTIFY_DAYS_LEFT 2024-10-21 16:06:08 +03:30
Mohammad
1da862ccdb feat(webhook): send multiple webhook for user usages 2024-10-18 14:36:27 +03:30
Nikita Korotaev
8ebd84fffd dynamic dashboard path 
DASHBOARD_PATH = "/dashboard/"
 2024-10-12 09:48:34 +00:00
Random Guy
f0a7e21873 fix: wrong spell for ALLOWED_ORIGINS 2024-09-04 11:49:49 +03:30
Erfan
ae5b6a68e4 chore: change login white list name 2024-09-03 21:53:23 +03:30
Random Guy
8695b8c644 Revert "Chore: remove MASTER_SERVER_USAGE_RATIO" 
This reverts commit a28714769b.

Revert "Merge pull request #1284 from erfjab/mainserverusage"

This reverts commit d4e2be5307, reversing
changes made to c2c98b76b9.
 2024-09-02 11:52:59 +03:30
Erfan
a28714769b Chore: fix env value 2024-09-02 06:36:15 +03:30
Erfan
041b81059e Feat(users): add master server usage ratio 2024-09-02 05:23:49 +03:30
Erfan
eef969378e Merge remote-tracking branch 'upstream/dev' into refapi 2024-09-02 04:25:45 +03:30
erfjab
b6d2658e56 Feat: add Whitelist of IPs/hosts to disable login notifications 2024-09-02 02:25:54 +03:30
Erfan
74c38485be Merge pull request #1206 from loghmanb/Setup-CORS-policies 
Setup-CORS-policies
 2024-08-31 01:22:03 +03:30
SaintShit
2d50bf94ff feat: variables to set jobs interval 
JOB_CORE_HEALTH_CHECK_INTERVAL
JOB_RECORD_NODE_USAGES_INTERVAL
JOB_RECORD_USER_USAGES_INTERVAL
JOB_REVIEW_USERS_INTERVAL
JOB_SEND_NOTIFICATIONS_INTERVAL
 2024-08-05 23:01:15 +03:30
SaintShit
cea7f2f706 feat: SQLALCHEMY_POOL_SIZE and SQLIALCHEMY_MAX_OVERFLOW variables 2024-08-05 22:46:02 +03:30
SaintShit
cb7aa7a8d5 fix: remove RANDOMIZE_SUBSCRIPTION_CONFIGS 2024-08-04 13:59:19 +03:30
Saint~Shit
9a7985a75d Merge pull request #1204 from M03ED/dev 
some fix and sync with new xray version
 2024-08-04 13:42:10 +03:30
SaintShit
530649d695 fix: NOTIFY_DAYS_LEFT 2024-08-04 13:38:46 +03:30
loghmanb
6f349c6e25 add allowed origins to CORS-middleware 2024-07-31 11:52:39 +01:00
Random Guy
c63f95a7c2 fix: false config as external config 2024-07-31 13:16:45 +03:30
SaintShit
e611ed51ee Merge branch 'dev' of gozargah:Gozargah/Marzban; branch 'custom-outbound-detail' of github.com:M03ED/Marzban into M03ED-custom-outbound-detail 2024-07-29 12:47:37 +03:30
Random Guy
94a3f28198 feat(subscription): add settings template for clash 2024-07-23 21:32:10 +03:30
Random Guy
715ead489c Merge branch 'dev' into custom-outbound-detail 2024-07-22 17:35:36 +03:30
Random Guy
68a79364fb chore(subscription): customizeable config detail for v2ray- json and sing-box 2024-07-22 17:32:00 +03:30
ErfJab
3f5e55e2ec Ability to customize all notifications 2024-07-21 00:52:51 +03:30
SaintShit
2d120a5f9c fix: permanent report_login 2024-07-19 09:55:33 +03:30
SaintShit
ad5b05dc18 Merge branch 'login-notive' of github.com:erfjab/Marzban into erfjab-login-notive 2024-07-19 09:47:05 +03:30
ErfJab
94daa58fb2 add External config to import into v2ray format sub 2024-07-16 12:22:54 +03:30
Alireza Jafari
d3856b4c73 Merge branch 'dev' into delete-expired-users 2024-07-12 16:17:54 +03:30
ErfJab
d23f95f2c8 update login (add client ip and becoming optional 2024-07-11 01:55:35 +03:30
Random Guy
20739589aa feat(subscription): random user agent for grpc 2024-07-04 13:42:14 +03:30
Erfan
f5c8f1cd78 change RANDOMIZE_SUBSCRIPTION_CONFIGS name config.py 2024-07-03 15:33:58 +03:30
Erfan
1bdc60ee51 add random sub configs status to config.py 2024-07-03 12:42:19 +03:30
Random Guy
b2851335e3 Merge branch 'dev' into 1.8.11 2024-07-01 17:56:41 +03:30
SaintShit
c585b050c1 feat: custom config for streisand 2024-06-28 01:41:12 +03:30
SaintShit
94f4955676 Merge branch 'optional-custom-json' of github.com:fodhelper/Marzban into fodhelper-optional-custom-json 2024-05-19 12:25:43 +03:30
thenorthatlantic
43a669c7cb Optional json sub (#890) 2024-05-19 12:03:20 +03:30
Alireza Jafari
1f7dd1fced Users auto-delete implemented. 
TODO:
 - Send notifications
 2024-05-03 21:54:40 +03:30
fodhelper
202bf93c60 Update config.py 2024-04-04 02:34:12 +01:00
fodhelper
2af5b9a17d Add STATUS_TEXT to Hosts variables (#898) 
* Update config.py

* Update .env.example

* Update share.py

* Update HostsDialog.tsx

* Update zh.json

* Update zh.json

* Update ru.json

* Update ru.json

* Update fa.json

* Update fa.json

* Update en.json

* Update en.json

* Update HostsDialog.tsx
 2024-04-01 16:42:11 +03:30
Random Guy
21d7033b56 Feat(Subscription): Add fragment and v2ray json outbound support 2024-02-19 22:57:48 +03:30
SaintShit
db132b25fc fix: empty WEBHOOK_ADDRESS 2024-02-11 17:50:06 +03:30
Flay2fx
839be83f0e Singbox mux (#778) 
* add max early data

max early data for ws in sing-box sub

* fix host in http transport

* add mux in singbox sub
 2024-02-03 21:15:46 +03:30
Random Guy
f5e425d5b3 Sending Webhook To Multi Server (#771) 2024-02-03 21:01:04 +03:30
Mohammad20000
73ce8a9947 Add dynamic subscription path 2023-12-28 16:35:47 +03:30
Atomic8oy
b68c5586ad Added discord log report 2023-10-15 23:55:00 +03:30
Saint~Shit
b97ded84cf Merge pull request #520 from kastov/sub-info 
Custom update interval and new variables for subscription
 2023-09-14 13:00:52 +03:30
M03ED
e9de0e1dbe Add Sing_box Support 2023-09-13 23:15:35 +03:30
kastov
cb0fdb9c0c Add subscription headers 
Add following headers:
- Support-Url
- Profile-Web-Page-Url
- Profile-Title
New .env variables SUB_PROFILE_TITLE, SUB_SUPPORT_URL, SUB_UPDATE_INTERVAL
 2023-09-06 00:21:11 +03:00
govfvck
21dd90b4a3 Fix webhook notifications 2023-08-21 00:47:33 +03:30