Commit Graph

1784 Commits

Author SHA1 Message Date
liyang
49f1826a07 恢复设置
Former-commit-id: 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly 7d1d4807b8eafd3c988dec37bd316baf80ec10f5 [formerly fda58ba8fa5c3cdfae1de4366df5d1b3d22507b3 [formerly 481965dd045bdd23f0f3c652adb796565ecbac05]]]]]
Former-commit-id: 00db3f5c336c4f30dca75b8f99781d93633cf153
Former-commit-id: d7ce382da9d9f9d2cd11942c4a2af168a4e6c56b
Former-commit-id: 0fb053cd87d684266aca8b4853697b1c1053368a [formerly acb361a704ea067cf9d8e301d32ae556fce40bbe]
Former-commit-id: 0d527215fb720240156f1c0463134c6ed362133d
Former-commit-id: 227fe2db815a7d560fd526129b7756270f00b2ec
Former-commit-id: 6db371b0ba8b11fb9f71aa1e852cc51bc649c88d
Former-commit-id: 460c5ef5fadb48c1ae6885e145612c73da958735
Former-commit-id: 1de24c9653769294fcf3bf096f5a40b317370c7e
2018-09-10 16:12:02 +08:00
liyang
93864d15fe 格式化代码
Former-commit-id: 94aa06a61f156ce7b3279f4d1445c6da95e8d8d6 [formerly 94aa06a61f156ce7b3279f4d1445c6da95e8d8d6 [formerly 94aa06a61f156ce7b3279f4d1445c6da95e8d8d6 [formerly 94aa06a61f156ce7b3279f4d1445c6da95e8d8d6 [formerly ff538ef2a8e6d7bd1cf5465adc350ff3d601d3e4 [formerly 8ca356d0a5fbf58cd8444ab7328e7d22c8d31f16]]]]]
Former-commit-id: 4c6635e00512059d9687b95ab08a5d9b71390251
Former-commit-id: a72b64407c8d5ec88b85e9e180c370d2fbf8166b
Former-commit-id: d9d3eac1b359ef8495be85d1974f7e6152969a54 [formerly 137d2c4365e97e6f19aa84a679c89fec7d01f9c0]
Former-commit-id: ebf9c6a3eab896314dd243c2a9fbb1ec5a00c5cd
Former-commit-id: 8caccdb4d5249d5e6b0663988a917314e5be2a78
Former-commit-id: 5e6fec3a7957420680e2813e71722f94d3fd7370
Former-commit-id: ed5c457666254c09cef50a6177df495e0cbf028a
Former-commit-id: 0db1023243356d58e402a2e26c4370e7cd2c15e4
2018-09-10 15:33:23 +08:00
liyang
f218ab7df8 完成切换
Former-commit-id: 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 26205ebf26a34b47060c3685cb4d969140e94f61 [formerly 659e4b42eec3fb5106a46f8c06c4b62170e4385e [formerly 33bd817d31a89ff29b25860e8e553198f426966b]]]]]
Former-commit-id: e9c520cc0f970cf63f834a8a4f1de806465e054c
Former-commit-id: 3ab6ec0c07d8739e484ebde242beebbf761e9a11
Former-commit-id: 44e9aaa39c1d5becbfab509fcb80b15c4e11bf18 [formerly 9bf3ab07eac16679f064a20af7b5483c36b11503]
Former-commit-id: 624cbcde01906949ce2ca04c7f522fe6c078bc62
Former-commit-id: 2f0ff3c6614b44b17fba9305acd199b145f07273
Former-commit-id: 8ff08e2826218d1a3f6276f367c81f628fe38970
Former-commit-id: 2bd544a5f39a5e8c3e88082d517f33ed3f49f7f2
Former-commit-id: 45586821281ab265e08b09b1af718d30964db101
2018-09-10 15:30:32 +08:00
liyang
a86b73ddee no message
Former-commit-id: d4092359cd7230f0b6951357d032c25eaef76fbd [formerly d4092359cd7230f0b6951357d032c25eaef76fbd [formerly d4092359cd7230f0b6951357d032c25eaef76fbd [formerly d4092359cd7230f0b6951357d032c25eaef76fbd [formerly 7b709f5f323538e6939eb303eea32c82bbbe7a5e [formerly b96839f20dd4ffb15888b803e12c272016758e2c]]]]]
Former-commit-id: 547e615e1595e22d9bb5e7996cccb744d128fe59
Former-commit-id: 8a9b843a78dee90450827ac5ba6c24b99b7d8056
Former-commit-id: 40b9089ff6b54ca7b6f2d5e41e6e4c8b2a80f675 [formerly 2cf9dc04bd48bbb668cec0bcc8c18082f947d6c1]
Former-commit-id: ea60f2b4e88d57a1f8822ea17d61d43a8a39a20a
Former-commit-id: e6cf4fe547aac1462338068ddd0462bfd49587bb
Former-commit-id: b4851f8ed7bc73d5cffc6af08512fbf6b38d1b31
Former-commit-id: 3194dea90eef44d97aa7923cf50d82c2c9c06318
Former-commit-id: 68613f707ac4859e5e34a78ca9bd8d1d7ab41ae3
2018-09-08 21:01:59 +08:00
孙昊翔
e22dce64d4 添加自定义组件示例
Former-commit-id: eb890f1e76db02d8b8613650a4620e0815a2adaa [formerly eb890f1e76db02d8b8613650a4620e0815a2adaa [formerly eb890f1e76db02d8b8613650a4620e0815a2adaa [formerly eb890f1e76db02d8b8613650a4620e0815a2adaa [formerly 6c3a4338de7e3fd586a512bc3ed01607a6d35059 [formerly 82b81ed3a29d38520c9604670dc7215f1d5b5174]]]]]
Former-commit-id: 4ea2f665b597d7be5475fcc52f72d5480b861f96
Former-commit-id: 6f021dbf6acf5a37c75de9136f988bc3a145478d
Former-commit-id: 73529e2785ecda05d6975294c252f1491484f8fd [formerly bec7cf3aef63adf5fb24202468f6e860d91c2eea]
Former-commit-id: f3300f293d8c3179a3261dc198f1ac84bacfcd82
Former-commit-id: 12bb9bc4d7512f3a5b58c8c94148b514b54885e9
Former-commit-id: 23a27dc9331d432f00f415b1fde86f80a11c60a4
Former-commit-id: 3ce60f0a0c26979cefb334119093c0d984c2459d
Former-commit-id: feb82325b2b2fd15d9a0ba9df800b800bb3da0b2
2018-09-07 15:01:59 +08:00
liyang
60dc074aa1 Merge branch 'hotfix/d2_admin_ice_url' into develop
Former-commit-id: 1540c2dfbe91c6a9d5e76159fa569dae8fd48809 [formerly 1540c2dfbe91c6a9d5e76159fa569dae8fd48809 [formerly 1540c2dfbe91c6a9d5e76159fa569dae8fd48809 [formerly 1540c2dfbe91c6a9d5e76159fa569dae8fd48809 [formerly f8b4e3192614fbf98a154a8a103da608ab2ce85f [formerly cc0a43bf6c2eaf00c57f6af351d6c7883ead72e2]]]]]
Former-commit-id: 6abfba813d40b80242b3c7c7ba19f25d5383c418
Former-commit-id: 9130d953f0dbe23b1676b1645954cfe41265ff7d
Former-commit-id: 89f21565afba917d438e74239b30bbc4d2d9667c [formerly c18311f596f0d65da1adfaf50564ffc5f62f91a7]
Former-commit-id: dd0110d06a366f4c99ffd99fb42194fcd34092f6
Former-commit-id: 1880069bb75fdf8053098da9fc398824f2bacf11
Former-commit-id: 87ea8a8df09a1328f71178be13472b2c51c84f61
Former-commit-id: 32f54e526b9b086b86dae278812cf84c4099bf48
Former-commit-id: c2a6e4de4a44668cc8c045cbae4d1347719a9c03
2018-09-04 19:29:37 +08:00
liyang
104f22063b no message
Former-commit-id: a1b99c7e4a41d9735960f597e19c4b0304a15f5f [formerly a1b99c7e4a41d9735960f597e19c4b0304a15f5f [formerly a1b99c7e4a41d9735960f597e19c4b0304a15f5f [formerly a1b99c7e4a41d9735960f597e19c4b0304a15f5f [formerly 658ee023735af852a4989aef66604e53e548e10b [formerly bf044202fef42a531c6c4d0ae41a31aca5707391]]]]]
Former-commit-id: 175b27494a6dfc459ac684487f18440efa47a593
Former-commit-id: 49b500e3121ccdf622540af68c3f8176b990490d
Former-commit-id: a01afb53326871d17346400e59224b55fa51368e [formerly 2ac4922c5c9cbb7e1bf876c4d6f74eafd595e3a7]
Former-commit-id: e1638422263bd6062487c8753c5f0e900270a3bf
Former-commit-id: 01e658c5005f51d9f57a66637698755b301a2e7f
Former-commit-id: 35fa1565f62410042d95af7bedb5ca9f2d7f880a
Former-commit-id: 2c846e118a4e1d58186422a204ede33fe85d557f
Former-commit-id: 0cba431a27aa6a579afe33bccdb744ae45727464
2018-09-04 19:29:29 +08:00
liyang
a55733538a Merge branch 'hotfix/d2_admin_gitee' into develop
Former-commit-id: 821a4723c7ea58ea7e3267c52254cd2731aef40a [formerly 821a4723c7ea58ea7e3267c52254cd2731aef40a [formerly 821a4723c7ea58ea7e3267c52254cd2731aef40a [formerly 821a4723c7ea58ea7e3267c52254cd2731aef40a [formerly 45196f2405c9ece93fe0cf7844c1288ccd0f21d1 [formerly 2fdf72dc63144c3a1f7f154c1f994d0baf01ebaa]]]]]
Former-commit-id: 700ce332fed235cc4f03ebed86e9d0a60122c2da
Former-commit-id: e5ea8d75ca1e7e286ffdc7d21b919e5fba044216
Former-commit-id: a05a2ba5ac373ca88ddf03aad79276cc02d3c574 [formerly 03b35d52dde2e6a3dbafb1b2173ffcce6177a56d]
Former-commit-id: ccea0eb5aaf0c3b4f6367789cf8fe0adb9dcb4da
Former-commit-id: a0c35ad44916135c938338ef717cd56842fdfc23
Former-commit-id: 6cd029482e44e8a089cc408284b270b86a506546
Former-commit-id: 4fb093bb571a48ee8125f6b817fad2fb58ab200b
Former-commit-id: 025801012ff01a604659c7d6ff921adfb8f66eac
2018-09-04 17:03:46 +08:00
liyang
61fb92eee3 Merge branch 'hotfix/d2_admin_gitee'
Former-commit-id: 15c837bf2489792c915ed1b83dcee63f7133bed9 [formerly 978e308881b54da7363998423a219f2a63403865] [formerly 15c837bf2489792c915ed1b83dcee63f7133bed9 [formerly 978e308881b54da7363998423a219f2a63403865] [formerly 15c837bf2489792c915ed1b83dcee63f7133bed9 [formerly 978e308881b54da7363998423a219f2a63403865] [formerly 978e308881b54da7363998423a219f2a63403865 [formerly 56f0a1f4f4a672b22358b33e42dc973c93c13515 [formerly 536e622ba876dcd2a40bf7f0ad69a157c66955bc]]]]]
Former-commit-id: a32c60da81d68ff0b10bf5404ca39e7d24494d57
Former-commit-id: 0faf7f3b94934aca522b7cc5f27a2e486b7487b0
Former-commit-id: 0b78e42b73ce703640a578cff3e4e0157926ff97 [formerly 9e734a19b34e76089b9392659839de8f71174126]
Former-commit-id: 41e5f6ecc5742a7e9dcec16cf460b894c4bf88ad
Former-commit-id: ac6a45f654b041bb7c0851f282e5d89c8f36ef0b
Former-commit-id: fae0f20d2672668a54c03a138262e1b993e979e2
Former-commit-id: a5e01f0e86f2f003787c03f5e984c081e7a49983
Former-commit-id: 69a9f9a9074dec1b5f122bd5207cf13f7c3e20b1
2018-09-04 17:03:46 +08:00
liyang
25b369ac4a no message
Former-commit-id: 9e8dcb7a8ba2e96aa29a3108c5d5440acbf605ac [formerly 9e8dcb7a8ba2e96aa29a3108c5d5440acbf605ac [formerly 9e8dcb7a8ba2e96aa29a3108c5d5440acbf605ac [formerly 9e8dcb7a8ba2e96aa29a3108c5d5440acbf605ac [formerly c67f293f41ce2977b7fb0a6bb981ca42c0d2542d [formerly 9aa4564c3d846f661c2d78804dab1ad73080ca2b]]]]]
Former-commit-id: eb56f41cf5c19b7194bbbcba51aea81c511a8d34
Former-commit-id: 904ad18b97a693561449f260847e41fd82ef3d70
Former-commit-id: 20fc40035534ee3a5978d44951ec2dd18949cbd2 [formerly 4487a68749c4caa7716a7fdfba819d0ede95377a]
Former-commit-id: ce86b28930f523ca718debea50ce38008dc42fd7
Former-commit-id: 4629a8fbcc6e3168d492f309dd647cbf77a19726
Former-commit-id: f3d928ab6e6c46bcd40e16abb642ea357134da35
Former-commit-id: 0e2ad162b34760297d47c7caabd81f5db2d9045b
Former-commit-id: 4f536959914a0cbfbb9ff52764d2f9ae662f1d98
2018-09-04 17:03:34 +08:00
liyang
0babbf2f37 Merge branch 'hotfix/readme_update' into develop
Former-commit-id: e5c01dd77642173cdec8858094ac4d50bf94e625 [formerly e5c01dd77642173cdec8858094ac4d50bf94e625 [formerly e5c01dd77642173cdec8858094ac4d50bf94e625 [formerly e5c01dd77642173cdec8858094ac4d50bf94e625 [formerly bc9d2341651bbe44c58b7b80e5f22574d8f96380 [formerly 1ad98b5e146334138941d55660a84715de5c9e2a]]]]]
Former-commit-id: 0d47b0a2499bfb82b744e39044df355fc093e6b2
Former-commit-id: c9237e8525f1a8e3e03e25476cd5ad9a11b168aa
Former-commit-id: 35b517c056eb98badd751db8ed876b08e9c1adad [formerly 18f4898f8782df56f5837217e6bf636b4f0bd70f]
Former-commit-id: dc82a808000593e9a84b3a96fb70522c6165440f
Former-commit-id: 29b9a5d340917841a2dff50f2f66b7d0cadaf866
Former-commit-id: bbb6419c46b302e8d7539333b68f5694cb168692
Former-commit-id: debb01b5eb35c04ac1cfcca314cf55a22a248083
Former-commit-id: fca9524b7c9fc180ebefbddb533893fa8ca255f9
2018-09-04 16:44:45 +08:00
liyang
99d6be6eac Merge branch 'hotfix/readme_update'
Former-commit-id: c24dfb634ac860ccb20f85cd38fd6ba6eb982231 [formerly c24dfb634ac860ccb20f85cd38fd6ba6eb982231 [formerly c24dfb634ac860ccb20f85cd38fd6ba6eb982231 [formerly c24dfb634ac860ccb20f85cd38fd6ba6eb982231 [formerly d4b0e4207fb635fb571065c36ab30c31456c3292 [formerly 5c6bbbef03339aad0be8ad19cc20db1af9fb8193]]]]]
Former-commit-id: 3aff85699f23126b50946e08c5c211038280f332
Former-commit-id: 7ed4cf4565279bfe794d0cdc23c8853f824ce8ed
Former-commit-id: f8cfb8c7e6c54c956a379197c3651a45f53252c6 [formerly 50e1331a7c4be53beb4f4f28caac7593099d0be2]
Former-commit-id: 4e3675725a139bb221b556ae11fcf6f33d16104e
Former-commit-id: 1a4472989ec0ff68c91b80122070237adb224444
Former-commit-id: 164fed4e830752e4a9b3b3f54e1245f81177532b
Former-commit-id: f59db98b303b30c97d51afe26dabb5dcf7d9e272
Former-commit-id: c2034c7ec76533e8a9de2ffc19db1d8ca4950546
2018-09-04 16:44:45 +08:00
liyang
1e5a9136e6 no message
Former-commit-id: d9407941dc8668a557d056fb3342a465b7fa92aa [formerly d9407941dc8668a557d056fb3342a465b7fa92aa [formerly d9407941dc8668a557d056fb3342a465b7fa92aa [formerly d9407941dc8668a557d056fb3342a465b7fa92aa [formerly 28486f9dd1ef4d787d4ad7526fa8ba469d748aff [formerly a1a2042f7648480b1ff21fb31946ff31094c852c]]]]]
Former-commit-id: baa2d86beb3f316997023eaf204a21744ac7d57c
Former-commit-id: bd0f9c9ec20e0a3c48f8e4215ebddb451c55447f
Former-commit-id: 3565f67327c0473c24e759c32401dc4f13620a4b [formerly ef2714115e283031d04a9da52739a7784f7b23ae]
Former-commit-id: 4e983419bb6dcbbdb04a4479bd466ab4d57f0abb
Former-commit-id: a3644820abc88d21c4ece5f97c74517752be6f9f
Former-commit-id: c532c4caf740c49e2cdd7da0a08504028e8b65a5
Former-commit-id: b2acd412eb64d978a1bb12472e57cb4342afd163
Former-commit-id: 819d6210311ee42f2e307a6677dc252fb55c0f4f
2018-09-04 16:44:35 +08:00
liyang
b1e9a15148 no message
Former-commit-id: 0464cc0f8e6782ab95aae6fe02a30e24482613b3 [formerly 0464cc0f8e6782ab95aae6fe02a30e24482613b3 [formerly 0464cc0f8e6782ab95aae6fe02a30e24482613b3 [formerly 0464cc0f8e6782ab95aae6fe02a30e24482613b3 [formerly 012154e13bd8f12a59a8ba0ee105811add4096a4 [formerly 3e29af771233486050afab755f3d9e42208dcb4e]]]]]
Former-commit-id: 2373bfa93d1f887b7e780adb4c416a101e490be2
Former-commit-id: d5c22bf429c297f00aef08be9ca32a7ed135f9cd
Former-commit-id: 17e762f53e158dc733f58bef6a87653817e6037b [formerly abd23d504108b2ac3d7fc16de448be322f438907]
Former-commit-id: 61852399a79d788cdbc078cc21cf70ad5e561121
Former-commit-id: 26ae080957bfa1865d3e3733dafc2dd09fd0aa50
Former-commit-id: 36ba545c4092faf0da7b3ecc5bb349a93ad4a3b0
Former-commit-id: d57aa62383683868c0a2ca00c057f87d9d44fd24
Former-commit-id: 0b76f2c1b736f4175cdf99b8b081c99458092ae9
2018-09-04 15:05:33 +08:00
liyang
f61b58eb4d Merge branch 'hotfix/readme_update' into develop
Former-commit-id: 63673614b00cade905876f2e82b92c76f459bac0 [formerly 63673614b00cade905876f2e82b92c76f459bac0 [formerly 63673614b00cade905876f2e82b92c76f459bac0 [formerly 63673614b00cade905876f2e82b92c76f459bac0 [formerly 955d48d90d8c0b2ec7435a30c3c53dcd9dfea3d3 [formerly 6b32679e9712cef787f40aa3016d59dd7be0994b]]]]]
Former-commit-id: 30f525042efffa6b88b9fec460e15a1b2bf209a9
Former-commit-id: aec9080240d22f3455738dd3cfa178f580a57f17
Former-commit-id: e6bf5ee5178c481482f81541ae63fcb5d462b02b [formerly 697c486ce41d55c6376b194ec4b1c7ae30454e28]
Former-commit-id: e177134f7ce01702908789720e2f68833818dd63
Former-commit-id: 429b89eb93db24daa51d72d234c36629e126f0a4
Former-commit-id: ad5785d4f5f1071b58d231d089a79388e94f6ea3
Former-commit-id: ea5a08eff2d0678c10ae6e43115ae909b8ab843a
Former-commit-id: 32a8b5812b4953b5ba86b46964794d485a6ced65
2018-09-04 11:18:13 +08:00
liyang
dc807de5a6 Merge branch 'hotfix/readme_update'
Former-commit-id: 2d0524c81ecd54412fc256c47f91eddddc1ac7f0 [formerly 2d0524c81ecd54412fc256c47f91eddddc1ac7f0 [formerly 2d0524c81ecd54412fc256c47f91eddddc1ac7f0 [formerly 2d0524c81ecd54412fc256c47f91eddddc1ac7f0 [formerly 5794e2655ec5df34dc9b8f8e916d32c1d214b6d4 [formerly 1b7553282ef5f2b6bf825c5a3fbefd85bf673605]]]]]
Former-commit-id: f9ac3761591b44baf2231606d76e3ec5e202cc81
Former-commit-id: 292994196da125d6bf631346b23bb70aeea34701
Former-commit-id: 17707fc3735074630e571104c3fc2fceac1ea569 [formerly 62bf0664ad38430f7ce968843a88ac6f2e185dc4]
Former-commit-id: d69e6514ef4ceb7eb01505cc64dee6aa45993cb4
Former-commit-id: d709837eeb707231d9c9ce528b8091ffecff0ca4
Former-commit-id: 1bf15c0feeca609e99640586f0d4901fb80c9426
Former-commit-id: 4ac13372f2ac29be1735adbf545f982218ebcee0
Former-commit-id: 9d33a2650aa7232f0ca41afe21deef02d89dd202
2018-09-04 11:18:13 +08:00
liyang
ee2cd8ced2 no message
Former-commit-id: b655ce2f8915ad3b0ddcb4ce45b6c8ccfb7b5a99 [formerly b655ce2f8915ad3b0ddcb4ce45b6c8ccfb7b5a99 [formerly b655ce2f8915ad3b0ddcb4ce45b6c8ccfb7b5a99 [formerly b655ce2f8915ad3b0ddcb4ce45b6c8ccfb7b5a99 [formerly 8b3a64c65bea79bc0f45efde1ac9ed171c98dfd3 [formerly b1cc552939f74bc94c6d615755807ffec166bedc]]]]]
Former-commit-id: 618f287a01e3776a9118dc7ff67fd1cef4ae3649
Former-commit-id: 684b77be1b4f2d7d50c1da81411c2d45662608bc
Former-commit-id: 0ca3717eea17695dc86e352df246bb5fe1f3473b [formerly e45c9f8a5b9ea1e7f3e8f513f98bbee91084b3cd]
Former-commit-id: c08686fcfd76a404e4c43aa3fe59d1fa42be4195
Former-commit-id: d1528f930bc84a7d9a3420afb7ae2407c3e70c60
Former-commit-id: f2abc25362ac09155f6696b57b016d4a7d674948
Former-commit-id: 649f92cbfae32294c35e9e85d17cca0efcea7074
Former-commit-id: 4978a53e089a187df7d0e73b6fe62268a9e1d165
2018-09-04 11:18:03 +08:00
liyang
0b705054e4 Merge branch 'hotfix/readme_update' into develop
Former-commit-id: fbc421729be83c1f110f944335eedf4e3dc4d07d [formerly fbc421729be83c1f110f944335eedf4e3dc4d07d [formerly fbc421729be83c1f110f944335eedf4e3dc4d07d [formerly fbc421729be83c1f110f944335eedf4e3dc4d07d [formerly 2d4b373a7eb6594a6c2a3a5bc226b5e6025c5c8e [formerly 945c272e215cb481c2b471dd4da4978710c28b5b]]]]]
Former-commit-id: 5383bec70ed020c1351a05f54bb72830a426b3c1
Former-commit-id: 1249ca815de86028d3025da9d8f7c077f3a49a16
Former-commit-id: 4b78a9950a8ee4f001b0367082d7a74c027da9f3 [formerly 2aba4dc681982fd12ab78bb430380a99b83ac2f5]
Former-commit-id: 862b2861aa936d133a39f211704dc9b429bdd173
Former-commit-id: 918b5c2372cc7c85e219b4dbf05d912f74cde0fc
Former-commit-id: 5be51917b9efc6e09cbf2ba49f7bd9c676c078bd
Former-commit-id: 5560a81fd8907b3f1938c40ef7b1bee95a60429a
Former-commit-id: 66c60942f53dc23b143983180fd3698153826377
2018-09-04 10:56:51 +08:00
liyang
72aeff2c6c Merge branch 'hotfix/readme_update'
Former-commit-id: 4d5913443ea2f17fc30e8b4bc83fbb604969e423 [formerly 4d5913443ea2f17fc30e8b4bc83fbb604969e423 [formerly 4d5913443ea2f17fc30e8b4bc83fbb604969e423 [formerly 4d5913443ea2f17fc30e8b4bc83fbb604969e423 [formerly 401b95392fee9543cf10b711ae9ff4f6424f911a [formerly c65b7b9c629e8ab2f19811f73a21e1058baac3b0]]]]]
Former-commit-id: ac46fc780de92a667a7ab75ed01014473de79a8e
Former-commit-id: f91f2a682dfa99b8d19f252b8a1362159e766c2f
Former-commit-id: 16e8414b4223c0360a504bef9ab1a9c16f261ceb [formerly 2594892d9cc15156ff4c7378059ccb96cac86474]
Former-commit-id: 64ee3989e28e1c4301c99d68d1c66e6af7efe94c
Former-commit-id: ed58fce495ff9cd8ada1763db99e42645228c32d
Former-commit-id: 4585e27b1a63ca904a901f43ac481a097d2086d9
Former-commit-id: 1edf4f030ecaf4de629319cb48d143f57a4cb7e3
Former-commit-id: 7665a81d00cbf83ed0c30f30d148c5e88cd14d4f
2018-09-04 10:56:51 +08:00
liyang
66e9da421e no message
Former-commit-id: f52862e741ccaedc117928a5652520251467f9bd [formerly f52862e741ccaedc117928a5652520251467f9bd [formerly f52862e741ccaedc117928a5652520251467f9bd [formerly f52862e741ccaedc117928a5652520251467f9bd [formerly d5f4c0faad6bd4c505d77e76a1e8265e19bda445 [formerly c90558646fdec02d8142a7fdb38748dbfa82079f]]]]]
Former-commit-id: 1b2f50d129d5fa64bd40bda26b600e3f74e8cb78
Former-commit-id: a638fbe5626bf082d01e7ae50be485244a0f8e7e
Former-commit-id: 92166cc60e3fb145fb0a8e6da328f7ad713f3195 [formerly 2f59264800ae8e0b7d1ecb56a0b1f661e285f156]
Former-commit-id: b8a3ad8b370d552105fff557ec762ae04e5dc22f
Former-commit-id: 1d55256056965e086bbe0921b8b07ee23d8d91af
Former-commit-id: 41757ad5689229d6714a60964e818defeafc24de
Former-commit-id: bffff161cf74de0d1d222b6e8dcb9b7f2bcf4de6
Former-commit-id: 5a2ca903877f441de17285162f6a1511ca5e9bbd
2018-09-04 10:56:38 +08:00
liyang
6a9ee2a5bf Merge branch 'hotfix/readme_update' into develop
Former-commit-id: 7b010627f75eb400d2d0bd4acd62322ec4779b39 [formerly 7b010627f75eb400d2d0bd4acd62322ec4779b39 [formerly 7b010627f75eb400d2d0bd4acd62322ec4779b39 [formerly 7b010627f75eb400d2d0bd4acd62322ec4779b39 [formerly 33845d3f83a9f931b6e0d9114696af6e89f1c921 [formerly b93b2f6c1112dadf0b6882cf222ebe57d43cd297]]]]]
Former-commit-id: bd12a63d2c76d904e720245ea74c2bd48302af09
Former-commit-id: 2f31282c21e59819fddf512a211005a74bf44299
Former-commit-id: 077e0630e39a68f40103f102840506ab4ed288b7 [formerly 4fde1329b8f4d51c7ff7ecd4d9379a05f3328b16]
Former-commit-id: 3c4c1dc2dcd6aaf28949cc6a33b819611a5c9e38
Former-commit-id: a3b9c079d6c52d3da8a5e93447ef4694f1e470e5
Former-commit-id: afac726c15eec9590048f494bb595b3fb0a1f6ce
Former-commit-id: cdb56e15b433f4bd1991caf232a246b26a3bf80b
Former-commit-id: c4860a11d2b9dd07f6347bb9cd5e7689d99da741
2018-09-04 10:52:41 +08:00
liyang
813a7833d4 Merge branch 'hotfix/readme_update'
Former-commit-id: 32f2da82cb24f74d3d39ff8cc02a34bd62355d82 [formerly 32f2da82cb24f74d3d39ff8cc02a34bd62355d82 [formerly 32f2da82cb24f74d3d39ff8cc02a34bd62355d82 [formerly 32f2da82cb24f74d3d39ff8cc02a34bd62355d82 [formerly 8064eaf150b52f28af081e07845d825811a81d91 [formerly c4ea9d4e4ce9273664348cb0a863be70a8836587]]]]]
Former-commit-id: 11f9b3bcd5b5290c07f35aedecce615539d923cb
Former-commit-id: 69bf72237fa8b5041324c400b79e3a24dad967d7
Former-commit-id: f0981096967303cd82e6c5e3a095d01695bb0e02 [formerly 746d3d5964f03bd8c65c79391e9a162d43ab32c9]
Former-commit-id: 1f3132222ae25cc3d22c8a9a290067606d961140
Former-commit-id: 79ea978d4837f492ea9b761aea12eec334b8e836
Former-commit-id: 3e0ff6d3a45a596e12bfb974483abc5d1a60e7a3
Former-commit-id: 788fa478edc6c481f2be5840bd9240c0eba1ccd2
Former-commit-id: bc14c87de408efb435d7658a9f37e9aa27c29d20
2018-09-04 10:52:41 +08:00
liyang
7f0eb691e4 no message
Former-commit-id: 9343287b10ba33b7e544cddf5106b48889c95dc5 [formerly 9343287b10ba33b7e544cddf5106b48889c95dc5 [formerly 9343287b10ba33b7e544cddf5106b48889c95dc5 [formerly 9343287b10ba33b7e544cddf5106b48889c95dc5 [formerly 7da699c6687131175f53b50f15906c0b3aaa93d2 [formerly 3af004cf7aa803ba1c968da7a1084a053a5a6ef1]]]]]
Former-commit-id: b1931bb11f0ff0343ec1a5455f0aef8761d85a9d
Former-commit-id: 133b4f179e4ad5d86e720d8bc924a0c2a907d071
Former-commit-id: 5a99f91b25ec71ad8718e52b04260f97a1ddab27 [formerly c81c012a9f09b0ce9aa43e4058d465095d5fcd1c]
Former-commit-id: 8819e201fbd95538717c03fd8f458ec57f4d7df7
Former-commit-id: 629fbd0493fd7c74dfce9aa4e840979857673981
Former-commit-id: a2c27a2dc047622d8e6564a8746cce41b16be10c
Former-commit-id: 2f1438619fce1bd27f4a47c2379025da07aa80d2
Former-commit-id: 552e0959ff0966ee2ec721d7d72889b7339d66dd
2018-09-04 10:52:32 +08:00
liyang
85c68b7524 Merge remote-tracking branch 'origin/master' into develop
# Conflicts:
#	README.md


Former-commit-id: a1a14ae1644020f7f5b55c11eb206ccad01710f0 [formerly a1a14ae1644020f7f5b55c11eb206ccad01710f0 [formerly a1a14ae1644020f7f5b55c11eb206ccad01710f0 [formerly a1a14ae1644020f7f5b55c11eb206ccad01710f0 [formerly e8555faec0a3d70c99b75ffe40144146dfcb8ca3 [formerly 591a9f308938f4ffdc5fe1aa72b50e4f7ec0c9f1]]]]]
Former-commit-id: ea64dd5277b110ca94a7a737df92f2d680051015
Former-commit-id: a03560da6e3b4f7d1c095244d6c046b31d751e04
Former-commit-id: 6122c68d5cee3e289f4d215cf27c89d7c3e63ff4 [formerly 1d0264baae4761fc367fba6abe9e4c53747ac6d9]
Former-commit-id: d392b0d1c889bc33a8ae439bf3b286be2198946e
Former-commit-id: 616a50c3667b3b5fada61c3b2d5f01ad9dc304a0
Former-commit-id: 09e9b040f57f706d6dbe15836de817e900054a5c
Former-commit-id: 2bccbcb23df862fb98565f8dc892de112dcebb36
Former-commit-id: 5e867341d5e40e01916bed6c41d1e63bc4ffb12a
2018-09-04 10:43:59 +08:00
liyang
9c34b66c46 Merge branch 'hotfix/readme_update'
Former-commit-id: e488b7212594b05618bcbeedafce1bcbb7f1f8fc [formerly e488b7212594b05618bcbeedafce1bcbb7f1f8fc [formerly e488b7212594b05618bcbeedafce1bcbb7f1f8fc [formerly e488b7212594b05618bcbeedafce1bcbb7f1f8fc [formerly e1c68dee1b5550b80de196ca2aac8061b72eb014 [formerly 400e0e0000ce253bb561923e5ebba88914b46a49]]]]]
Former-commit-id: bc16991e27b113b7c48b66d2d0be51434372e442
Former-commit-id: b192b5c945f19ba1077e0b75a26059953825ebf8
Former-commit-id: ebb70892748829c3559f75661783d653187bacd2 [formerly bf9d54cdc4fc3843424ec61c67caa4b90618a9a8]
Former-commit-id: 6e2465520d5a636b2927a95ce7af1b2a06b21337
Former-commit-id: 775efde31d4f842fbcf7313fe1fec5fae7823f84
Former-commit-id: af161780a1bca672ebb8b7c478746091ff2c6c95
Former-commit-id: 94d34f652b31b62b9694a75fa67c0f0fc66995b0
Former-commit-id: c11d54c1e5e3755ae5507aeb59de1b64ca4ca87a
2018-09-04 10:02:33 +08:00
liyang
539abcc086 no message
Former-commit-id: ffcb535ce3809618ff8041352466b3ec1fea5ba8 [formerly ffcb535ce3809618ff8041352466b3ec1fea5ba8 [formerly ffcb535ce3809618ff8041352466b3ec1fea5ba8 [formerly ffcb535ce3809618ff8041352466b3ec1fea5ba8 [formerly d3729f9c5a268ca115b1ea3a12668b0e8a354019 [formerly bb764d750ed2a66c3e097d232b3e8305fdf73682]]]]]
Former-commit-id: f1e307f7c046e74aa86cfb16415d444431c6a866
Former-commit-id: 69030a293f56b486e97594ce9f2318abfac97607
Former-commit-id: 8bc0d5ee591df23c3bbc393431f6851e1d4b58ea [formerly fff8cfac3304d1119d04b8d030230f2a443fe356]
Former-commit-id: 9f7a6019eb9dcc6b279a2abefb78e885f319da7e
Former-commit-id: e33d2c248ac33139f63106ab1439ddb3e70cd1ed
Former-commit-id: f5c783a118136845d534ffe3866a0e6745b75de8
Former-commit-id: 3b2cc1d4f68c160430f6437c9d1b5b5100c30834
Former-commit-id: 104f3c459c8b7674eeffc8c4757fcb258a07b440
2018-09-04 10:02:23 +08:00
liyang
cf8bd18d04 Merge branch 'hotfix/readme_update' into develop
# Conflicts:
#	README.md


Former-commit-id: ce532183476f37ab5b075ce25859e6022909eb81 [formerly ce532183476f37ab5b075ce25859e6022909eb81 [formerly ce532183476f37ab5b075ce25859e6022909eb81 [formerly ce532183476f37ab5b075ce25859e6022909eb81 [formerly 7658dcddee29d444a8dacf3d30c579c18168143a [formerly 3fd3b1e1a7a86ddf88a7fcfc0b9a92c4d371b426]]]]]
Former-commit-id: 46bb0564ae683fbc58009f49a1de2e21660f52e9
Former-commit-id: 85fd21aa6d50fada28e472061a577df1d1baa2fd
Former-commit-id: 76460590f556a08e671e776d419a63b0ddd139a5 [formerly 7f23d5748aa44e840bffcf6effbb176b0b65f7c3]
Former-commit-id: f42020fc8789c1cd8a155855b59febddb2abc99d
Former-commit-id: a6d636fa9e14e494124f3bf19e096e2c44f4d992
Former-commit-id: 4c4c3c425a35e0daddf7d7fd44dae64fedc43a19
Former-commit-id: 5d71519c916642eaba714fb5e91e77cb1779efac
Former-commit-id: cfb7457ce3a4437b8dfae4659ae92147190cbd5f
2018-09-04 09:59:35 +08:00
liyang
bb6c113d5e Merge branch 'hotfix/readme_update'
Former-commit-id: 05e4ed4a1b4bfcfa377b76f8a6ec16a989459794 [formerly 05e4ed4a1b4bfcfa377b76f8a6ec16a989459794 [formerly 05e4ed4a1b4bfcfa377b76f8a6ec16a989459794 [formerly 05e4ed4a1b4bfcfa377b76f8a6ec16a989459794 [formerly cd0be543185b2d5218713ff5e50659fe2a8d835d [formerly cb1cd06f2d0106bdc313567318fb64eb1ba2a3b6]]]]]
Former-commit-id: b2df14bd64eda2972267ea51b17cc24def8bdb04
Former-commit-id: 9f76fba0933b43d21fa018530fc1227728d503ea
Former-commit-id: 06f6ccd2644e9f287de2206d6df6be0082cb63bc [formerly 8d4984d57913f9d50681b26fd44a84f75abaaddb]
Former-commit-id: a47dc2e10aa37d165083cb11f03fef12010424fa
Former-commit-id: d40b33d036832a0ca7ad27dfbf22eb1fc7a8f54d
Former-commit-id: 28a222bad8c704d0305a607ff5cb7dae1c6106fd
Former-commit-id: 3124e7e4f1c990b9624aa41c23c186ddef83fac7
Former-commit-id: 33f6c45e7db30690c04d6076baca51828bb461f7
2018-09-04 09:59:21 +08:00
liyang
f2bba17d4b no message
Former-commit-id: d07b00dffb0e84c2353d4ada876131488b189aba [formerly b40ae963db707f4fa761a4099b512c4dd0b64c81] [formerly d07b00dffb0e84c2353d4ada876131488b189aba [formerly b40ae963db707f4fa761a4099b512c4dd0b64c81] [formerly d07b00dffb0e84c2353d4ada876131488b189aba [formerly b40ae963db707f4fa761a4099b512c4dd0b64c81] [formerly b40ae963db707f4fa761a4099b512c4dd0b64c81 [formerly c772aceeabc84f893ffe6e19a99a1161149fe8a7 [formerly a330a0b5c9ba77a90b12e463a10e81c1c26efe55]]]]]
Former-commit-id: 461a8f3bc847bb200920e9d5b935791a673e6d1e
Former-commit-id: d0467c60a285f784efd71fa5602e442ae6adb65f
Former-commit-id: c2b1f6038c2b9679f8e880890e90a03211bc1282 [formerly de79745e71f74cb79e2bf651758124950cf04542]
Former-commit-id: e02d90b78539e2456a500b301246b88e0a2b8da8
Former-commit-id: 3c5507062c030c1b8510ea27a493ab9796ab8935
Former-commit-id: 816158a03fd59150a1938323fbbc857ee4acef62
Former-commit-id: 8456360a2cfda7231abf11fea0cafaf9d5a458fd
Former-commit-id: c60acb1c626f8862725021deebf4d4c1a78b0554
2018-09-04 09:59:11 +08:00
liyang
b78cd0503b Merge branch 'hotfix/readme_en' into develop
# Conflicts:
#	README.md


Former-commit-id: d91fda05305b0a0d8bcc1b130bf7f7346386314f [formerly d91fda05305b0a0d8bcc1b130bf7f7346386314f [formerly d91fda05305b0a0d8bcc1b130bf7f7346386314f [formerly d91fda05305b0a0d8bcc1b130bf7f7346386314f [formerly 8a7df0b4f385a51e891f945a447c567086fa1da4 [formerly 66e01943a64cd61d7d2d4f901835af3518a7045c]]]]]
Former-commit-id: 86ddb2ae9a5a4a4a9a235d8e02ddff9a541d207b
Former-commit-id: f6d0b39b22508d9b5d2bd4dda3dea377c2f2e93e
Former-commit-id: 8bf4546901cdb468eb3294a0c26c734d7540111d [formerly d2121dc601bce4e2b03b291de3302ff374f7f486]
Former-commit-id: 8d1db35a6c3dc17687817412b7183f1594a5657d
Former-commit-id: 2f13f442c9df6edc2a9d42345490e4a007c9fc3d
Former-commit-id: 069cca691850bc78ffe6dc8bd6d0e4c6b058387b
Former-commit-id: 6015a99ce8f271db1c9e1063d8306b7e8e421900
Former-commit-id: 6c2942cbfc81a876f4fdb4ac5d30ab81be17d32d
2018-09-04 09:30:17 +08:00
liyang
f867cda79f Merge branch 'hotfix/readme_en'
Former-commit-id: d689ed29cf5bc43194e343d9b2d2ed217ad1f8d5 [formerly d689ed29cf5bc43194e343d9b2d2ed217ad1f8d5 [formerly d689ed29cf5bc43194e343d9b2d2ed217ad1f8d5 [formerly d689ed29cf5bc43194e343d9b2d2ed217ad1f8d5 [formerly a6d35d8efb86beecfc35bf0f3eef6fc21852ded5 [formerly 8de066bebb8bdc27b59a4a296ca53e9b75ac331a]]]]]
Former-commit-id: 0b974a87e955a272aff7df29f4aa1253d85e41b6
Former-commit-id: c53e91fa9db7d42f3ef66f8e3f553a910634b346
Former-commit-id: 85e59b309b78483c30ea0d9270e1601ae9d19181 [formerly bd366347bb69903e865034587b8c5814dc231021]
Former-commit-id: 5048f3bb8e18a72263577967775d8b2d6c8540c0
Former-commit-id: 77ce4bb75b7a5b213963f86d62f2d540b2281807
Former-commit-id: acd10e47ce4565f3d8393ceab61641ae7dd194fa
Former-commit-id: 8bd76f53a5f6c91f2d43b40feb22f7ffc76cf6c4
Former-commit-id: 9331733039ddff082377cff094ebd85be7eb79c2
2018-09-04 09:29:57 +08:00
liyang
ca888b557c no message
Former-commit-id: a9fc909020f6eb7fea5285dca192d6ea700e7263 [formerly a9fc909020f6eb7fea5285dca192d6ea700e7263 [formerly a9fc909020f6eb7fea5285dca192d6ea700e7263 [formerly a9fc909020f6eb7fea5285dca192d6ea700e7263 [formerly bb362e54a7284520f9f0518b4234d4cc794d5b98 [formerly ded6b614b219f16c31984215252687189d49a77d]]]]]
Former-commit-id: 6ac17bbb5f3e55540acc94e2db3d818a8402a910
Former-commit-id: 1e81da12bddf6b36d1a7eea137ee9a09cc898075
Former-commit-id: b331bee957a22fcfa97885759f313f9ac1973369 [formerly 54bbaaaf074f119258e79049256e0d3bf7050553]
Former-commit-id: 8f2e7bc5add34da4f0b07efca30b87d8123f33b7
Former-commit-id: 8c043d57ca92ca2ba46fe4b25831cdaebd56cced
Former-commit-id: 389b8bf98c9e20d1f5d913b437693eee6c1b931a
Former-commit-id: 2748e0ea983588b464425feda6d727297a0f33ff
Former-commit-id: 13aa0257cce4a7c82a8aa3b287812766c19c464b
2018-09-04 09:29:32 +08:00
liyang
51fbb71bf7 no message
Former-commit-id: 642d7d90b15c64725656cfe5b97df7910ddc547d [formerly 642d7d90b15c64725656cfe5b97df7910ddc547d [formerly 642d7d90b15c64725656cfe5b97df7910ddc547d [formerly 642d7d90b15c64725656cfe5b97df7910ddc547d [formerly 94560b4e6a01460d16e143f83dbe1469c5bc0513 [formerly bfa4380c827cbd1ee08105778c647f24ae60126e]]]]]
Former-commit-id: e1bf45a28753010a23d897ca6738290f1332b3ef
Former-commit-id: faf40bac3b02eac341a9aa882d2ee740de1163fc
Former-commit-id: b5644a782538e4eb9d2d41567bddfb4a071800d8 [formerly 1776f273a9c6dba6c2cf25c700b9c05bdf862e86]
Former-commit-id: e914ae729b15be83287d6606d350af3fb730b696
Former-commit-id: f811e4cec11493771ca80203c2289529d7023de1
Former-commit-id: 84e520f6445e8a8924f9b1a8ef29dedae0f49fb1
Former-commit-id: 65289242f37d7617401ed77e7dfd327405daa3e4
Former-commit-id: 60be5c9dec659d31390b782ff8674644c9fde66d
2018-09-03 23:54:01 +08:00
liyang
20e8bb8615 Merge branch 'hotfix/display_optimization' into develop
Former-commit-id: 3360d69c1f98001f63362f009a58aeaea6a7e73b [formerly 3360d69c1f98001f63362f009a58aeaea6a7e73b [formerly 3360d69c1f98001f63362f009a58aeaea6a7e73b [formerly 3360d69c1f98001f63362f009a58aeaea6a7e73b [formerly b43d2f87efc52ff1d38a2340cd2f5994a8083058 [formerly 3e9bd9b0e6289150e7cd75a7800dda415bcefa74]]]]]
Former-commit-id: eace1823429f1b664e07b323c29c1a13e3356d31
Former-commit-id: 4c436f16064d93aca51d5104b4531320893ddcd4
Former-commit-id: 0517329ce2d107f3058d381a987f9cd8ebd1f3b6 [formerly 05f4280e63e36994532e2aed586b956e266f90b5]
Former-commit-id: 019d0f0c1914e8ecc1934d40af31a5a5c8257a7c
Former-commit-id: eda24b8b7a1290cab4dcc7a6592df19bfc264db4
Former-commit-id: cf86c593a12def25dc0be270a24fc03015a3e368
Former-commit-id: ff6f4b9798242abd0b139a75c2d6d4cb2df94f35
Former-commit-id: 370d5d67722497dfb2575099490dd38e2d13e006
2018-09-03 16:18:30 +08:00
liyang
91b3dc79ed Merge branch 'hotfix/display_optimization'
Former-commit-id: 52f51697d0125b9f4af7e21134f5265d4b8a311b [formerly 52f51697d0125b9f4af7e21134f5265d4b8a311b [formerly 52f51697d0125b9f4af7e21134f5265d4b8a311b [formerly 52f51697d0125b9f4af7e21134f5265d4b8a311b [formerly 417f0d203dc72d996a6aeefbafc9889967fa6ea9 [formerly b55e0b2e9d50a8c2fc1aaaff1f50b3476eeffdff]]]]]
Former-commit-id: 904eca3773f5fac9c54875b82bc7e970b129047d
Former-commit-id: 73cf601337c0e5d454a9cabce9668dec577c1589
Former-commit-id: 290ec42bae7f3d1ae46365a80b8e836c1a32e93c [formerly 636e6388aececf4284df88e9d7384103e70f8bf7]
Former-commit-id: 002cdec2f9022b648754dea7b7faba124be63fbe
Former-commit-id: cdde3e6fac2c5eacd0d7582abbd3f7a86d719658
Former-commit-id: b33b3feefb4be9451771221ae022608ace8782b2
Former-commit-id: 6bb9b1dd64e6340325a307a63efaec0a07071a07
Former-commit-id: 5a4f8b19c92b34ca2aac43deacf482dbfc47712d
2018-09-03 16:18:30 +08:00
liyang
e6b4b7057d delete line
Former-commit-id: d5de051c140169642a03fa4f8f0dacaebb4f5949 [formerly d5de051c140169642a03fa4f8f0dacaebb4f5949 [formerly d5de051c140169642a03fa4f8f0dacaebb4f5949 [formerly d5de051c140169642a03fa4f8f0dacaebb4f5949 [formerly b326482fc8fe94f838f9f888c24e9fe7b999145d [formerly 69f96d90b151f28541c9c24c50562986863beb36]]]]]
Former-commit-id: cdfbeb265362615b871d241ef35072c6bd5c11bf
Former-commit-id: 9db7c72b77a0b80a845b6e41f5a994aaf7fc0cb6
Former-commit-id: d63ffc69afdde4811ae784a9e138ab6c1828df41 [formerly 759dfb621701fe92017ca5fefcd555bc96ef5608]
Former-commit-id: 816a8eb520635ab38cc6302272b0ec467dbe73d1
Former-commit-id: 53071aa7f1ab87a78af6b9f6cd2a26c8679e4f71
Former-commit-id: 912ea603fd7c27da71875f784b10faba1c69623a
Former-commit-id: 6afa7a5e80f52bddb40d67540445b91906363b02
Former-commit-id: e23b5d0ec74b1eef29ecf313499b3d63b751f722
2018-09-03 16:18:17 +08:00
liyang
c41f220706 Merge branch 'hotfix/readme_update' into develop
Former-commit-id: b448f6a8d5463111a64f8d3cf94adda6d226c8c3 [formerly b448f6a8d5463111a64f8d3cf94adda6d226c8c3 [formerly b448f6a8d5463111a64f8d3cf94adda6d226c8c3 [formerly b448f6a8d5463111a64f8d3cf94adda6d226c8c3 [formerly 7e5688ca890f9cd2657ac2a98858ccdd3f5aaf32 [formerly 6d8e571759e3d2c931111a675e29be1fd0f3861f]]]]]
Former-commit-id: 7a9b2694bae16fb6ceb8591e278675a714d7e3a2
Former-commit-id: 48e6fb98d49f33ceeaa7277e99bdc7cf61942b6e
Former-commit-id: dab937d80b42ea05ef8f5fb57e8b240db6fb7893 [formerly 8822e48e3d370e1d3a014ceed42441d2c262de4a]
Former-commit-id: e8633ba7dac2aacaecf22dde5139e78796d48f14
Former-commit-id: 048ffb7dcac573c70a5ce9acbe17937f97e0dccb
Former-commit-id: 8f97d5c141027cbe4c0e98e08ef8ba577e3ce17f
Former-commit-id: 43a5e4310d2c6cdf96c8efde3b40c93b8afb5452
Former-commit-id: a0817f55eceaab0b8b9714574254b6a370146d6c
2018-09-03 13:52:28 +08:00
liyang
46dd409ef5 Merge branch 'hotfix/readme_update'
Former-commit-id: b222dc89caf940309f52e648c4bd987956709f0b [formerly b222dc89caf940309f52e648c4bd987956709f0b [formerly b222dc89caf940309f52e648c4bd987956709f0b [formerly b222dc89caf940309f52e648c4bd987956709f0b [formerly 69be58f995cb257f44791fedef12447fd3aeef5b [formerly ee995b6a8a3cdca220f5cb2f6d38891868b925d6]]]]]
Former-commit-id: bad69351944f67c219b6fc02f353ab0efac61dca
Former-commit-id: fb2476d7a4d1723ebcd5eae7c951328b344cac61
Former-commit-id: f4ead98b70a1a034a4fa187eef001f6df496ba06 [formerly 1be44ecfe477878cd654db61f9b0263103586666]
Former-commit-id: 1cc72da6fbc48b948727c3c76da9271248126c3f
Former-commit-id: 5b5bd079fd47962b0356ad0931ee3dec502c86f2
Former-commit-id: f6cdb3f137884fcf8da72ee228e2f41fb95170ed
Former-commit-id: f05ebd8a5af7123afa38e84b4da9523621d1bfa1
Former-commit-id: 66fd32846db9663d81b20d616e3ca955d9ddf03c
2018-09-03 13:52:28 +08:00
liyang
511ae44c22 update
Former-commit-id: fa2dfbcc6ff72419b238f90a2d7efe5c93d3ddd1 [formerly fa2dfbcc6ff72419b238f90a2d7efe5c93d3ddd1 [formerly fa2dfbcc6ff72419b238f90a2d7efe5c93d3ddd1 [formerly fa2dfbcc6ff72419b238f90a2d7efe5c93d3ddd1 [formerly 9a630e430bbc1248f382c77bb3cb8bb5b530ce34 [formerly 573ab3c090abb794fbba255750922e2c2a86a3ef]]]]]
Former-commit-id: a36a7fb0a01f89599aac6e9cabd7d596902cae27
Former-commit-id: 73f9bfc866b48488659ca5ce522e9afadff609dc
Former-commit-id: 6ecf7e30f29c5b47e7d0ff1b1c6da12d7d09796e [formerly ebeba3612ec202f9c9af38b10b2c1181f168a42a]
Former-commit-id: 354c04d38ca292b3a3191b6a8460f7e01289a923
Former-commit-id: 2e77595cb639846d53e4c893c67a273354774662
Former-commit-id: e5ff78b94d7993cdc76cf1da209298a8ede8d424
Former-commit-id: 093e0ad5bf5a1da7303f44e161aead76f416f133
Former-commit-id: 4ccb9840d4d2cae72ac01d94f7b5e0a009e67ac4
2018-09-03 13:52:14 +08:00
孙昊翔
b5023abe89 Merge tag 'update_doc_src' into develop
no message


Former-commit-id: d855e461acefcf80edbb0cdf4515581821ef5eb4 [formerly d855e461acefcf80edbb0cdf4515581821ef5eb4 [formerly d855e461acefcf80edbb0cdf4515581821ef5eb4 [formerly d855e461acefcf80edbb0cdf4515581821ef5eb4 [formerly c807eb2f430a1c37c5a47a6e2683d8e7f8a805f8 [formerly 6e501102741a16c44f486794affb1c7e154376a1]]]]]
Former-commit-id: e720df78fac7139679aa8e2cb26b6fbe1bb55537
Former-commit-id: 200fc8596bb1899746dcb980c640ae95889e73a8
Former-commit-id: 72232a80effe85cb6015944546be8913140fa625 [formerly 0d4a958d245651e3d6e84413cdd06529484fe659]
Former-commit-id: 39bdb22849021767e7d658d2fed3375797a59f2e
Former-commit-id: dce3aa603bbecf3851d81c103ec36ec1e459a297
Former-commit-id: c53738e53f0015cec94e318de0e011fd5d547e44
Former-commit-id: 5e37c993c3a1e7dc2fcf23039320ecf31028ad6f
Former-commit-id: fb2f41835325756346309a22a4fc496a3c0348a4
2018-09-03 11:05:20 +08:00
孙昊翔
4e4891b65b Merge branch 'hotfix/update_doc_src'
Former-commit-id: 65b3ae6bccb748980ca956155c0dec6c12b4c547 [formerly 65b3ae6bccb748980ca956155c0dec6c12b4c547 [formerly 65b3ae6bccb748980ca956155c0dec6c12b4c547 [formerly 65b3ae6bccb748980ca956155c0dec6c12b4c547 [formerly 785dbcfa1443fee3cf5b15aaca03f96135f422fa [formerly 582c297f1d5c5b8f844220b21f7e04048b663dfc]]]]]
Former-commit-id: 568abc5570db97b2143b5401874069edffdac91b
Former-commit-id: 652bac5ffb85d55dd947d2ae7303b00bc96d6d11
Former-commit-id: 49e9dc6a9941d884a4586e2ad327d8f4d87c2f33 [formerly d35f9a4ad45698d6be4b484e427cc0c0682e3251]
Former-commit-id: 8ce95f5c26ffea4dcf83bc279cb91377faa3806b
Former-commit-id: 45bce1735b61357ed9b1f1fda42058cd5d9046b6
Former-commit-id: 80949aa96430ebc65399fd4c2b02cef8e59bd915
Former-commit-id: 81cea179b188f22dac31e3db7643f9968b080156
Former-commit-id: 839b0dc8aedd9245b6e431d9e7a889490659e45c
2018-09-03 11:05:20 +08:00
孙昊翔
e3761d94dc 更新文档地址
Former-commit-id: 1007e28ffea96ac442e66b2a8e4601fefb361b3f [formerly 85e07fab3ff65cd61092991daf26855c8ed5969a] [formerly 1007e28ffea96ac442e66b2a8e4601fefb361b3f [formerly 85e07fab3ff65cd61092991daf26855c8ed5969a] [formerly 1007e28ffea96ac442e66b2a8e4601fefb361b3f [formerly 85e07fab3ff65cd61092991daf26855c8ed5969a] [formerly 85e07fab3ff65cd61092991daf26855c8ed5969a [formerly 90c265e3ac4a27f677f30adcb5f768f3eb48824a [formerly d263da1c6f41453628385a7a233ebbd5ccf1d085]]]]]
Former-commit-id: a378444bc00b239fe5f1de840792dc0e5805280f
Former-commit-id: 420018e573a99d97f6c1a0ee0f7dbca959bfea4a
Former-commit-id: a31366cd7696b1fcab2c2fa4af3e7754954bf1e4 [formerly 35f92b9cc58c0c7c288de47bda44a4a9f32984eb]
Former-commit-id: f883a66291ea34249018f2c545bc7c5eb0c07112
Former-commit-id: d22fe9ba89d4de4328c8a722c638605b8f3800f2
Former-commit-id: 4c26302a39fbc7884509ea221b3cbbc99861c35a
Former-commit-id: be6be9217d72a0d675bd693e66c9f7268d46a775
Former-commit-id: b1944d0b66c668e18ae1eeed2c6d93ee022acfbd
2018-09-03 11:04:55 +08:00
孙昊翔
5782ce6728 Merge tag 'readme' into develop
no message


Former-commit-id: 203d191ceb82afabbaeb6f571f7dfa24cd29bf7a [formerly 203d191ceb82afabbaeb6f571f7dfa24cd29bf7a [formerly 203d191ceb82afabbaeb6f571f7dfa24cd29bf7a [formerly 203d191ceb82afabbaeb6f571f7dfa24cd29bf7a [formerly a5ce88b947aef2a49546d562e79f7ce49ffbc8fd [formerly f0d995a5072ade9b9fee6dbe90fc1352fa16c00a]]]]]
Former-commit-id: fae0f15a460f465fa0f2e586bb1ea6a01b442ef2
Former-commit-id: 61d44be5af5b2160cc58492d4dabae494e0bee78
Former-commit-id: a770f090d91edfd4de620f2977efa4c242dd4e50 [formerly d430bf9f59ebfdf74232489db4bdf44d05e52ced]
Former-commit-id: 72ef7da8bf9e54d189f4fd354c725096f54f6f3f
Former-commit-id: 497bdafa195e4eab317d0c0d82a173acd67ef5ac
Former-commit-id: 4fb6fcab365cdb002598609144d3dda6eef562af
Former-commit-id: 3953565de2e27ec5fbbbe635e865520badd64d1f
Former-commit-id: a258e57361ebb46eff39eb03ece202e0526cea05
2018-09-03 10:54:09 +08:00
孙昊翔
747c47c5c0 Merge branch 'hotfix/readme'
Former-commit-id: 012a09a7ce6d6a33f68787e80d333281bd473193 [formerly 9e1ff162579c38ed7f03272b0094095ef86c6e7c] [formerly 012a09a7ce6d6a33f68787e80d333281bd473193 [formerly 9e1ff162579c38ed7f03272b0094095ef86c6e7c] [formerly 012a09a7ce6d6a33f68787e80d333281bd473193 [formerly 9e1ff162579c38ed7f03272b0094095ef86c6e7c] [formerly 9e1ff162579c38ed7f03272b0094095ef86c6e7c [formerly 238812ad6edcce33e7d8799cb3eacf1cd0a444c2 [formerly adf6f9cf59c9cf79a47d8591f36014bb040fed49]]]]]
Former-commit-id: dfa9e46ea2932bf0f8c29225f5cdba6ad1de6e36
Former-commit-id: 34e6679fd7f757d759e4c0ba0abaf288e5081e02
Former-commit-id: e1d381c2d2213cd93000fa25225906f947a1476a [formerly 706f0f3d2c4d71b84603f8b999851b0d8e1010fa]
Former-commit-id: ab5aa9642f70de7289494c7845261410713cb8c4
Former-commit-id: f187845e7262090cda106ba8a42fb7d1020faa56
Former-commit-id: 279eedf1f404f37b49156d021563afc21885e5a0
Former-commit-id: b87aed6749c5dcdd44f835f3315f6121173f2fa5
Former-commit-id: 30763597f8e3610bdc26b0390f236b372fddbc51
2018-09-03 10:54:09 +08:00
孙昊翔
e143326600 update readme
Former-commit-id: f9f692165f4887a64335183a571f0d7c4c167fe6 [formerly f9f692165f4887a64335183a571f0d7c4c167fe6 [formerly f9f692165f4887a64335183a571f0d7c4c167fe6 [formerly f9f692165f4887a64335183a571f0d7c4c167fe6 [formerly ff4fe8e9cbcf444bdc117fad674c44765c2d21a4 [formerly 22adc1711b1f456b0d8d5fde4f8b368d1d9d8b5a]]]]]
Former-commit-id: 62a1639e78e2232efa5f42a062be3118463f0911
Former-commit-id: cfbdb6125bbdeafc4c60e2007dab3f3b467e5b2b
Former-commit-id: 6e76dc512c2e2fcc794be5408efe43467486056c [formerly 81606763fd8e2a9346e48fda1edf4f6e171e9cc1]
Former-commit-id: 9ac52afeee94c66cfd1dcbbba2cf55c453e226cb
Former-commit-id: 0461f22dc3d5de20d55a38b9babe37aba023d643
Former-commit-id: 1d94bf248115c81a1cf4d1e49607e2c5403c564a
Former-commit-id: 39df0d59716514f370fa61a7af351c72128c1bdb
Former-commit-id: 88510b1d5ee9d08a1a2d900ba26a587aea6de7e7
2018-09-03 10:53:30 +08:00
孙昊翔
0971c234f3 更新文档和预览地址
Former-commit-id: 8accc56d033ea04f8b83687573a0380bdc6d7a86 [formerly 65d8940b3050fa4b8d992022d9296dddede1e210] [formerly 8accc56d033ea04f8b83687573a0380bdc6d7a86 [formerly 65d8940b3050fa4b8d992022d9296dddede1e210] [formerly 8accc56d033ea04f8b83687573a0380bdc6d7a86 [formerly 65d8940b3050fa4b8d992022d9296dddede1e210] [formerly 65d8940b3050fa4b8d992022d9296dddede1e210 [formerly f98f85e9eb450eb22b74cdfc0b44458798d9d438 [formerly 2300ecdf85d8b6fa37d66fc1f12d446950ad3d65]]]]]
Former-commit-id: 7cf6c423338385063c8e5b5914a7ddbad5c76d48
Former-commit-id: 0cc6a694894413bfc50539fb4c25f07caeb255fc
Former-commit-id: cc815d04c6b220fa1e85d6f73b9e86cb72e9a42f [formerly ef139066527a850da9caa028d8dba87aaf9dea55]
Former-commit-id: 2406236172076ea39d706c3c15f05e340bb491e4
Former-commit-id: 0b2680b64b8dd5f105a7e557da935983836ecd5c
Former-commit-id: 427bf1fc262730885f6367a43ac02cf305a76d57
Former-commit-id: 387588ebbd58f8605143ccf26928e797056ef480
Former-commit-id: 2539e02b81df9f4997deab40efef1aff7581ff04
2018-09-03 10:50:22 +08:00
liyang
9ce3459b51 Merge branch 'hotfix/base_url' into develop
Former-commit-id: 2704669c737882c378e1ecb00214e489f0890c1e [formerly 2704669c737882c378e1ecb00214e489f0890c1e [formerly 2704669c737882c378e1ecb00214e489f0890c1e [formerly 2704669c737882c378e1ecb00214e489f0890c1e [formerly 3808487a778f49cf8ecb44e03db813bab86ce4e3 [formerly 9f9b93a899257a173cc16f6ed349cd535531c61e]]]]]
Former-commit-id: ffdfb6e562501bf488f41aace9f23c008b5ba265
Former-commit-id: 2752a09d3952836fcc4b00254e08f91d1ed79289
Former-commit-id: 4bfbfd576265c1231510d67b9fa328ad5e828a62 [formerly 30452ec6832eb92102743ece089632c71d1eaff6]
Former-commit-id: 5d7d89329dbabccb0bd44e4e860651decd51d4cd
Former-commit-id: 6a7aac67fbce903ebf3cbdabdd4fcc649239ef92
Former-commit-id: 7c86317e3f7579704ba489ebc552a9ce08c1c019
Former-commit-id: 2767452775ae26949a6c4877527a170880ce25ff
Former-commit-id: eda01aedad568791db67911cc35793c07690dd5a
2018-09-02 23:17:50 +08:00
liyang
c0116cfd78 Merge branch 'hotfix/base_url'
Former-commit-id: 2785ddb057ad6f43eff2db3d0e1da41b0465ea7c [formerly 2785ddb057ad6f43eff2db3d0e1da41b0465ea7c [formerly 2785ddb057ad6f43eff2db3d0e1da41b0465ea7c [formerly 2785ddb057ad6f43eff2db3d0e1da41b0465ea7c [formerly 38aa427b9b424346e5e1803c8b8facf7b1760d1f [formerly 49a5c2f91618a3cea8abfb183070dbe3e28328ea]]]]]
Former-commit-id: 71caf47d724d951698c3cdeefe7f18de611e84b8
Former-commit-id: 277dc57fdd35b8e7c4b8667cb5ab91b729d0d75a
Former-commit-id: e3e32dee914efbd82947aaba333b28fec806ca2a [formerly 4823916168a481ce54906729cfd54f6a3cd3653b]
Former-commit-id: 15cf4148730565873ba234cac2f1baac0e8a56eb
Former-commit-id: 9f6905aab87b5dbd391cddd3b2093231ea77a6a0
Former-commit-id: 97e4bcff00b4e8fa02b8ea12afcad26c036b3acf
Former-commit-id: 77704a4c5b17c631a72af5e05451be7ba656e16e
Former-commit-id: c44b888cc345174af142e9b2fc22ee10a7b3209e
2018-09-02 23:17:50 +08:00
liyang
28eda0348d change base url
Former-commit-id: 31e7aa00a992c19626c80701cb3d77b6ae24514a [formerly 5cd7a9cbc86388ef77d8c0e91ef18479db3bcb3c] [formerly 31e7aa00a992c19626c80701cb3d77b6ae24514a [formerly 5cd7a9cbc86388ef77d8c0e91ef18479db3bcb3c] [formerly 31e7aa00a992c19626c80701cb3d77b6ae24514a [formerly 5cd7a9cbc86388ef77d8c0e91ef18479db3bcb3c] [formerly 5cd7a9cbc86388ef77d8c0e91ef18479db3bcb3c [formerly 3e736196d2e384dfd3e3c34d1314efc847ac7d62 [formerly f9994e1742cc831d0d28a5c19c6297647fb14111]]]]]
Former-commit-id: 69b14c96a9aa1a795cd01326f6c494a0ebbd9449
Former-commit-id: 207cb4436e8d117edd0877fd432709bf8c5965f0
Former-commit-id: 9a5819fed6d92f303e98ce0e4aa659f4f2b45ff5 [formerly d0603e609ceb5c79468615ddb571070bba21dd0b]
Former-commit-id: 5363a9506743e47933fa0e09ddc5efaff9d5c713
Former-commit-id: 61ea32825739459bbc40f6c86b0b008ba46ff947
Former-commit-id: 3722b9eb6eebcbaf8738cb52039c8a58b0a83d03
Former-commit-id: d2e0b3702465411228412c415d851310730cb9b2
Former-commit-id: 95c33bf4ab9dfb8dddc74fe7cf97aba169efc428
2018-09-02 23:17:41 +08:00
liyang
56c2644f89 Merge branch 'hotfix/delete_doc' into develop
Former-commit-id: 848d49d6f40222f72413302b26a94b2758acbd3a [formerly 848d49d6f40222f72413302b26a94b2758acbd3a [formerly 848d49d6f40222f72413302b26a94b2758acbd3a [formerly 848d49d6f40222f72413302b26a94b2758acbd3a [formerly f1b64fccac8c070e02286a30ff9f7589f1e8e022 [formerly 51da5de4e48385ecb4afe7467be1556a3328139b]]]]]
Former-commit-id: c8069afd6b4fa7fa3b13d88246942d97036bf06b
Former-commit-id: e6cb0be9ab9cebb32f81bb07542f109b3e01ac72
Former-commit-id: 0e69f60fba3bd73c1a5c2b20c73c47af6423ee4d [formerly 8b4a3a9f16135de13982957781b2218929b39c41]
Former-commit-id: 49367cd0b792bc2037bcd8922939e7ff6c3891fc
Former-commit-id: f1f87dac14c89be18b5f4828f8915bf5ef2ea07f
Former-commit-id: eab953c3b6f5af7a17a9689255907f5faa89ce27
Former-commit-id: 52d7cfb873ace314fc16e0c70bf724f5fb4445ce
Former-commit-id: c2c9952c3ccc280a07702beceff96e1eaf6acb1f
2018-09-02 23:10:07 +08:00