Commit Graph

17153 Commits

Author SHA1 Message Date
turtled 161e5a2b5b Http publish mochiweb_request:parse_post(Req) -> Req:recv_body 2017-05-08 18:13:52 +08:00
Feng Lee 41dc80f32d Add 'SSL Socket Options' 2017-05-08 12:39:16 +08:00
Feng Lee 0bc444a96b Add 'SSL Socket Options' 2017-05-08 12:35:17 +08:00
huangdan 611ec725a0 Merge pull request #1040 from emqtt/emq22
Merge emq22 to master
2017-05-05 14:55:24 +08:00
huangdan 5b14e753d0 Merge pull request #1039 from emqtt/develop
Update SUITE conf
2017-05-05 14:54:42 +08:00
HuangDan 73d84bef5e Update SUITE conf 2017-05-05 14:53:06 +08:00
turtled 9e211b55a0 deps branch master 2017-05-04 22:31:41 +08:00
turtleDeng f730d011c4 Merge pull request #1038 from emqtt/emq22
Merge emq22 to master
2017-05-04 22:29:43 +08:00
huangdan af969a06e3 Merge pull request #1034 from emqtt/develop
Meger develop to emq22
2017-05-04 10:50:08 +08:00
turtled 1691e9a9b6 Update node name 2017-05-02 14:33:23 +08:00
turtleDeng 9a847267b0 Merge pull request #1024 from emqtt/emq22
emqttd.app.src add bcrypt
2017-04-27 09:23:44 +08:00
turtled cdbcc84d23 emqttd.app.src add bcrypt 2017-04-27 09:22:02 +08:00
turtleDeng 644186ecb2 Merge pull request #1014 from emqtt/emq22
Develop emq22
2017-04-25 10:44:32 +08:00
turtled ba0c08517f v2.2 2017-04-25 10:41:43 +08:00
Feng Lee fc1329d09a Merge pull request #1013 from emqtt/emq20
Merge emq20
2017-04-25 09:00:20 +08:00
Feng Lee c529b11bed Merge branch 'emq22' into emq20 2017-04-25 09:00:09 +08:00
Feng Lee 87d3bb1419 Merge branch 'emq22' into emq20 2017-04-25 08:59:05 +08:00
huangdan 9dd9b64687 Merge pull request #1010 from emqtt/emq20
Change subscription to subscriptions
2017-04-20 15:05:58 +08:00
huangdan 7388be0180 Merge pull request #1009 from emqtt/develop
Change subscription to subscriptions
2017-04-20 14:08:23 +08:00
HuangDan 1cfa25861f Change subscription to subscriptions 2017-04-20 14:06:56 +08:00
huangdan 2d69f7cb0c Merge pull request #1008 from emqtt/emq20
Version 2.1.2
2017-04-20 11:24:47 +08:00
huangdan a091d3a112 Merge pull request #1007 from emqtt/develop
Version 2.1.2
2017-04-20 11:21:05 +08:00
huangdan dcecd7d8ae Version 2.1.2 2017-04-20 11:19:26 +08:00
turtleDeng 7998dfc83e Merge pull request #1006 from emqtt/emq20
Version 2.1.2
2017-04-20 11:01:18 +08:00
Feng Lee 3c9cde59c7 Merge pull request #1004 from emqtt/develop
Fix crash caused by duplicated PUBREC packet
2017-04-20 10:15:30 +08:00
huangdan 6a14c7c1b9 Version 2.1.2 2017-04-20 09:48:34 +08:00
turtled 7ca6cbadcf Duplicated PUBACK Packet 2017-04-18 17:32:00 +08:00
turtled 9d3676884c Fix duplicate send pubrec packet 2017-04-18 17:19:04 +08:00
turtled aa360d4378 Fix duplicate send pubrec packet 2017-04-18 16:44:19 +08:00
huangdan 31f9161d3b Merge pull request #1003 from emqtt/emq20
Fix sessions list command
2017-04-17 10:11:42 +08:00
Feng Lee 7bbc3adfcb Merge pull request #1002 from emqtt/develop
Fix sessions list command
2017-04-17 10:02:38 +08:00
HuangDan 9157f824e5 Fix sessions list command 2017-04-15 23:52:54 +08:00
turtleDeng bf8b5c3c61 Merge pull request #997 from emqtt/emq20
Version 2.1.1
2017-04-13 16:12:41 +08:00
huangdan 455a978c96 Merge pull request #996 from emqtt/develop
Fix the subscrptions print
2017-04-13 15:10:57 +08:00
HuangDan 0cbca5f4c0 Fix the subscrptions print 2017-04-13 15:09:48 +08:00
huangdan bc280701cd Merge pull request #994 from emqtt/develop
Version 2.1.1
2017-04-13 10:26:10 +08:00
huangdan b10938c90a Version 2.1.1 2017-04-13 10:24:50 +08:00
huangdan 65c7896f7c Merge pull request #993 from emqtt/develop
Version 2.1.1
2017-04-13 10:03:20 +08:00
huangdan 6effb5fdbe Version 2.1.1 2017-04-13 10:02:32 +08:00
turtled ca676880a8 Support bcrypt 2017-04-11 16:39:52 +08:00
turtled 8d6457996c support bcrypt 2017-04-11 16:02:48 +08:00
turtled 7d618e78ff support bcrypt 2017-04-11 16:02:21 +08:00
turtleDeng 6f02d775e4 Merge pull request #991 from emqtt/develop
Support HEAD method for health check
2017-04-10 22:16:22 -05:00
turtled 5476288ab3 Merge branch 'develop' of https://github.com/emqtt/emqttd into develop 2017-04-11 09:40:46 +08:00
turtled 43cc90ceae bridge message qos default 0 2017-04-11 09:40:31 +08:00
Feng Lee e6df089ecb Fix issue #984 - support HEAD method for health check 2017-04-10 13:37:50 +08:00
turtleDeng b839fdc275 Merge pull request #986 from emqtt/emq20
merge emq20 branch code
2017-04-10 12:40:26 +08:00
Feng Lee c82bf817c3 Merge pull request #983 from emqtt/emq20
Add icon for slack channel
2017-04-06 17:53:05 +08:00
Feng Lee a17541585c Merge pull request #982 from emqtt/develop
Add icon for slack channel
2017-04-06 17:50:09 +08:00
Feng Lee a536226a0a Merge pull request #981 from CrazyWisdom/develop
README.md add slack invite url
2017-04-06 17:47:32 +08:00