Commit Graph

6037 Commits

Author SHA1 Message Date
Zaiming (Stone) Shi b1137b8459
Merge pull request #4987 from zmstone/pin-hocon-0.5.1
fix(hocon): pin hocon 0.5.1
2021-06-15 13:15:52 +02:00
Zaiming Shi 9e7f34f328 chore: ci print erlang.log.1 2021-06-15 12:35:08 +02:00
Zaiming Shi 855705d830 chore(emqx_ctl): delete stale env variable 2021-06-15 12:35:08 +02:00
Zaiming Shi 70b6e04802 docs(docer/README): update env override prefix var name 2021-06-15 12:35:08 +02:00
Zaiming Shi c84af95190 chore: ensure new env override prefix variable 2021-06-15 12:35:08 +02:00
Zaiming Shi 9a78f812e1 fix(emqx_resource): fix schema schema definition 2021-06-15 12:35:08 +02:00
Zaiming Shi 49f844b1dd feat(bin/emqx): simlified config generation commands 2021-06-15 12:35:08 +02:00
Zaiming Shi 992221a4d3 ci: fix bad env variable name 2021-06-15 12:35:07 +02:00
Zaiming Shi bde5d11078 fix(hocon): call new schema definition functions 2021-06-15 12:35:07 +02:00
Zaiming Shi 909814a34d fix(hocon): pin hocon 0.5.1 2021-06-15 12:35:07 +02:00
zhanghongtong 8a368efb95 chore: move lib-ce to apps
Signed-off-by: zhanghongtong <rory-z@outlook.com>
2021-06-15 17:31:54 +08:00
k32 06dd83c171
Merge pull request #4991 from k32/dev/rlog0
feat(rlog): Add RLOG to EMQX
2021-06-15 10:46:45 +02:00
zhanghongtong c94d4d9a28 chore(data bridge): comment example config
Signed-off-by: zhanghongtong <rory-z@outlook.com>
2021-06-15 16:45:41 +08:00
k32 13803f9159 feat(rlog): Add RLOG to EMQX 2021-06-14 15:05:36 +02:00
Rory Z 12ad1c2f07
Merge pull request #4980 from emqx/merge-4.3-to-5.0
Merge 4.3 to 5.0
2021-06-11 13:44:56 +08:00
zhanghongtong 496d30be6a chore(appup): add appup for plugin libs 2021-06-11 11:33:57 +08:00
tigercl 55cf74f23a
Merge pull request #4844 from tigercl/feat/new-authentication
feat(new authentication): implement new auth design
2021-06-11 10:59:45 +08:00
zhanghongtong 3b21ad7225 Merge branch master into main-v4.3 2021-06-11 09:27:46 +08:00
zhouzb cbc5c64a16 chore(dialyzer): make code pass dialyzer 2021-06-10 16:18:50 +08:00
zhanghongtong 3604593b86 chore(CI): use emqx otp in mac by kerl build 2021-06-10 14:28:57 +08:00
zhanghongtong bf7ba4f615 chore(CI): fix build error when no have base upgrade package 2021-06-10 14:28:57 +08:00
tigercl d8367e599a
Merge pull request #4974 from tigercl/fix/ehttpc
fix(ehttpc): update ehttpc tag to fix bad log
2021-06-10 11:26:26 +08:00
zhouzb 2769eb7751 fix(ehttpc): update ehttpc tag to fix bad log 2021-06-10 10:49:12 +08:00
zhanghongtong 1098df815a chore(CI): fix relup error 2021-06-10 09:25:37 +08:00
zhouzb bb62b44554 feat(auth): support bcrypt 2021-06-09 18:57:08 +08:00
zhouzb ae8be5d66f feat(authentication): add a 16-byte salt in front of the password before hashing 2021-06-09 16:53:40 +08:00
zhanghongtong aa030315b3 chore(CI): replace the emqx_ctl with curl in the test script 2021-06-09 13:38:14 +08:00
zhouzb d838206a56 chore(code): add type spec 2021-06-09 11:10:03 +08:00
zhouzb 2bfb7f74df fix(jwt): fix chain interruption 2021-06-09 10:36:06 +08:00
Shawn 1de2f5cb2f fix(emqx_data_bridge): update bridge failed 2021-06-08 21:46:52 +08:00
Shawn fdd0233103 feat(emqx_resource): update the demo.md 2021-06-08 21:46:52 +08:00
Shawn 65dc2f2be8 feat(emqx_resource): remove the schema sugar from parse transformed code 2021-06-08 21:46:52 +08:00
zhouzb 0c237bf797 feat(jwt): support based encoded secret 2021-06-08 15:56:13 +08:00
zhouzb f297c36929 feat(jwt auth): support JWT auth 2021-06-08 11:40:46 +08:00
Shawn 4ecf469cbf chore(merge): Merge branch 'emqx_connector' 2021-06-08 10:01:22 +08:00
Shawn 2f720f4a17 feat(emqx_data_bridge): add license headers 2021-06-07 22:15:23 +08:00
Shawn bdf6374414 fix(emqx_resource): disable the debug print for parse-transformed code 2021-06-07 22:11:05 +08:00
Shawn 149a54cef4 fix(emqx_resource): dialyzer issues 2021-06-07 22:08:21 +08:00
Shawn 3c1c457697 fix(emqx_resource): call to undefined function hocon:richmap_to_map/1 2021-06-07 21:54:17 +08:00
Shawn 16c0a5b80a fix(emqx_resource): merge conflict 2021-06-07 21:25:19 +08:00
Shawn a37b3957e3
Merge branch 'master' into emqx_connector 2021-06-07 21:12:00 +08:00
Shawn dddab31326 fix(emqx_data_bridge): resource type to bridge type 2021-06-07 20:01:28 +08:00
Shawn e9fe345ac8 fix(emqx_data_bridge): correct the format of HTTP responses 2021-06-07 19:52:08 +08:00
turtleDeng a564e0c4bf
Merge pull request #4947 from emqx/dev/v5.0
Merge dev/v5.0 to master
2021-06-07 17:26:38 +08:00
Shawn 4914b003ac feat(emqx_resource): update the unused APIs 2021-06-07 17:20:34 +08:00
Shawn 2ff92d2880 feat(emqx_data_bridge): add HTTP APIs for data bridge 2021-06-07 16:12:06 +08:00
zhanghongtong 5d30e52e73 chore(CI): fix error for sync code to enterprise 2021-06-07 16:02:01 +08:00
zhanghongtong d5366c7f5f chore(CI): change base branch to sync enterprise 2021-06-07 15:47:37 +08:00
Zaiming (Stone) Shi c97ac8e5be
Merge pull request #4925 from zmstone/dev-v5-merge-move-emqx-to-apps
v5.0: move emqx to apps dir
2021-06-07 09:43:37 +02:00
Zaiming Shi 4ee6c82714 test(emqx_rule_engine_SUITE): delegate app start to ct-helper (2.0.0) 2021-06-07 09:09:28 +02:00