yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
16,280 Commits 393 Branches 684 Tags 74 MiB
Commit Graph

16280 Commits

Author SHA1 Message Date
Feng Lee bc2bd62c4a Merge pull request #1072 from emqtt/emq22 
Version 2.2-beta.3
 2017-05-26 21:00:16 +08:00
Feng Lee fa10394f37 Merge pull request #1071 from emqtt/develop 
Force gc call emit_stats
 2017-05-26 18:16:34 +08:00
turtled 0f7a66f810 Force gc call emit_stats 2017-05-26 16:44:44 +08:00
turtled dc2e6ab53c Hash type add bcrypt 2017-05-26 12:31:07 +08:00
turtleDeng fbe4ee4eed Merge pull request #1062 from emqtt/emq22 
Version 2.2-beta.2
 2017-05-20 11:03:40 +08:00
Feng Lee b98ea3ec8e Merge pull request #1060 from emqtt/develop 
Add a 'websocket_protocol_header' option to handle WebSocket connection from WeChat
 2017-05-19 16:59:34 +08:00
turtled c64f172174 Emq-WebSocket-Protocol -> EMQ-WebSocket-Protocol 2017-05-19 16:55:14 +08:00
turtled 414f156d4a Add websocket_protocol_header config 2017-05-19 16:46:14 +08:00
Feng Lee 0ffa2d00d0 Add a 'websocket_protocol_header' option to fix the missing 'Sec-Websocket-Protocol' header of WeChat WebSocket Connection 2017-05-19 16:41:27 +08:00
Feng Lee 1de176a887 Merge pull request #1059 from emqtt/develop 
Fixed issue #1045
 2017-05-19 14:36:39 +08:00
turtled 94402f4297 Format code 2017-05-19 10:24:36 +08:00
turtled 96562dfc59 Format code 2017-05-19 10:22:07 +08:00
turtled 9c5ce15f46 Fixed http publish API missing params 2017-05-19 10:13:01 +08:00
turtled 8d4ec32d1a Fixed http publish API missing params 2017-05-19 10:09:34 +08:00
turtled 3074a4b0ab Rollback code 2017-05-19 09:27:48 +08:00
turtled 798c60f269 Rollback code 2017-05-19 09:26:52 +08:00
turtled 61fa9f3f89 Cli listeners start add flag --backlog 2017-05-18 16:44:46 +08:00
turtled 3e1c69dff1 Add cli listeners start|stop 2017-05-18 16:35:49 +08:00
turtled caaf66311d Cli show all usage 2017-05-18 09:24:15 +08:00
turtled 95232189cd Invalid params 2017-05-17 17:15:21 +08:00
turtled 1f2cd40237 Invalid params 2017-05-17 17:12:19 +08:00
turtled 8853e43275 cli query -> show 2017-05-17 16:37:55 +08:00
turtled d5ccb9f92f Cli command support --format=json output 2017-05-17 16:27:18 +08:00
turtled 06d291e354 Update Cli command 2017-05-17 10:18:09 +08:00
turtled 2d6104fbd9 Ctl use clique 2017-05-11 16:02:38 +08:00
Feng Lee 0830fa2fa9 Merge branch 'emq22' 2017-05-09 08:54:47 +08:00
Feng Lee cac58ca9af Add emq_web_hook, emq_lua_hook plugins 2017-05-09 08:49:32 +08:00
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