Commit Graph

  • 99c9374a9c chore(ci): delete usage of EMQX_DEPS_DEFAULT_VSN Zaiming Shi 2021-02-12 14:47:22 +0100
  • 3863b7f116 fix(config): Quote config string values Zaiming Shi 2021-02-12 11:13:19 +0100
  • d11487268e Merge remote-tracking branch 'origin/dev/v4.3.0' into resolve-conflict-v4.3.0-to-v5.0 Zaiming Shi 2021-02-12 10:34:06 +0100
  • 12568c8c74
    Merge pull request #4173 from zmstone/refactor-relocate-management-and-dashboard Zaiming Shi 2021-02-12 10:20:47 +0100
  • 23b66c0fd5 chore(rebar.config.erl): wildcard only one level for include dir Zaiming Shi 2021-02-10 22:25:16 +0100
  • e7785a63ee fix(scripts): update scripts to work with new lib-opensource dir Zaiming Shi 2021-02-10 22:24:41 +0100
  • 8f477e8411 refactor(proj): Move opensource apps to lib-opensource Zaiming Shi 2021-02-10 22:09:41 +0100
  • 6f736a79b7 chore(script): Allow compare base to be a commit sha1 hash Zaiming Shi 2021-02-11 15:35:37 +0100
  • 507759b9f1 Revert "refactor(emqx_modules): Move modules config to app dir" Zaiming Shi 2021-02-11 15:19:40 +0100
  • 7bf0097330
    Merge pull request #4140 from HJianBo/unify_pgsql_conf JianBo He 2021-02-11 15:51:09 +0800
  • 2b4906b47d
    Merge branch 'dev/v4.3.0' into unify_pgsql_conf JianBo He 2021-02-11 15:50:43 +0800
  • 514c2c0af5
    Merge pull request #4169 from zmstone/refactor-move-modules-config-to-emqx-modules-app Zaiming Shi 2021-02-10 09:03:04 +0100
  • e80959ea2f
    Merge pull request #4165 from zmstone/chore-merge-enterprise-configs dev/e4.3.0 Zaiming Shi 2021-02-10 08:27:56 +0100
  • 8bf763b72b
    Merge pull request #4167 from zmstone/fix-tls-ensure-tls-config-integrity Zaiming Shi 2021-02-10 08:26:46 +0100
  • d74bb81ff1 chore(style): make elvis happy Zaiming Shi 2021-02-09 23:29:16 +0100
  • 9cae8784c0 refactor(emqx_modules): Move modules config to app dir Zaiming Shi 2021-02-09 23:10:47 +0100
  • f000b6583c fix(tls): Ensure tls config integrity Zaiming Shi 2021-02-09 10:49:35 +0100
  • 5ebf94a50a chore(config): One config Zaiming Shi 2021-02-09 09:19:08 +0100
  • 2fa1d9d10b
    Merge pull request #4168 from emqx/dev/v4.3.0 Zaiming Shi 2021-02-09 21:28:09 +0100
  • 2852ac79d4 feat(tls): Add a tls lib module Zaiming Shi 2021-02-09 20:37:54 +0100
  • 1f10160fa2
    Merge pull request #4158 from zmstone/refactor-move-emqx-modules-to-extra-src-dir Zaiming Shi 2021-02-09 14:48:38 +0100
  • a2d3b413a6
    Merge pull request #4151 from emqx/v4.3.0-to-v5.0-resolve-tls-config-conflicts Zaiming Shi 2021-02-09 14:02:46 +0100
  • 4756eb7e5f
    Merge branch 'dev/v5.0' into v4.3.0-to-v5.0-resolve-tls-config-conflicts Zaiming Shi 2021-02-09 09:37:19 +0100
  • 353ceafbb6 fix(telemtry): report only in official version zhouzb 2021-02-09 10:46:48 +0800
  • e4d3702f15 feat(apps): Ensure emqx_modules started before dependent apps Zaiming Shi 2021-02-08 22:03:18 +0100
  • 7aff861f9b refactor(emqx_modules): Move emqx_modules to lib-opensource Zaiming Shi 2021-02-07 22:55:10 +0100
  • f879e8e09b
    Merge pull request #4159 from jovdipp/all-versions-ciphers-update-wss Zaiming Shi 2021-02-08 20:41:58 +0100
  • 6decc188e0 fix(wss-ciphers): cross version ciphers for 1.3,1.2,1.1 Jóvan S. Dippenaar 2021-02-08 20:29:17 +1300
  • c463e12d36
    Merge pull request #4154 from zmstone/chore-etc-delete-emqx.d Zaiming Shi 2021-02-06 21:56:49 +0100
  • 2dce719bc7 chore(etc): Delete etc/emqx.d Zaiming Shi 2021-02-06 21:25:16 +0100
  • 0cf8380822 chore(apps): Sync plugins to apps dir enterprise Zaiming Shi 2021-02-04 23:21:44 +0100
  • 7c94a02bdd
    Merge pull request #4134 from jovdipp/tlsv1.3-as-default Zaiming Shi 2021-02-05 21:33:03 +0100
  • 70a490114d fix(rulesql): proc cassandra cql with apostrophes failed Shawn 2021-02-05 10:59:58 +0800
  • 145958a178 test(emqx-ct-helpers): version upgrade 1.3.5 Jóvan S. Dippenaar 2021-02-04 16:15:44 +1300
  • 90c02f1116 test(emqx_exporto): refactored ssl ciphers call for ct_helpers update Jóvan S. Dippenaar 2021-02-04 16:13:59 +1300
  • 5e15e3add8 fix(default-config-tls-ciphers): TLS1.3 exclusive ciphers prepended to TLS1.1+TLS1.2 ciphers Jóvan S. Dippenaar 2021-02-03 17:12:23 +1300
  • 6541c589ab test(tls1.3): Tests for default ssl config, as well as specific tls versions ( 1.1, 1.2, 1.3 ) Jóvan S. Dippenaar 2021-02-02 19:49:11 +1300
  • a2fa84255f
    fix(rulesql): proc_sql_param_str incorrect with apostrophes #4135 (#4137) Shawn 2021-02-05 10:41:54 +0800
  • 55253f914c
    Merge pull request #4149 from emqx/dev/v4.3.0 Zaiming Shi 2021-02-04 23:17:10 +0100
  • c30666ee26
    fix(rule-engine): remove plugin_template (#4146) wwhai 2021-02-04 17:01:37 +0800
  • aadd1ba11a
    add shellcheck to ci (#4126) Yudai Kiyofuji 2021-02-04 16:51:48 +0900
  • daa9648db5 chore(ci): delete the ssl version configuration JianBo He 2021-02-04 15:30:25 +0800
  • c3642c5c83 refactor(pgsql): set the default ssl version to tlsv1.3,tlsv1.2,tlsv1.1 JianBo He 2021-02-04 15:29:00 +0800
  • 045bc02ec9 test(ci): add proptests chekcing to the makefile JianBo He 2021-02-01 14:47:18 +0800
  • 52c747ca6b chore(cover): add coverall back JianBo He 2021-02-01 12:06:30 +0800
  • 6dd833c0ac docs: update contributing guidelines and add pr template zhanghongtong 2021-01-30 17:47:58 +0800
  • 7f349d814e test(ci): unify the pgsql confs JianBo He 2021-02-03 17:03:16 +0800
  • 3e1b6394f2
    Merge pull request #4131 from emqx/dev/v4.3.0 Zaiming Shi 2021-02-02 20:05:43 +0100
  • 8954fffe2a test(ci): add proptests chekcing to the makefile add_coverall JianBo He 2021-02-01 14:47:18 +0800
  • 49a59ea564 chore(cover): add coverall back JianBo He 2021-02-01 12:06:30 +0800
  • a310cd3278 chore(CI): update aws cli download url zhanghongtong 2021-01-30 14:32:03 +0800
  • 6eff70a646
    fix(rule-engine): reply 500 when update resource failed (#4120) wwhai 2021-02-01 09:47:08 +0800
  • c3c28f4b72 feat(tls.13): tls1.3 ciphers set in .conf's Jóvan Dippenaar 2021-01-31 18:38:34 +1300
  • 94e8a69a48 docs(typos): vefify -> verify Jóvan Dippenaar 2021-01-31 17:27:08 +1300
  • 6c1129dc6a
    Auto-pull-request-on-2021-01-29 (#4114) e4.2.4 emqx-ci-robot 2021-01-30 10:30:18 +0800
  • 237998bba4
    Merge pull request #4117 from zmstone/merge-4.3-alpha.1-to-5.0 Zaiming Shi 2021-01-29 15:15:37 +0100
  • 4e19e99ec4 Merge tag 'v4.3-alpha.1' into merge-4.3-alpha.1-to-5.0 Zaiming Shi 2021-01-29 15:12:37 +0100
  • fc14e86829
    Merge pull request #4116 from z8674558/merge430 Zaiming Shi 2021-01-29 14:46:47 +0100
  • a3206f5e0b fix(rule-engine): reformat code style v4.3-alpha.1 4.3-alpha.1 wwhai 2021-01-29 18:58:55 +0800
  • 38eb849ef0 fix(mysql): upgrade mysql to 1.7.1 for TLS supporting JianBo He 2021-01-29 17:01:45 +0800
  • d78b2b23c1 chore(build): update pkg version zhanghongtong 2021-01-29 15:32:41 +0800
  • 1aefee01c2 chore(mgmt): remove needless lines JianBo He 2021-01-29 17:57:12 +0800
  • a6e532779b chore(mongo): quote example z8674558 2021-01-29 18:01:00 +0900
  • fd1a53b45e fix(cts): fix config file path in sed z8674558 2021-01-29 18:00:38 +0900
  • 3973c93534 fix(rule-engine): remove unused code wwhai 2021-01-29 16:43:38 +0800
  • e8729fb00e Merge branch 'dev/v5.0' of private:emqx/emqx into merge430 z8674558 2021-01-29 17:11:12 +0900
  • 5b4c886b16
    Merge pull request #4107 from emqx/resove-master-to-4.3-conflict Zaiming Shi 2021-01-29 08:34:35 +0100
  • 02fb66f4ce
    Merge branch 'dev/v4.3.0' into resove-master-to-4.3-conflict Zaiming Shi 2021-01-29 08:33:20 +0100
  • 9140eafd94 chore(docker): Start emqx in foreground mode in docker container Zaiming Shi 2021-01-28 19:47:51 +0100
  • 64e7056f3f chore(script): Add a help script to test clustering with docker Zaiming Shi 2021-01-28 19:46:37 +0100
  • 7072355bc1 fix(rule-engine): fix test failure wwhai 2021-01-29 14:15:28 +0800
  • 73655369af fix(rule-engine): reformat some code wwhai 2021-01-29 11:28:38 +0800
  • d13a33463f chore(bin/emqx): set program name Zaiming Shi 2021-01-28 13:54:50 +0100
  • cf23d9efe9 chore(bin/emqx): Do not rely on beam.smp program name Zaiming Shi 2021-01-28 13:34:38 +0100
  • 730d09f874
    fix(http): upgrade ehttpc to 0.1.2 (#4093) tigercl 2021-01-29 09:35:08 +0800
  • 472b8bf42e chore(CI): cancel the tls test for mysql zhanghongtong 2021-01-28 20:41:44 +0800
  • 3a0f6a68be chore(docker): fix some error zhanghongtong 2021-01-28 18:11:59 +0800
  • 5878950dc3
    feat(websocket): support for checking subprotocols (#4099) tigercl 2021-01-28 20:42:57 +0800
  • 469afbd8bb chore(docker): update to use alpine 3.12 Zaiming Shi 2021-01-28 10:45:06 +0100
  • 5d5617a911 chore(docker): Update port export discriptions Zaiming Shi 2021-01-28 10:44:43 +0100
  • f0993c6b0f
    chore(style): improve the codes style wwhai 2021-01-28 20:01:59 +0800
  • 6a83cf3f35 chore(format): format some code zhanghongtong 2021-01-27 22:52:46 +0800
  • e283a3d165 docs(README.md): update Community section CrazyWisdom 2021-01-28 16:48:52 +0800
  • af73516c59 docs(README.md): update Community section v4.2.7 4.2.7 CrazyWisdom 2021-01-28 16:48:52 +0800
  • 456e3e5faa chore(bridge-mqtt): fix styles JianBo He 2021-01-28 10:28:16 +0800
  • d98d26942c fix(bridge-mqtt): add max_inflight_size option back JianBo He 2021-01-28 09:29:38 +0800
  • 9d465ac81f chore(deps): upgrade replayq to 0.3.1 JianBo He 2021-01-28 09:29:02 +0800
  • e96d03dc1b
    Merge pull request #4087 from zmstone/fix-auth-ldap Zaiming Shi 2021-01-28 08:51:08 +0100
  • 903eadad57 fix(ci): wait for emqx in mac test Zaiming Shi 2021-01-27 23:17:23 +0100
  • c422b200be
    Merge pull request #4088 from emqx/dev/v4.3.0 Zaiming Shi 2021-01-27 22:02:52 +0100
  • d38b626579 fix(emqx_coap_ps_resource): Copy uri decode code from OTP-22 Zaiming Shi 2021-01-27 19:19:38 +0100
  • e6235d3bc9 fix(scheme): fix default scheme zhouzb 2021-01-27 19:19:15 +0800
  • 92d307b1b3 fix(scheme): update test case zhouzb 2021-01-27 19:03:33 +0800
  • 45aafc75dd fix(scheme): using uri_string:normalize/1 zhouzb 2021-01-27 18:59:45 +0800
  • 311df2f8a6 fix(scheme): fix scheme parsing zhouzb 2021-01-27 18:47:27 +0800
  • a631a2d64f fix(ssl): fix ssl option zhouzb 2021-01-27 18:31:56 +0800
  • f42e52e84e fix(auth_pgsql): Add back econnrefused error clause Zaiming Shi 2021-01-27 19:07:34 +0100
  • b5c435e211 fix(rule-engine): add format space wwhai 2021-01-27 23:14:45 +0800
  • fc71285c3f fix(auth_ldap): do not load plugin when no params configured Zaiming Shi 2021-01-27 12:27:58 +0100
  • 689b530b4f chore(auth-http): remove needless test case zhanghongtong 2021-01-27 18:44:12 +0800