Commit Graph

24 Commits

Author SHA1 Message Date
z8674558
971e6ca90e Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5 2021-04-07 20:29:08 +09:00
zhanghongtong
5e0dfe250d chore: move emqx_telemetry from apps to lib-ce 2021-04-01 14:05:03 +02:00
William Yang
b8c7c9c60b fix(cluster-webui): export emqx_modules_api:list_modules/1
Fix http.500 error when loading page:http://127.0.0.1:18083/#/modules on
a emqx cluster,
2021-03-24 21:37:11 +01:00
zhanghongtong
beac1f5f59 fix(test cases): fix test case error
ensure emqx_modues loaded before emqx_management in test cases
2021-03-19 17:02:06 +01:00
Zaiming Shi
6c106207ff
Merge pull request #4293 from emqx/master
Auto-pull-request-on-2021-03-05
2021-03-10 20:57:45 +01:00
wwhai
1ddb300a56
feat(mgmt): add http listener restart support (#4301) 2021-03-10 17:29:37 +01:00
turtleDeng
115397523d
chore(build): add more enterprise build support (#4302) 2021-03-08 20:47:31 +08:00
z8674558
efd4ef8091 Merge branch 'dev/v5.0' of private:emqx/emqx into fix-merge-conflict-master-to-5.0 2021-03-04 22:12:09 +09:00
z8674558
1504164933 chore(src): fix dialyzer warnings (match values) 2021-03-03 20:06:31 +09:00
zhanghongtong
8e5cfaf0cc chore(emqx_modules): delete plugin flag for emqx_modules 2021-03-02 18:47:09 +08:00
zhanghongtong
b53bdd1450 chore(emqx_management): remove emqx_modules dependency on emqx_management 2021-03-02 09:35:47 +08:00
zhanghongtong
28653bb457 chore(emqx_management): format code 2021-03-02 09:35:47 +08:00
zhanghongtong
baa9fd8255 chore(emqx_management): move emqx management to apps 2021-03-02 09:35:47 +08:00
zhanghongtong
24d954282d chore(emqx_management): update test case 2021-03-02 09:35:47 +08:00
zhanghongtong
033f8619eb chore(emqx_management): abstract data backup 2021-03-02 09:35:47 +08:00
zhanghongtong
4e9330a37e chore(emqx_management): merge enterprise to opensource 2021-03-02 09:35:47 +08:00
Zaiming Shi
5edef84332
Merge branch 'dev/v5.0' into fix-merge-conflict-master-to-5.0 2021-03-01 19:58:16 +01:00
tigercl
62a350949c style: remove space 2021-03-01 16:56:21 +08:00
z8674558
c52d241a06 chore(emqx_mgmt_api_listeners): return error tuple 2021-03-01 16:56:21 +08:00
z8674558
4b43b6532c chore(emqx_mgmt_api_banned): do_pack_banned takes map instead of impropr record 2021-03-01 16:56:21 +08:00
Zaiming Shi
13e8093583 Merge remote-tracking branch 'origin/dev/v4.3.0' into merge-dev-v4.3.0 2021-02-22 21:08:08 +01:00
Zaiming Shi
61c5069766 chore(build): Move emqx_telemetry back to apps 2021-02-22 20:29:27 +01:00
Zaiming Shi
c2cd2fd231 Merge remote-tracking branch 'origin/dev/v4.3.0' into dev/v5.0 2021-02-19 21:13:33 +01:00
Zaiming Shi
aed58a14ee chore(build): rename lib-opensource to lib-ce for shorter name 2021-02-19 11:54:45 +01:00