liyang
|
a057d7ddd4
|
theme
Former-commit-id: 3fb5e37f648c98c9636ba8ac88f683e52cf8435e [formerly 3fb5e37f648c98c9636ba8ac88f683e52cf8435e [formerly 3fb5e37f648c98c9636ba8ac88f683e52cf8435e [formerly 3fb5e37f648c98c9636ba8ac88f683e52cf8435e [formerly 6f73a709ba4288f514deb2d74eb8603180b60b08 [formerly 28415f3ce8f01f9f26a0752a5f08d855bc4c56e2]]]]]
Former-commit-id: f199fcac91cb1b3aeef843974db74d0f9d622699
Former-commit-id: eec00c4f5e48c1a19ac096d3a8900bbb7ae361db
Former-commit-id: 9c7eb4c2f9115fda9b7d69e1c53444c99aeadb90 [formerly aac10159598f69b5c31ab136beb5ae11686ed2d6]
Former-commit-id: d38da464fd9a05e1ec2defc27ac4d8d4bed05ec3
Former-commit-id: eadfd85257cb054017000aca8100e5e68b359e2d
Former-commit-id: 9ce4b0a7b75a4ea9b9e24e96161a515bcadc6f04
Former-commit-id: ed40880ed8dda9601d859d5db5f19ab7bd42ade7
Former-commit-id: 3cbf4301dd98c44d8c4f1da0432922511ba9c7e3
|
2018-09-14 08:49:43 +08:00 |
|
liyang
|
1166e0d98f
|
account user
Former-commit-id: 18e8f9b184a466dd3afdcca8b77ccd9922d408a4 [formerly 18e8f9b184a466dd3afdcca8b77ccd9922d408a4 [formerly 18e8f9b184a466dd3afdcca8b77ccd9922d408a4 [formerly 18e8f9b184a466dd3afdcca8b77ccd9922d408a4 [formerly 26eec1dacb860262e4e7a81946d6d44739441da3 [formerly 8b6ff706f6abb1771924571087264230424f32d2]]]]]
Former-commit-id: a9006cb1d0b08630344ae3148efc45bda1fae8f3
Former-commit-id: 209b2c0fe35119ed4319dac1a1b9c553e15c4522
Former-commit-id: 493b0705c65043774efc00cdcfbf3ad97ed54a52 [formerly acb407878497fbc86b0bbfa7470d43455a7944f2]
Former-commit-id: 39e40e3c3e4313c35eac57b87caea57fbf0c245d
Former-commit-id: 8873735485e0c6836cf2d8e1717f9e94a5de814e
Former-commit-id: 78d64eb4d6132adec46158bccf3c7d06576bce6d
Former-commit-id: 39429a1692c5c34c87bdff344622a752c06619f4
Former-commit-id: 6726ad62ee8fdb8e952920f8f5ffad86a7d4fa04
|
2018-09-13 23:14:40 +08:00 |
|
liyang
|
b202a93638
|
Merge branch 'hotfix/env' into develop
Former-commit-id: 2fea0f3d5f3275690abcf8bcf6e758114be5dcec [formerly 2fea0f3d5f3275690abcf8bcf6e758114be5dcec [formerly 2fea0f3d5f3275690abcf8bcf6e758114be5dcec [formerly 2fea0f3d5f3275690abcf8bcf6e758114be5dcec [formerly 8ff998e588a189765acb80374d210022930ae746 [formerly 2d4b00c1336d40d24c198fb9665ac9064528ccc5]]]]]
Former-commit-id: 0ae0143adf3598ada15db2e9e526dfc007c978a5
Former-commit-id: 52aee8cd218e48f89307ebbbfa3f69224235d915
Former-commit-id: 6fa1a076b40ef88a53a0484f4d0814a269020abc [formerly cdc9cd699b7985f604d22f99a9953a8a00a3b257]
Former-commit-id: 546247fdd2d432aad61f113a5068591a642abb36
Former-commit-id: 8273a6ccbd2efc3f187b310a85c7e181fd945798
Former-commit-id: 3498b104207315981392dba0a43bf64508f6b858
Former-commit-id: 1d82e85a92836df45eb1fc77b6cea210b21410fa
Former-commit-id: 8d14fe350327f8bee1a01c7f72d494a43ea83d52
|
2018-09-13 18:12:53 +08:00 |
|
liyang
|
8c08920fbd
|
Merge branch 'hotfix/env'
Former-commit-id: 115f91ce3186d56de691f27c74f8bf6c852cb7c7 [formerly 79b3948842f0de3132d5650ce0558c7965b9ce18] [formerly 115f91ce3186d56de691f27c74f8bf6c852cb7c7 [formerly 79b3948842f0de3132d5650ce0558c7965b9ce18] [formerly 115f91ce3186d56de691f27c74f8bf6c852cb7c7 [formerly 79b3948842f0de3132d5650ce0558c7965b9ce18] [formerly 79b3948842f0de3132d5650ce0558c7965b9ce18 [formerly 0e4824fa6c76ea0132c618203b22de202aea1fa5 [formerly 0dfbc27124d364e1789cba31ad29a92d2d45c395]]]]]
Former-commit-id: 1c49bb73b85c32bf646ae03f77c9c51a60524f9e
Former-commit-id: 317cf530e30937bc6f17898bb7b83133fda6adff
Former-commit-id: aab13fdb409ea19b392326aec0303000afb2e1f1 [formerly f5e5205da85e47f32ed329549cd0044d45c295f1]
Former-commit-id: 5c0b62e55d3a08a35e32dc03e7ae4589bd1c232a
Former-commit-id: d8fac00e12a40dc010fee0800cc5f16295e3fc27
Former-commit-id: 089809c9548f635b612467aa20ac620789876fde
Former-commit-id: ec5d5ec0f36d40af3baebfe0280576cfe5beff50
Former-commit-id: eddb5ec72c561eaafec220a37ca70a85949e97b6
|
2018-09-13 18:12:53 +08:00 |
|
liyang
|
91901f23b4
|
no message
Former-commit-id: 7b4e389b65fb0e1c1b8f4fd84aed2d37a4869e96 [formerly 7b4e389b65fb0e1c1b8f4fd84aed2d37a4869e96 [formerly 7b4e389b65fb0e1c1b8f4fd84aed2d37a4869e96 [formerly 7b4e389b65fb0e1c1b8f4fd84aed2d37a4869e96 [formerly f87bf339dd5d0e4e8394c81225e1e7ff3c8b4bf4 [formerly bba90141e507e833ddad8c1f7fc8078c08c6a62e]]]]]
Former-commit-id: 9e17b3ff7873c49d3c49befa1491728f1480a84c
Former-commit-id: 3f3927b6c75add3606d59f38597e025f34f814a7
Former-commit-id: b314e655ead8903e4926525b4c053ac58779a3df [formerly 4b2cf3aa78e661531655ed1ab931b2aecf046c99]
Former-commit-id: f47cce5cd3468e66d3e82dd8c13dba3f15ce6de0
Former-commit-id: 04af4234a624d33b780935e565938a651da518d0
Former-commit-id: 55e8643e0354d2ecdae7c10a382cb8a329bd6f1d
Former-commit-id: 40d00abfdb91785f0063349f99693037eb0d2734
Former-commit-id: 1df01604d90b746e89b261f8049940da45e13cd8
|
2018-09-13 18:12:45 +08:00 |
|
liyang
|
e2850eb779
|
Merge branch 'hotfix/v' into develop
Former-commit-id: b91c85afb9b56612ed892a3b4cfceb27f26a4aaa [formerly 760d614766653d9e7c938db5bddea7026aeb78c0] [formerly b91c85afb9b56612ed892a3b4cfceb27f26a4aaa [formerly 760d614766653d9e7c938db5bddea7026aeb78c0] [formerly b91c85afb9b56612ed892a3b4cfceb27f26a4aaa [formerly 760d614766653d9e7c938db5bddea7026aeb78c0] [formerly 760d614766653d9e7c938db5bddea7026aeb78c0 [formerly d01de5433eb42afd9599cd188c14580b16afc5e8 [formerly 2278848de221eb2f36465663d8aa52b4e9d586e4]]]]]
Former-commit-id: 38f99ecd643b7a578c4a12f349011e1ea55dc94d
Former-commit-id: 8d58a11d67acaa43b637982817e512df086da9a6
Former-commit-id: 8fc2ed8af674b9bf9bb7af4358461e0a32f31e95 [formerly 7e6d81ad988d373c7ece46cccfeb0de8807a7a2a]
Former-commit-id: 63e5835a4c3bd639aa86a4ed82eb1d143c1bd559
Former-commit-id: a72cda7edb2ee0066e2cc19192f9b0cddbe0c162
Former-commit-id: 64f5f5d7c976cb0f955465e7fe010497ee934e59
Former-commit-id: 03b196e8102364f0997fb16c2c95d1992356ff5d
Former-commit-id: 419381ff4e77011cc72361d4b838a3e3c0fb4085
|
2018-09-13 18:02:58 +08:00 |
|
liyang
|
0bfcd5b094
|
Merge branch 'hotfix/v'
Former-commit-id: a41b5d8cc9202141fecf68a91628afbc988d8661 [formerly a41b5d8cc9202141fecf68a91628afbc988d8661 [formerly a41b5d8cc9202141fecf68a91628afbc988d8661 [formerly a41b5d8cc9202141fecf68a91628afbc988d8661 [formerly 40dfed21e1430511f38465c2f6da9d62dfd5557e [formerly 539435a2fd57240282dcef463c3e389c133a6862]]]]]
Former-commit-id: e0d7902039e1e487d1cfb8367b3be6ea95f4a004
Former-commit-id: 4c3498ad436e25a113f927b72b6e10851f494e05
Former-commit-id: d03f96f9db7fbd9a5f79a18cdb1ac54ea9b95e60 [formerly 04ffa340841c2181aeea8d7691523efe27eadceb]
Former-commit-id: 999d29f265925a47b5563a53f840e481e4432cf9
Former-commit-id: c6c52c1622e1adafedc76e05d1c45930b546b809
Former-commit-id: 0f49e4e6edf426158173953dedb14aef5975af2a
Former-commit-id: c226be5f9d17489b0f3b0bf6e710c163a773276d
Former-commit-id: f8f94c92a5d0c174311eac9e2b20a1736f7d610b
|
2018-09-13 18:02:58 +08:00 |
|
liyang
|
ed8075db8a
|
no message
Former-commit-id: 316819f28fcafc74026b4ab26b8f8a4596cddeb9 [formerly 5181173e886de851ba70dfd3961931ca1dc93843] [formerly 316819f28fcafc74026b4ab26b8f8a4596cddeb9 [formerly 5181173e886de851ba70dfd3961931ca1dc93843] [formerly 316819f28fcafc74026b4ab26b8f8a4596cddeb9 [formerly 5181173e886de851ba70dfd3961931ca1dc93843] [formerly 5181173e886de851ba70dfd3961931ca1dc93843 [formerly 72f0b62cd8f95e791336f9d6fe4921c698fdc8e3 [formerly 506fa5746c81e45c0538905c061d540b0329dc7e]]]]]
Former-commit-id: a83584624c23959d96d7bc7a81a00609bdd24899
Former-commit-id: 354a72fcd5c3ffb40555ecaaee714c492a23662a
Former-commit-id: 6edcd92558bb16e7581fd4910df450b94a75559e [formerly 8ef511b286b3354eec5616e38dd50e8421d4c824]
Former-commit-id: bced568e6980f9feb04619643dbea535cf7e47fa
Former-commit-id: 0183c063385667f9d16baa6ccc9c3df89f28f50d
Former-commit-id: 3f3db1bc5403253ee7f685f95fe267ec735e5756
Former-commit-id: 6469dad698411a75c6a079d55cb975d7f4ae4872
Former-commit-id: 67a54d40961a2e59eca4f583ae2d3af3d3f1b0b3
|
2018-09-13 18:02:51 +08:00 |
|
liyang
|
a72c140676
|
Merge remote-tracking branch 'origin/develop'
Former-commit-id: 280fc839cbf6a173fceef1947a5d6e9c5e3cb0a2 [formerly 946b574ce837e58176065242b2229d252b8ff622] [formerly 280fc839cbf6a173fceef1947a5d6e9c5e3cb0a2 [formerly 946b574ce837e58176065242b2229d252b8ff622] [formerly 280fc839cbf6a173fceef1947a5d6e9c5e3cb0a2 [formerly 946b574ce837e58176065242b2229d252b8ff622] [formerly 946b574ce837e58176065242b2229d252b8ff622 [formerly 997ae5f885eceaebbc5e830b3d4c7d1293cdf7bb [formerly 9d0c8e38d141e08c8b9b8f76923a8b39b050e5fb]]]]]
Former-commit-id: ce52a438b96cb23b0eaaaf721d1902a3f745b31f
Former-commit-id: 5333503e71d92b91fb3559ba6460b4c40b64d4e8
Former-commit-id: 05eca44e3708330f691128bd385eac54de79b40f [formerly fa227d907026734f599536ed97922783bd3c58ce]
Former-commit-id: 1a70dc5eb91f0092748a3fac1f1bcb8d7dfb081e
Former-commit-id: f074d49c4360e2bc57b837fb9229e9f4d3c466c3
Former-commit-id: c0c58edf0376b8b8a9f88a4df372a9dbc359b591
Former-commit-id: 3571f43f9cad8020253f368f9cc0cfdfa4982912
Former-commit-id: 84ded9a0716e5727c2a8930fae29e5f2cb19481b
|
2018-09-13 18:02:21 +08:00 |
|
liyang
|
d1538e8d81
|
no message
Former-commit-id: cd89f4a565e078725bfbd91b082aa5e70400b0a1 [formerly cd89f4a565e078725bfbd91b082aa5e70400b0a1 [formerly cd89f4a565e078725bfbd91b082aa5e70400b0a1 [formerly cd89f4a565e078725bfbd91b082aa5e70400b0a1 [formerly 8a60801dff62431fc70f2dd3643ce5a38dcbdc5b [formerly 01dc98df70e5c404eab788af71aec07995049448]]]]]
Former-commit-id: 5d84dacd8579e8d61631190e38cb4ca3eafe5903
Former-commit-id: 0255984689f52d0bf5122aea607a11a8c826307c
Former-commit-id: fe33e58cf784eca69d69667eb9c740cefd3e0f5a [formerly 9578eba16aa9c7d0e64a6a994bc7bf32d99b667d]
Former-commit-id: 36d2d56ea83f674f5e1fdb6ea8172dfede4fd362
Former-commit-id: 8827e37559395abd10af36d941cc49d59a182ba0
Former-commit-id: d121162a3c2a978e137a2dd233801a06aa464d2e
Former-commit-id: 6be2bcf3359c7dc1a5df3ad79101a14d26447c67
Former-commit-id: f5f4c8b7dcd1a246eef5a7df725815c777810c75
|
2018-09-13 18:01:39 +08:00 |
|
liyang
|
e38532a11f
|
no message
Former-commit-id: e38ae2a500eb5e6e940012c7bcdce36ceb290830 [formerly e38ae2a500eb5e6e940012c7bcdce36ceb290830 [formerly e38ae2a500eb5e6e940012c7bcdce36ceb290830 [formerly e38ae2a500eb5e6e940012c7bcdce36ceb290830 [formerly 665c7f37b7865f504602011c015e0c63be0c9cf1 [formerly 9ae5b6f8ebe3c42dfde2c3762ad69204003e27a5]]]]]
Former-commit-id: 8aff3018b430d7ddca293ce9f9dbdeb5e3ea56e9
Former-commit-id: 62b9ff3353f96e3e136ced0657e7776b10973767
Former-commit-id: 6c2467d43ce3a3c62bd59f927e731f50b9da8f2c [formerly ddd4945cb07ec830065d7ae9893b6badbe1e47d5]
Former-commit-id: ef6262239d352fb2c0bdd84f82a2bae873a94546
Former-commit-id: 7e8b514df9a6722e469578a98ba2bdf027cafae6
Former-commit-id: 2b17e81ea572402951fd8a181500d215368c9fe1
Former-commit-id: 70a34fdf619b2e9277787b2d1c7b7da4fd28da99
Former-commit-id: e7524fc7b102a4451ae39580b7339048eea8a3a7
|
2018-09-13 17:40:33 +08:00 |
|
liyang
|
5333fcf6a7
|
Merge branch 'hotfix/v'
Former-commit-id: c960b968194d4eec3304a310ebce5198c2fb7fcf [formerly f8da9813a466d83d5c85151490f386cb916341fb] [formerly c960b968194d4eec3304a310ebce5198c2fb7fcf [formerly f8da9813a466d83d5c85151490f386cb916341fb] [formerly c960b968194d4eec3304a310ebce5198c2fb7fcf [formerly f8da9813a466d83d5c85151490f386cb916341fb] [formerly f8da9813a466d83d5c85151490f386cb916341fb [formerly b4b451d0b964461d27f34b3efa384ec33b218069 [formerly 1679b9af4daae2558309539a9dfc547c60391144]]]]]
Former-commit-id: 5d12000ae936f109c94abd4515616949b7a4b87a
Former-commit-id: 407843f775437b8e4dcb8e11a5c94275c1c179fe
Former-commit-id: b7509fccb8ccc4327629c49f96c053c4d4b71676 [formerly e93104b79c41beac7ae42e03321d03872b80bac2]
Former-commit-id: c81f52eaf660a8302892e2ef933b2d40eea1c156
Former-commit-id: 1d4aea4d55230ad2f165b783a589be4d6fe6706b
Former-commit-id: 38c8ced25b75e4edbd8f79bef2a5f22c23836538
Former-commit-id: 4ff0db79ed8d9d64bf05f40b5a8860a326009163
Former-commit-id: cfc8cbd62f8a80fe8fb0c14bad14357ddd2f3109
|
2018-09-13 12:45:26 +08:00 |
|
liyang
|
e4cb7d897d
|
Merge branch 'hotfix/v' into develop
Former-commit-id: ca142112820fab32e9a0c880d69d447608ca3dd5 [formerly 6d63be9b16c5eb38f24185d32c5e472b636d1078] [formerly ca142112820fab32e9a0c880d69d447608ca3dd5 [formerly 6d63be9b16c5eb38f24185d32c5e472b636d1078] [formerly ca142112820fab32e9a0c880d69d447608ca3dd5 [formerly 6d63be9b16c5eb38f24185d32c5e472b636d1078] [formerly 6d63be9b16c5eb38f24185d32c5e472b636d1078 [formerly 45346a595dc60e181cd765634596db652ff15a49 [formerly e5e6971a7dc17bee186f7013a2be2de76e15824b]]]]]
Former-commit-id: 3f7d78f540091df1baa4b0bbb30a056b700f88b8
Former-commit-id: 41b159c9a063a25f24984bab14ccb9f0b7ab9510
Former-commit-id: 6c1ec85d12472c42ffe949b0582ec944cc6422c9 [formerly 452bf8aba977b91b1db5d453cfbeb3220b746530]
Former-commit-id: ad3af599ee648216db3b542bb94ab15c03daef03
Former-commit-id: 0cf4ceba04134ced9b41d468abe532dcd4e245a4
Former-commit-id: 1b21b3f69b1e32d27c4ea96b1084aa03b408d457
Former-commit-id: b6d9893aff88e8fecc439bebfe27f170661b5c86
Former-commit-id: 81e8a92e3dd28ae1f0f19d9d19c877969091bf6b
|
2018-09-13 12:45:26 +08:00 |
|
liyang
|
91d5886479
|
no message
Former-commit-id: 3cd0ebe10787f9f9a108e330179410e14126ccdb [formerly 3cd0ebe10787f9f9a108e330179410e14126ccdb [formerly 3cd0ebe10787f9f9a108e330179410e14126ccdb [formerly 3cd0ebe10787f9f9a108e330179410e14126ccdb [formerly c791e5ebfdf7c98efd03e7afc0b5260f3ad3c2af [formerly 8182d808541f0d10ede455aa598fce20a2933b3a]]]]]
Former-commit-id: 15fbe5c53c78b59ea0b9ddf7d69f79251524c51e
Former-commit-id: 65b1e6a1ef93e4213ea8efbd2782c4b23abbb47f
Former-commit-id: dcdb3d1a8670857e95502c49eb013751b7984b21 [formerly c7159137245d20b2f8c03765d56f380692a78c77]
Former-commit-id: ffe5644dc1081ca37f8db0ab79487edf7e8ec670
Former-commit-id: d654e0734dc5ed85d9489d12e10d320434550129
Former-commit-id: 174d80747182e1926be848d58792dde5ec980d67
Former-commit-id: ef2dbde031fa1a87e672b89c765b43106bf9f263
Former-commit-id: 383f68466b454e2f8fefea8464d6bdb2e1b5621a
|
2018-09-13 12:45:18 +08:00 |
|
liyang
|
5cf5759853
|
Merge remote-tracking branch 'origin/develop'
Former-commit-id: 66ea73f35c240a75d742eff7928d8c8bb86fb621 [formerly 66ea73f35c240a75d742eff7928d8c8bb86fb621 [formerly 66ea73f35c240a75d742eff7928d8c8bb86fb621 [formerly 66ea73f35c240a75d742eff7928d8c8bb86fb621 [formerly 69eb70a7e199fa4164304aec35943a4662d4cac4 [formerly 5f2b8269e6786572c43742e6600dd0974e3898f6]]]]]
Former-commit-id: 5871dc543538641d92b281317672f771d97df96c
Former-commit-id: 89ac1a9612639b6c4cf0a5745ab330f781cfef0d
Former-commit-id: cc2395960037b658d423cdec8ba59113024b9303 [formerly c11a9b2343f65c535552b7d2bf8e3fb20385059f]
Former-commit-id: 15fe08613e62058d6053c5572d2b5293478e2606
Former-commit-id: 6fb83bcd8f74bbdb15a7fcca50920bf0c846aae9
Former-commit-id: 9641a7f2154852dc7307dc3d1bb59611c4fb87a0
Former-commit-id: edc5b80b6ee8d1ac39d55ba6b3a5f7b75829c13f
Former-commit-id: 8f40387c6bd9990328bf3d5b09967893dd786f4a
|
2018-09-13 12:44:45 +08:00 |
|
liyang
|
f07705003f
|
no message
Former-commit-id: 81cdc84aa8fa9bcf60106a1ee86bd60a936fb50f [formerly 81cdc84aa8fa9bcf60106a1ee86bd60a936fb50f [formerly 81cdc84aa8fa9bcf60106a1ee86bd60a936fb50f [formerly 81cdc84aa8fa9bcf60106a1ee86bd60a936fb50f [formerly 3ad4291890a7f3f824948af3eb87d4e7d2084aa6 [formerly 964fc2bde6461191a9847c94d7fd0724a816d47c]]]]]
Former-commit-id: 40ba23e8a3e92e0bcf88d49596eeb082492f776c
Former-commit-id: 7b4c85a51f7ae66f503e89a478a0ef4d1a02aeff
Former-commit-id: 19de61b8d3839fcbe1a14ca05b1e2d67b5d45462 [formerly 43adb3ef43d6213069978ce3fcd8732d4bcd0af9]
Former-commit-id: d377be5266686be8f154276ef8cfdcb770113de8
Former-commit-id: 1e74192498bea5ff3d88001c5e0b4c1c9917b3af
Former-commit-id: c7a56899ffdff1abe313f8646d137ae9feff5f49
Former-commit-id: bca43962597e3fc297befb2b61dbfa8f3d94ed0f
Former-commit-id: f778cd63618249c1d3ba5235706f5d5a6ab2783f
|
2018-09-13 12:43:50 +08:00 |
|
liyang
|
bd1529766c
|
Merge branch 'hotfix/update_version'
Former-commit-id: 4912b830b43d310c28db64fe5c9261f94e097a8a [formerly 4912b830b43d310c28db64fe5c9261f94e097a8a [formerly 4912b830b43d310c28db64fe5c9261f94e097a8a [formerly 4912b830b43d310c28db64fe5c9261f94e097a8a [formerly 103c8a8fff3a2b1f621a6aca219a9b3ad3110fbf [formerly 814ef30fcebd328c87603fd6cc3f7fbff8c83f93]]]]]
Former-commit-id: eb7a40de1729de01d01b02379e762e96f23fd7e6
Former-commit-id: c8844425ef4c1a4c755937935c856e94b0e221fc
Former-commit-id: 3533f3f8a6f91911005cb42ea7e864ddc59975c0 [formerly ca026b1076f38ae6c06f930f825698f8cc8b3e96]
Former-commit-id: cb8f5bd01a7e34bc2feadced304674cfd0170266
Former-commit-id: 949c55beb5e8af3adcf25ab4481ec8a0bedddc84
Former-commit-id: 8aafdda18b2a8a449671d68c475dba5d50add697
Former-commit-id: 372ba7bd43939cfde6c0e4427cfb8b04fce72ced
Former-commit-id: 41ad01b40ab056db974c91eab074987570b3ec72
|
2018-09-13 10:46:06 +08:00 |
|
liyang
|
d7071aa05c
|
Merge branch 'hotfix/update_version' into develop
Former-commit-id: da5ab3ad5a6681dfc90b39c155acb5be78f81dac [formerly da5ab3ad5a6681dfc90b39c155acb5be78f81dac [formerly da5ab3ad5a6681dfc90b39c155acb5be78f81dac [formerly da5ab3ad5a6681dfc90b39c155acb5be78f81dac [formerly b3c7b0d74b47960042fa838c49d0370ecbd1f583 [formerly 7a0d3edbc4f690229f57ad3df5353ad061268e21]]]]]
Former-commit-id: 1defa2db797ec71b6c68a8b7ad480dbae505c01f
Former-commit-id: bdf5d21fd74b4161b4f90918e2eccdc5cc97f991
Former-commit-id: 106eab78c67efe8256359f7e67b4e4e11f24a8cc [formerly 3b63bb295fb7a3b1cff8c06d5c41282f1b1aa444]
Former-commit-id: 27ae6fd4e4b2e761de086a9a7e8011ed733a1ff7
Former-commit-id: f9fa20d75152c19119fd32f3fb3ed8422679c557
Former-commit-id: d704f91b81bdae09b7660a7f19cb69c7d5388560
Former-commit-id: cd177a7611727ae5db164978aad84c7d47ec480a
Former-commit-id: b6d10d17efb82e99ab272ac6e8a12cd269347db4
|
2018-09-13 10:46:06 +08:00 |
|
liyang
|
93dc9d8767
|
no message
Former-commit-id: 1c38feadf3c77adbf34b7272fda781bcdae381ac [formerly 1c38feadf3c77adbf34b7272fda781bcdae381ac [formerly 1c38feadf3c77adbf34b7272fda781bcdae381ac [formerly 1c38feadf3c77adbf34b7272fda781bcdae381ac [formerly 03a8010dd51a1ee7b60254e9ed9ab6050fca7fbb [formerly f64fb6867b4f6df4de2fefec72a67758fdc8c33e]]]]]
Former-commit-id: 8bea8bd67d3000b366157ac3d8e4cc56ad439eea
Former-commit-id: 2b5c702fb3089c5809178adf65dc9bc088496eaa
Former-commit-id: fe3c52c177c37e16161b38e0d671059e2da90a26 [formerly cdbe779c7c492356aca2ff7095149ffc70ec5b60]
Former-commit-id: 33a82bde3bcd14fa191b721a2b40aaa355f70076
Former-commit-id: 24ffb773ba8c4547fcefb96852febe243467f599
Former-commit-id: b8ee7a7000f8f00eb2557165040948593a3b715c
Former-commit-id: cea24355a965880fd25d6415454ad23c18951a6a
Former-commit-id: 582da9db6987011747ee338edc1201f428300237
|
2018-09-13 10:45:45 +08:00 |
|
liyang
|
afc1097a1d
|
Merge branch 'hotfix/map_source'
Former-commit-id: b57f29e79f683b1f9e01415b32d12daea541ebdf [formerly b57f29e79f683b1f9e01415b32d12daea541ebdf [formerly b57f29e79f683b1f9e01415b32d12daea541ebdf [formerly b57f29e79f683b1f9e01415b32d12daea541ebdf [formerly 9febb86f744acac92e4cb425b72dd370d41221bf [formerly 6ae9e818984c2e99697c16aec56e436999058b86]]]]]
Former-commit-id: c1e810682ef36311a715948257958c24e2affce3
Former-commit-id: 844a830d93799a4e2daffb4550e7d899a92dc177
Former-commit-id: a83596ebf83cde1473eb6f781f93a8058405568f [formerly c545080a81ada6b07fbdb22cc22780e49c883c4f]
Former-commit-id: 65563c7377cd5c3fcad33a9510d37d2fecbe88c8
Former-commit-id: df3eb9737db54113550c83212b4bd9980fb228cc
Former-commit-id: 13e1ceff2d3a161b03df14c403cc6d8c756acbf3
Former-commit-id: f8b57c6fbf3e8b81144147a8096bdd438a1e9547
Former-commit-id: 995649388e53b32d8486556f4e1cc49b0774a86f
|
2018-09-13 01:57:28 +08:00 |
|
liyang
|
aa6bf85a45
|
Merge branch 'hotfix/map_source' into develop
Former-commit-id: 254c2ecb6e633c47428ccde2bdb016b2976c1261 [formerly 254c2ecb6e633c47428ccde2bdb016b2976c1261 [formerly 254c2ecb6e633c47428ccde2bdb016b2976c1261 [formerly 254c2ecb6e633c47428ccde2bdb016b2976c1261 [formerly 91deb97cdb7040b1cccda88b340d61b6bbe7310d [formerly 77750890ea6372bbe9a87418d53f138cc61a48c2]]]]]
Former-commit-id: 0685790a0a61e376fcb664efd0e86fa2ec6b31c8
Former-commit-id: c508f7abc2c5546b9d9ce47f258610cf6baf3910
Former-commit-id: 8b539fae35e7a8d202d3b3acb44ac32234d81f73 [formerly cf3e0bca9d2ad9fe66726ab18d4385cf982048cb]
Former-commit-id: 95f24bcef53289c1446e435ddd33df49b6b28967
Former-commit-id: 7f8a26d01c2c14da16c613782ed1c881e4eb059d
Former-commit-id: 8d2be97eb7c9c9c92a02ea5bca6c00fcaa38e62b
Former-commit-id: 6628530b288debca997e24bb41c04415a7e07408
Former-commit-id: 30a806f98b45ccc3415ed2f47e4bb6a9675fae1c
|
2018-09-13 01:57:28 +08:00 |
|
liyang
|
ec6597e429
|
local map data
Former-commit-id: 4b6b7341014900e583f602e7c951cbcb4ff01e1d [formerly 8af1ffce2d02a01fbf3c14a3f965f67310aa93d9] [formerly 4b6b7341014900e583f602e7c951cbcb4ff01e1d [formerly 8af1ffce2d02a01fbf3c14a3f965f67310aa93d9] [formerly 4b6b7341014900e583f602e7c951cbcb4ff01e1d [formerly 8af1ffce2d02a01fbf3c14a3f965f67310aa93d9] [formerly 8af1ffce2d02a01fbf3c14a3f965f67310aa93d9 [formerly 37508c4b27a91ccdc48775080ff3593cb8aefb2c [formerly e0fc7b2ec6d144f19636d25a4d0eb77509790b76]]]]]
Former-commit-id: 0c4340be663716a6e7aa764f24ae57b177827dc9
Former-commit-id: 59d150d9419b42d6e185df0af57e4ada5118d07b
Former-commit-id: 598796cc74c53a582202d4fd357e09877b500333 [formerly bbcc39d0bbe434550a44330a5f0da223ff95d599]
Former-commit-id: 59b95938381693970abb79df93d980b3b87b7724
Former-commit-id: 67229d37f7698a6478742e16caced120c04c4d0c
Former-commit-id: cbe56d381f2bce4120e51002ac16d2aecc015672
Former-commit-id: 3c647eb4e8eb4b80c026065cd3df14fff06ce558
Former-commit-id: 0ceb088f85dd0579fbb0695d8d9a76dcf6c34650
|
2018-09-13 01:56:48 +08:00 |
|
liyang
|
a297e2ae84
|
Merge remote-tracking branch 'origin/develop'
Former-commit-id: 8b5e26e73635d05ba5b434361049fa95c64c093b [formerly 8b5e26e73635d05ba5b434361049fa95c64c093b [formerly 8b5e26e73635d05ba5b434361049fa95c64c093b [formerly 8b5e26e73635d05ba5b434361049fa95c64c093b [formerly be9a399f2205fbc720e07b41091ddadd5595fc56 [formerly 20ad0f165fbffa16265ebae508143a598b3413d2]]]]]
Former-commit-id: fcac4289d4cdbe0ebdd4b0745bc677c27e6de779
Former-commit-id: 096a4f6707c40035f14dcc9f6c0c9d8f674482dd
Former-commit-id: 8ed814d291fad05e706ce7c3616376730854100a [formerly 0dfffa884dafae04e9dbadc64f43072cdae13fb1]
Former-commit-id: 5ab7ff7a264bea5009f314a1cdcf3bd38f87842b
Former-commit-id: ae511b4318de261f6bb938ec6dd433ed982d00f9
Former-commit-id: 622f33d707c04d9178e66919ee970995ce2708d6
Former-commit-id: 8ebf2cca72916b458f2eb1b2dda83ea54be2ae1c
Former-commit-id: 8c1635fc0e400a8149389b4f2e58da7b0e46b588
|
2018-09-12 14:34:43 +08:00 |
|
liyang
|
77f8135178
|
no message
Former-commit-id: 8a424d295312bf1154777074f1271af95a9d1578 [formerly ccfdfd36400457e84594580948e3c5355c9db091] [formerly 8a424d295312bf1154777074f1271af95a9d1578 [formerly ccfdfd36400457e84594580948e3c5355c9db091] [formerly 8a424d295312bf1154777074f1271af95a9d1578 [formerly ccfdfd36400457e84594580948e3c5355c9db091] [formerly ccfdfd36400457e84594580948e3c5355c9db091 [formerly 89c5461833870418cb49d07d79fbf7355f1168a9 [formerly 8231ddc6cbf28ee6ad65c3d0c2c85ec25a8ed7c0]]]]]
Former-commit-id: 0d665db00e641a0d5b47f92982b605b70bddcee6
Former-commit-id: 03efb83a0c5ced877571d44af58586a1ff21310e
Former-commit-id: 9d53ca9270c241e5c9880607f3dd6195e0d1bd7d [formerly 9a8cb92a91755eb225600ef6de8d53d4f11b867e]
Former-commit-id: 9eb8290d9afc7f06a2769c780fd380547aa458a9
Former-commit-id: 49b9912929f90a76df0ce9b66e7f83e2d4a898e3
Former-commit-id: 8b2f5063c50168ed963be9d6db727da72be5e179
Former-commit-id: 637f48bdf51ba7598945b0b1ae550f1169617263
Former-commit-id: 4bd3e8a686a83c481b6eef3d02e5ce2dd4a7b321
|
2018-09-12 14:32:49 +08:00 |
|
liyang
|
b11c9a5c37
|
Merge remote-tracking branch 'origin/develop'
Former-commit-id: 0cff471ae9449a06e72a02aea51e2661232b1ed6 [formerly 0cff471ae9449a06e72a02aea51e2661232b1ed6 [formerly 0cff471ae9449a06e72a02aea51e2661232b1ed6 [formerly 0cff471ae9449a06e72a02aea51e2661232b1ed6 [formerly 6f0efcbf4dedab46264fe7af37524889dc384806 [formerly 08540171f196be8d6eb29920390075e626b2eccd]]]]]
Former-commit-id: 4a4cf6695020fa8fa08e3942e9345292ca73cda9
Former-commit-id: 2d0a260e1dd37f818bae80a3ae6c6a3cedb10d7c
Former-commit-id: 89cc15169c181a73ad7acb12b86a5bbd133ed1cf [formerly 75f8dc48499e59cc54093631bc33eb1c91df7086]
Former-commit-id: b8104e301321133ea6837a7c9e8bc80153b7cceb
Former-commit-id: e271f6fa45109ed971f1050e915f712c960facbb
Former-commit-id: d634d271bf5e63fe8067979b31abba43d65868fa
Former-commit-id: 2d58f25741058ef90124ae55fd2ee636de08b18a
Former-commit-id: 31d64268ba6e2a5a3d525a497e5fa5e7eb95ae50
|
2018-09-12 12:49:32 +08:00 |
|
liyang
|
b1fd7e4c17
|
Merge branch 'feature/add_taroco' into develop
Former-commit-id: 0c529796d4c93bfd82e3357081859e35b1af41b8 [formerly 0c529796d4c93bfd82e3357081859e35b1af41b8 [formerly 0c529796d4c93bfd82e3357081859e35b1af41b8 [formerly 0c529796d4c93bfd82e3357081859e35b1af41b8 [formerly 5fe94fa3b781b7f7f44eb858bb76ce3fe620e765 [formerly 5c868c3ff24f530305eebcae2a9477e437d8a13a]]]]]
Former-commit-id: 5e169d92829a12838a4236f1d256dfcfe5a26995
Former-commit-id: 938c4f1db84fb6bc722bb1ceab4ec4a52d1c832e
Former-commit-id: 080ed9143b69f7d4851672a510f2143e6251e46d [formerly 3669f0416390b0071cae30b157b11e223411ea5a]
Former-commit-id: 58e3b4b36079a5d47b77ec7d67bc88d12708d36f
Former-commit-id: 0629299f3ff5446b8ec03ea67804240cdfe12f43
Former-commit-id: 3640dd2f3a08b1826b8d6f9c05fc0ac3f7b84041
Former-commit-id: d77b4dd347e5efb4207bd5211a550c424919dd75
Former-commit-id: a0e10ee6e273516c7d8500c30570341e3a461686
|
2018-09-12 12:31:38 +08:00 |
|
liyang
|
9ed383a75d
|
Merge branch 'hotfix/menu_item'
Former-commit-id: 2eda442ef585f746c2f39690525883ad50bdd6ba [formerly 2eda442ef585f746c2f39690525883ad50bdd6ba [formerly 2eda442ef585f746c2f39690525883ad50bdd6ba [formerly 2eda442ef585f746c2f39690525883ad50bdd6ba [formerly aa45ad03140968da4068871111cb4882330c872d [formerly 54404d48557e469d1b08e62f8757abe8c8476849]]]]]
Former-commit-id: 73a8c7a64363b2136292f8e5c3ede24c86bb3ea3
Former-commit-id: 95ebe9abeea79ac38ed291633ac0e3ff58715206
Former-commit-id: f7e7b87bc5f78d3fac64d73c3dcb3684d2670119 [formerly 312ea8a9a303091767e46fe2ff9dfda117d1a93c]
Former-commit-id: 4eedd0c5b590af54cad38cacf9a295b3155650f8
Former-commit-id: 3b24d9d61a245e2d43d1a792cd641cddc6b7a9e4
Former-commit-id: 6f5ec3e281aed82f436d2211bb03929292a130ac
Former-commit-id: 8d7e4d3a7ab2a3a2a155b6fb682725ecad862712
Former-commit-id: c58b9e81c2fcf76799ca6abfd6766e0d7fe013ae
|
2018-09-12 11:37:21 +08:00 |
|
liyang
|
090a91c8ba
|
Merge branch 'hotfix/menu_item' into develop
Former-commit-id: 572a17c4f8258e23f39ea41cd45e84c92199368c [formerly b8b7eabaa2953fd62273e0357ca0e7fe204d11e9] [formerly 572a17c4f8258e23f39ea41cd45e84c92199368c [formerly b8b7eabaa2953fd62273e0357ca0e7fe204d11e9] [formerly 572a17c4f8258e23f39ea41cd45e84c92199368c [formerly b8b7eabaa2953fd62273e0357ca0e7fe204d11e9] [formerly b8b7eabaa2953fd62273e0357ca0e7fe204d11e9 [formerly 5e3f904699ca3314363e651f6ce731e33fd8a04a [formerly 2eba1549f1ce31fa6d7119cf24a47b2a6338a7df]]]]]
Former-commit-id: 44550b2f83f2132db7fba2090f63eff47abbc9ce
Former-commit-id: 6e13dbb0b13200ddb95fa0e75d51fe3bd4f8b260
Former-commit-id: 075cd3ae90cb1f1e54664d5677ad3acae42329e2 [formerly 3ff0af7cb3ee4cd570b2a9704bf7aaedfb73ea4c]
Former-commit-id: 6ba2b694fc2dd9ca27fe9637dc85d090da97a732
Former-commit-id: 1b0d53e04c89f26fc02b2d9808af67e0ecffcdf7
Former-commit-id: 307eb1aa9e7fc571562ab12503f3f54afc94f329
Former-commit-id: c897630d55ff68df72c6ef3a2058a5a87bda6384
Former-commit-id: 9b6825bf7b8e4e3e01dbd3d2b0ae81ffd4275177
|
2018-09-12 11:37:21 +08:00 |
|
liyang
|
6959f7de01
|
删除注释的代码
Former-commit-id: 93e460d03e9f2ed0f78cc613e6a3f87567992893 [formerly 93e460d03e9f2ed0f78cc613e6a3f87567992893 [formerly 93e460d03e9f2ed0f78cc613e6a3f87567992893 [formerly 93e460d03e9f2ed0f78cc613e6a3f87567992893 [formerly add99f21895dd59113c092971b39a803876e3144 [formerly e59c3f678e843d93fe4ed522d7b2f763cdae38b4]]]]]
Former-commit-id: 43cc9d5698ee2a819b60b99c8bb3982cc0926114
Former-commit-id: 30620c2482c0c6ea73a1102944289ca8de26e52f
Former-commit-id: c276f246425138ffbef3b447b873d541687889eb [formerly 549c0d8b92bd68bbf2e365e392d3d615dad09b32]
Former-commit-id: 0ae6cdda1d6d04a58c74f8bbe013e6195afc63ad
Former-commit-id: 0a7d1cd2d019967b1a1e418dee87b59318dea292
Former-commit-id: e31a7bf9fc6fb29bc9aa67bc08e675782963bdd1
Former-commit-id: 133d4737579e9240d28ddfe76bfc10c7a77d6dab
Former-commit-id: 8c95f7adcf85dc9e7148be32ab39a75a1af55dc4
|
2018-09-12 11:37:06 +08:00 |
|
liyang
|
d7949bfb34
|
Merge remote-tracking branch 'origin/develop'
Former-commit-id: 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 48b651770cf336092d63fa1bd0953949ae5c23d8 [formerly 933ec55590b4d6118a18472cee7f6c043eee77fa [formerly 72e651cc8ce92aa7e50fafe5f12d509e5e15b78c]]]]]
Former-commit-id: e85058cd04998f35db1536f872c5b5e95eee9254
Former-commit-id: 8eeed912e7253ae13b23efa697c66c58d26cc2bf
Former-commit-id: a34dbd28211fe87c83efd9ecdc07ffe51c335037 [formerly 5ca5d85a142c755454c7dc2084b8115de47a2bcf]
Former-commit-id: 4dc8e397f374914f2eb4d9eee6c6599224df946e
Former-commit-id: 9d56e2a187d18d0baa485d867cffe85bd0f668ae
Former-commit-id: 50a7bad07be4e397b4f91b74d5aa9f2e04ef1602
Former-commit-id: c1ab4eb8cd1dd51a9adb9f7848279d5158185a7b
Former-commit-id: 36c56b92d2acdccd437c5489ee584e58f0122153
|
2018-09-12 11:02:08 +08:00 |
|
liyang
|
1f5dd5b64e
|
Merge branch 'feature/global_size_demo' into develop
Former-commit-id: e746458f12e94d6c47cad88474a7593924150499 [formerly e746458f12e94d6c47cad88474a7593924150499 [formerly e746458f12e94d6c47cad88474a7593924150499 [formerly e746458f12e94d6c47cad88474a7593924150499 [formerly 91f0c4155632e8cb3f42ffabefb3ef977e486e52 [formerly 00e5c5eae54fc83e51fb0e2b186805cc5e2bfb4b]]]]]
Former-commit-id: a6841474977cb86989a48f41fd35a214c8cbe5ab
Former-commit-id: 46e9b77e3b43c62de79f7348251084d06d0f6b37
Former-commit-id: f8df39702ade9bcf300f8b928d4bdca6cbc562ca [formerly e674d94bf64629b40e37374ac14e8762e9ea461b]
Former-commit-id: c552ab7d6efd7f20f0a72f9648b28e878d056d93
Former-commit-id: c9869b358d0078fe3a9dbb52f3ad9ddc5eb59bac
Former-commit-id: f99d787f53181eea64c11a26f88ca48c1ccb8daf
Former-commit-id: b54e8cd7586d68434a9f40ffc2457e7033c3ac0a
Former-commit-id: 337ba58e8fbdf972de106a28a35e6b0ccaeffbc1
|
2018-09-12 10:31:26 +08:00 |
|
liyang
|
f535d7163f
|
no message
Former-commit-id: 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 7293d05bbbce121ca11e06de91ac2f1b775c14d9 [formerly 78de87c4262aff3a4c314eba6308e80bc4b94568 [formerly af05d745c14160b7c5d74645c04b52653af3d6a6]]]]]
Former-commit-id: 8d552fccc75f9e545862d3a0de474c1460b2b35b
Former-commit-id: 86c5771f8d752674e7a84468e0e0f79f8e311602
Former-commit-id: e876ce46ba02cb64874edd55fd4c2bbed529c30a [formerly b6f22036fb293f78cd12866d09d951f44bf0fae0]
Former-commit-id: aa944f9181fa0bbfd45041c63d52ce4cee4b6fcc
Former-commit-id: c9e2b70e8b207c6fce4764921ebea4922dec2988
Former-commit-id: a27f7a6b68419d2767d2c5bdcbdd82951831f87e
Former-commit-id: 78af6b9ccd824244e328beaae291056c77af0cab
Former-commit-id: 126348234a6e5fe0915a7c12be737e861b0ffbab
|
2018-09-12 10:31:16 +08:00 |
|
liyang
|
094ae8e857
|
no message
Former-commit-id: b61fc090ac057557e865985a17372579b4da3e0a [formerly b61fc090ac057557e865985a17372579b4da3e0a [formerly b61fc090ac057557e865985a17372579b4da3e0a [formerly b61fc090ac057557e865985a17372579b4da3e0a [formerly a041f07fd49e175049dc35ca50d12ddd9c47e181 [formerly 9b9c93fae70fa2a896a8e1141e73c12a68ea16c5]]]]]
Former-commit-id: cf75cf47906faa4ddaa52a40c8e4ece62387bb03
Former-commit-id: 206b58c41dc019d4e3aa29502fc0cdb72f9f2cbd
Former-commit-id: 49be4101ec4844804ead8ba9493959fd3ace7dd8 [formerly bb07962145e2b0ed960af53b44f09cc5b451ed45]
Former-commit-id: 85fd1a0431d75a927fa562b27af97937089a0e5d
Former-commit-id: 50e867eb2eac155abd4e1a2026b16da3ae31ed54
Former-commit-id: a4915d8d47ebdbc946bcb77533e27cb36332f78b
Former-commit-id: 6262f21a2cc37993fac89066ca43eb1f51e4bf54
Former-commit-id: 3c3f4aab9d3488fd8877863be1d013d943836a61
|
2018-09-12 09:48:52 +08:00 |
|
liyang
|
f0aa8a600e
|
remove sys page
Former-commit-id: f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly f58bf5b39ef338e996cdf9be649c302718127cb1 [formerly 5d34221abf83c3a4075867e5250cceccc87ed5f2 [formerly 377c63c9ed64bd4d844fc847a4abd91cd85e0cc7]]]]]
Former-commit-id: 509465d465f44ced64dbcb80739123c9601b8f2b
Former-commit-id: 3e3ad33268a5d8f9b43f00ecce9f38ad2a1f85b6
Former-commit-id: 5e4267d4e01b1fbe1ac54e3b7b4e972b0cba3de9 [formerly aa4c6b47934baf0da1c4f0fd1e3eba706b1e393b]
Former-commit-id: ebe7073116283b080c02b0779a1a201894a445ab
Former-commit-id: 8af25c2d1cfeb6614a51eac3828bc49c74003701
Former-commit-id: 6daa09cbdce17045aea484e7f5fec6b3f388f5e4
Former-commit-id: 0532f9553a65e5ba81ee157b23f0f163fff6fa76
Former-commit-id: 58204a1ae07090e3356ef23f0d117a9e776354e3
|
2018-09-12 09:44:13 +08:00 |
|
liyang
|
a83e5d6cd2
|
Merge branch 'hotfix/cli'
Former-commit-id: cc4bf35963e513dda712af7e348684f58ed22967 [formerly cc4bf35963e513dda712af7e348684f58ed22967 [formerly cc4bf35963e513dda712af7e348684f58ed22967 [formerly cc4bf35963e513dda712af7e348684f58ed22967 [formerly 9c1358012c9158bd413fbe580c9e86108f45f256 [formerly ada1b65eea817d665b9fb9c12b9343e67954fae7]]]]]
Former-commit-id: b77ac790797daaf5231b5ddf2ad57d64f8c1b979
Former-commit-id: e28301cf2fe6745a5a0489002b56a4482a6b3408
Former-commit-id: a08b479c40258c3eac708f9e601d4a078e04ac6a [formerly 7246b9fb946a70bd8d60cf37332d4764a637298d]
Former-commit-id: 901f6a60e71dbcb56067311e23cfa3f727a8cb87
Former-commit-id: 0a72eaa379e2b7d0612b7d005c116dea0605ed6a
Former-commit-id: 7144014cb5a30f98237045407087fec9cc83216a
Former-commit-id: 894c5e4295eb263a922b576d2359599bad8a3551
Former-commit-id: c27f054ab9255b788f0c9dd223be825e5ac33c5a
|
2018-09-12 08:10:27 +08:00 |
|
liyang
|
c5ff166720
|
Merge branch 'hotfix/cli' into develop
Former-commit-id: cd8899307941660cbab8c955b8d5d5f6d632f2b3 [formerly cd8899307941660cbab8c955b8d5d5f6d632f2b3 [formerly cd8899307941660cbab8c955b8d5d5f6d632f2b3 [formerly cd8899307941660cbab8c955b8d5d5f6d632f2b3 [formerly 4ddddec143151f29616706a72d99cb2a0ea83947 [formerly dd744795ca026c6a4335a807dd96c1e89cfcec03]]]]]
Former-commit-id: 8f1e5e0a867784c13b255757e2c140d75b8b3704
Former-commit-id: 54fcce1607bc0ebd4ab7256376de0e09609ef08e
Former-commit-id: a5acfa93475ec3fa53085cf0c83d4664a75bd034 [formerly 806ce9838a0dad70c774c3f8ad00e5090770ee9e]
Former-commit-id: 2a9dc61ef76bfbea20124a9da06bd34a93938c1a
Former-commit-id: f98b4c1e6600c440d19a1d4d89c0260efa44e49f
Former-commit-id: eaea92d51a0f90bccfd05b0acf848af009208484
Former-commit-id: 09d24ca652a7d6ea56750d904627a0833dad8f0c
Former-commit-id: eec88a60f13199b912d20b28c0509c14fbccc906
|
2018-09-12 08:10:27 +08:00 |
|
liyang
|
08789f2edb
|
symlinks
Former-commit-id: 648e73eba9f36055ee176fa0ffd4fd249d83a969 [formerly 648e73eba9f36055ee176fa0ffd4fd249d83a969 [formerly 648e73eba9f36055ee176fa0ffd4fd249d83a969 [formerly 648e73eba9f36055ee176fa0ffd4fd249d83a969 [formerly ed06554acf0d631543d588aee3168e755160254c [formerly dd6bb685a95e6af52b2e1f62e55da787c2dc9abf]]]]]
Former-commit-id: 881a777ca3b34f27f2fe53b59629a116190756aa
Former-commit-id: 5c090e456cab182c1ba08c0379ec9faa1f30819f
Former-commit-id: 7145dd6a26091e158facd5a190045ea739cd69cc [formerly cc038b48c71da1ed8d992e105cf14aa094c17de3]
Former-commit-id: 1f201c8e6badb3959bcaffe4691ef31e5d476d3c
Former-commit-id: d8e9f886713011a532d9097739b5669fe9c54aef
Former-commit-id: 70dcf760d460d297d879e77b23153bc32e7f68f4
Former-commit-id: 093877a858cfa8b88c9ddc852420ffd247a9782c
Former-commit-id: 02dad2ef0e0e57906fccc4ccec19457a4c5969b4
|
2018-09-12 08:10:16 +08:00 |
|
liyang
|
3786b7ae04
|
lint
Former-commit-id: ecdadbbb5239575790787988dff81e89028e4b21 [formerly ecdadbbb5239575790787988dff81e89028e4b21 [formerly ecdadbbb5239575790787988dff81e89028e4b21 [formerly ecdadbbb5239575790787988dff81e89028e4b21 [formerly faa40145c1044f7d814aca7335e2958ee2af488f [formerly e7a26ae4b2b89f1095af40fabc80b6d7c28a88d7]]]]]
Former-commit-id: cdb18109e6f6405a153c0c77085cb26bfa2866f9
Former-commit-id: 9cd8dafaede8e06c29b9c1b28fbdc2a1ba3789e6
Former-commit-id: 8ee55ec8b9fa61ddc5c04797706db62c07e66fa9 [formerly cf46566d4316a4ac126dba8a16c9155133d6d6a1]
Former-commit-id: 7978ef3eb50dc580a497919fb7360ae382ebe71e
Former-commit-id: e0ae6ead53a9ea798a0746e72181f19c69786d2d
Former-commit-id: 784f3641d01fe1f6705725411e2abe95d0a3fd35
Former-commit-id: 13f3be9e685bd44b2c04b7821f1e737e4eefc7d9
Former-commit-id: 13aaa78b3f2f9808641261666f3c71aeb097dd9e
|
2018-09-11 16:46:24 +08:00 |
|
liyang
|
cf40b6802d
|
no message
Former-commit-id: d2ed779ddb2dfe94b6b5d41cd3825079c2e7439b [formerly d2ed779ddb2dfe94b6b5d41cd3825079c2e7439b [formerly d2ed779ddb2dfe94b6b5d41cd3825079c2e7439b [formerly d2ed779ddb2dfe94b6b5d41cd3825079c2e7439b [formerly 8f5cfd3c33e32d2ff37d25e4e34ed61741eb1fa1 [formerly c686ceb0e645a0dd653c6fee403a798a5b91b034]]]]]
Former-commit-id: 3305041bc85763ddbf1a87be400b4e2e7ccbb8b5
Former-commit-id: 1288647619abbdb6e58e664654e47fddb9a37009
Former-commit-id: 931dfdedcf3b5bf43ca69af5c74b08b4d53613e6 [formerly 9c8ecc0dcb6d3b5d81045304e70f2502a0b5e0b6]
Former-commit-id: 18f5933d3c962f792f492f3d6f2997a8466f80ba
Former-commit-id: f5efaad087762fc1603aa7e8f214236d7f4c67b5
Former-commit-id: d90125d91809d253419b09f6121651efec3212bc
Former-commit-id: ca39a5ea51976cd81b5a015d842aa0d48d41ef82
Former-commit-id: d9d4039049ce37aaa121c2f47c6514786f47ecf3
|
2018-09-11 16:45:54 +08:00 |
|
liyang
|
85caf99aed
|
Merge remote-tracking branch 'origin/master' into develop
Former-commit-id: f709e893266235ae2e549189a2a3e7c7a07d3a56 [formerly f709e893266235ae2e549189a2a3e7c7a07d3a56 [formerly f709e893266235ae2e549189a2a3e7c7a07d3a56 [formerly f709e893266235ae2e549189a2a3e7c7a07d3a56 [formerly 638780ad06505f722263af4d5a7aca16f0786b61 [formerly ff9712cad54e3a2ade344a8a9d80e3d07ac953d5]]]]]
Former-commit-id: 2193f494b0bfec83a73d2a6cc3106e7e8d4c36be
Former-commit-id: afdb52d90f048f27bb909cc173151a0cd9959ee3
Former-commit-id: 1a046250186ac1fefbc56c21f7a9d23e8cfcb596 [formerly 380e1c2948eab2fee4297da69c3378964ff76bd8]
Former-commit-id: cc0f2345bb0548d7d50d26098793e89e5813eaa9
Former-commit-id: fc13751c07b490e3f80085292b50815e82aade02
Former-commit-id: a80499c79a245f6ec7bd964afeeecad09c1f4625
Former-commit-id: 9334d5c479d986ad1568e4735774b58e3d487408
Former-commit-id: 644f82a15215ebea90892156a76a0c1d62eb44fb
|
2018-09-11 16:19:14 +08:00 |
|
liyang
|
3c45b7826b
|
lint
Former-commit-id: 71a2764ab9f9182a228b4ef2430d34ac1155ab2a [formerly 5cca526567e38ae2c56a1937d6353937556d53e9] [formerly 71a2764ab9f9182a228b4ef2430d34ac1155ab2a [formerly 5cca526567e38ae2c56a1937d6353937556d53e9] [formerly 71a2764ab9f9182a228b4ef2430d34ac1155ab2a [formerly 5cca526567e38ae2c56a1937d6353937556d53e9] [formerly 5cca526567e38ae2c56a1937d6353937556d53e9 [formerly ebf639ff4f1270d7b16839504ccf2fb597aff4e9 [formerly a735f157694d21800bfa2ecfcfea33aeea5b0d90]]]]]
Former-commit-id: 0a11111a407db759fb7be43b366176119998bd7c
Former-commit-id: ca189c6b8b2df71163e50be10371d834939f44df
Former-commit-id: 0e2dfa82b90811ba932f90ad1dbf39f5bdc7d013 [formerly c0e44e48b1cc673e0e4a0eb06a4a35af3b0aa0d7]
Former-commit-id: b0be18809df8c17804dca3a1ab595e4faef65a2a
Former-commit-id: 45fc9fd398f4e69bf7b2fcd2e5bdbb665c0789a8
Former-commit-id: 0391b056f26d709f7a4ff7ef4c6fa1662384f223
Former-commit-id: 5d8821dd3c5b432ab22565b309d55ad722584eb6
Former-commit-id: 544fddab22f387068f91ca546254dd27929c5dee
|
2018-09-11 16:19:03 +08:00 |
|
liyang
|
1343c8ed65
|
Merge remote-tracking branch 'origin/develop'
Former-commit-id: 4603c657be86c073ce4f047b1879991e1add74fc [formerly 4603c657be86c073ce4f047b1879991e1add74fc [formerly 4603c657be86c073ce4f047b1879991e1add74fc [formerly 4603c657be86c073ce4f047b1879991e1add74fc [formerly 4bbc1f9ba7050a5b8b7e2142bc57d0a2b394d427 [formerly bcc1dba0f6e54b265103057f4aaa48226cc6ca96]]]]]
Former-commit-id: c61a0e6ca81be3b3b700f13742ff81f7db5b7867
Former-commit-id: fcbf37bd6161a194a9ff0e8a6c2695a2e9abdb2e
Former-commit-id: 9d3700ed2871c5d2e6865ec33d3d6c1d09610106 [formerly 64cbe0d09f1143f624d971e727dd97b6afe23610]
Former-commit-id: 927170283ed193e5d9df88688785df42eccf5505
Former-commit-id: a8070daff2adb892ac07b1c6a820127ca6c546ee
Former-commit-id: de3959f982c4d5cb812c258155c5bc0b4304d9b4
Former-commit-id: 43918e5771e7b8f1401db353089ef70be031533a
Former-commit-id: 7ac90d5c75a9eeb133488b51b3a7f5e194fb6ed0
|
2018-09-11 16:16:33 +08:00 |
|
liyang
|
775633b755
|
Merge branch 'feature/keepAlive' into develop
Former-commit-id: 833fd2228eaacea1db7845a42f49373a0eeb1938 [formerly 833fd2228eaacea1db7845a42f49373a0eeb1938 [formerly 833fd2228eaacea1db7845a42f49373a0eeb1938 [formerly 833fd2228eaacea1db7845a42f49373a0eeb1938 [formerly a64fd03cee02b4ad2cb06798e668cb749813cf4c [formerly 8b10605d57705c989b942c129650faae47cb8a55]]]]]
Former-commit-id: f4437cff458af1c49e5854255214cc2c1b965b73
Former-commit-id: edd3c9efa75fcbdbd7d1ce2de53572b9dd793a6f
Former-commit-id: 3ac645b0cf5b4be88437c70e717d084be6932264 [formerly 5a42f1abb2599241cb26c8584e1e85994e050566]
Former-commit-id: f19cac00ea703fe5e4e3350cfd91eaf1e09f6c72
Former-commit-id: 62229b5a2cd59ab7026b49fd45a5650f2eef8cd0
Former-commit-id: 7dd2138c04fb3e5a49961eeceb5a9e38ab389516
Former-commit-id: 4093ccf675da7e89493d8a5d2debb3c29389a29d
Former-commit-id: c2287cb61895e51a8ddc80af3626d9eef19f148f
|
2018-09-11 15:41:06 +08:00 |
|
liyang
|
45c75515c1
|
add sizeValue
Former-commit-id: eb5f81780ca55e1d318f8535512e9dece0a00943 [formerly eb5f81780ca55e1d318f8535512e9dece0a00943 [formerly eb5f81780ca55e1d318f8535512e9dece0a00943 [formerly eb5f81780ca55e1d318f8535512e9dece0a00943 [formerly c771f8752885f773fd7b01e18704ada8f67e2262 [formerly 81d588de82e5a3465d0e657d077859b8626eb6b0]]]]]
Former-commit-id: b64d15fa59efb23e167725a898f3d682e89f3464
Former-commit-id: 08b74710ff008f3b682bcf47e079c35dedeebb9f
Former-commit-id: e43a9e882914f64e046941862eddffc79ee7ca7b [formerly 0efc0c8a390ffdaff309ab831af04c72ca8c0087]
Former-commit-id: f8f1c20da16f9731aebde21ee58d3c8904d71b68
Former-commit-id: 6c1875d0aef4736b93b0c6ed24d5d5b86093c593
Former-commit-id: ec16a3b74e539c76f7ae7266493cc28202cf3d0a
Former-commit-id: dd693ccdfd593420dc3fff0918223fb177680792
Former-commit-id: af439a23c6500b4bceb289313be9fa2d2333e2be
|
2018-09-11 15:40:52 +08:00 |
|
liyang
|
4240c8a778
|
keepAliveRefresh
Former-commit-id: 3338338a7b597f1440e6f482838ab5ed0a9cfe30 [formerly c0c80cbbf5d196d1870f3c2b1a3a23e17ced039c] [formerly 3338338a7b597f1440e6f482838ab5ed0a9cfe30 [formerly c0c80cbbf5d196d1870f3c2b1a3a23e17ced039c] [formerly 3338338a7b597f1440e6f482838ab5ed0a9cfe30 [formerly c0c80cbbf5d196d1870f3c2b1a3a23e17ced039c] [formerly c0c80cbbf5d196d1870f3c2b1a3a23e17ced039c [formerly 42c0248e4aef8466b792b40271447c0bc5759a24 [formerly 77bbaf7a214d5acf9447108aea49371d4b836811]]]]]
Former-commit-id: 6076feac7bf820b21b9f2321867fa9f22c356a4d
Former-commit-id: 8ce137aa6af24fd0a947f35eeb14c216915ccff0
Former-commit-id: 846957c13cce146c14e8769ad82e8fb0212c83e3 [formerly 91a9bf91cae1ff9964fe87ba8d781a9664a8f5db]
Former-commit-id: 9c024f7c3c1264b7a241af19b02edce072b7bad5
Former-commit-id: 1cd7ba2f0a4ed24e4165cb3556b54eabef0120c3
Former-commit-id: f3264fba10389e8f01dac2fc8b0b7d860b554976
Former-commit-id: 7f4e9b1f10362be82ddd06b581ac2efcd2eb1078
Former-commit-id: 46e66facb4413c49220b5e64a4a54482b26dc657
|
2018-09-11 15:06:41 +08:00 |
|
liyang
|
8cc6254758
|
keepAlivePush
Former-commit-id: f9db4209516f7cb157a6a6e2ce7b411864bac50d [formerly 1cbe7fd07c092007b473a6c2d2147805feaff7a2] [formerly f9db4209516f7cb157a6a6e2ce7b411864bac50d [formerly 1cbe7fd07c092007b473a6c2d2147805feaff7a2] [formerly f9db4209516f7cb157a6a6e2ce7b411864bac50d [formerly 1cbe7fd07c092007b473a6c2d2147805feaff7a2] [formerly 1cbe7fd07c092007b473a6c2d2147805feaff7a2 [formerly 1608553a3e54546860763ca77ca022768b775edf [formerly f38ba4b88c48c23b79b5658b4e47e42dc214062e]]]]]
Former-commit-id: 9a443bb71cafa820835d642f11ef1aab4033d50f
Former-commit-id: 8f5c9516e135c75875b06bd0be886ca4c830bc7d
Former-commit-id: 1ac322c60c70dda3e645638a6feccb3ed7ac61de [formerly 6ca02dc4595f8b4ae65727ef45a2777e207dde7e]
Former-commit-id: 644c11b16d4d22f7cb8517db5bb5c655f7ebbdbb
Former-commit-id: b265a95e2ec4c84cb8a876332ad61b4b7a0570ad
Former-commit-id: 70fe217bf91aa2afe327e9197bb4c7fad28d4056
Former-commit-id: fdefd291a9822096cf04c7b92cc4278e0db04f64
Former-commit-id: 86dc904b03b44609498573f1408f1c90607296c5
|
2018-09-11 14:38:03 +08:00 |
|
liyang
|
770144736b
|
router setting
Former-commit-id: 3e4f06a60e4c92932122a3368605b4ac42899b6d [formerly 3e4f06a60e4c92932122a3368605b4ac42899b6d [formerly 3e4f06a60e4c92932122a3368605b4ac42899b6d [formerly 3e4f06a60e4c92932122a3368605b4ac42899b6d [formerly 16f37c7e5df70305e921f65cc6b321adba08b3e5 [formerly 5bf9057f2f0d5aa8c3f0ffbaf84b398677bbf71d]]]]]
Former-commit-id: de05d584c4c7f9cdc62a4007d7372232affe1f84
Former-commit-id: 6d2d0ebf90c2a9d8dfab48bcdef10288901efd8a
Former-commit-id: d5ef4f24d786a4ada844119f806b463ff276ee8a [formerly 634b5cf7531e1f54b3c77f7ca3e2db4e958c4854]
Former-commit-id: 8928a2dd3ea5a21a731c3e61629d05aca5b0a506
Former-commit-id: ffd72f5298fbdddd424df60fcdca3d3e2be42efc
Former-commit-id: cee597fdc644e10998a20be13788100e984315e2
Former-commit-id: 6e53a652ad79cb7b8dd094e2d44a5caec4bb4137
Former-commit-id: 2eab690a0ea75063860f9da2c8335e3d4ea326ba
|
2018-09-11 13:47:06 +08:00 |
|
liyang
|
b9d63f2fc2
|
redirect
Former-commit-id: c5c758a3e2b5e82f3e3f64b89b4fa3f82e7e18ca [formerly c5c758a3e2b5e82f3e3f64b89b4fa3f82e7e18ca [formerly c5c758a3e2b5e82f3e3f64b89b4fa3f82e7e18ca [formerly c5c758a3e2b5e82f3e3f64b89b4fa3f82e7e18ca [formerly 6f0f7f02f0824fbdb259814c067629459e23288f [formerly 758f016ea87157922f71ccce0e70ddf554bfe298]]]]]
Former-commit-id: 2937c303eaf13793d17401d98873a54e2c2b7d1e
Former-commit-id: c75e02b1ecd6494143a837518341bdc853363532
Former-commit-id: 0e6fc404cdfdfe4bdea4dc4183c653b7cfdf4e81 [formerly 3707dda6fe9b1e959fb83e85fec4ae89af6eebe1]
Former-commit-id: 9adb43687549c659fd6f51e6167928431df4cb84
Former-commit-id: 97ab4d485b7ead419e0c75e208bd1674950e9b67
Former-commit-id: 243cef2a4e6077c855b60ca35403aa0d385a6bdd
Former-commit-id: 2c0e1d3d49d4f7c8d7d7139b1402a93e3ab84878
Former-commit-id: f2425ec903b4aaabf3bfb11357111e9a25bcd83c
|
2018-09-11 13:26:54 +08:00 |
|
liyang
|
c4aefe50c2
|
设置相同则不更新页面
Former-commit-id: 552d5a821af83274e1c396ae0108b10b1637ac31 [formerly 9d814d5494c25900c102e1c0cc3a13dd03998748] [formerly 552d5a821af83274e1c396ae0108b10b1637ac31 [formerly 9d814d5494c25900c102e1c0cc3a13dd03998748] [formerly 552d5a821af83274e1c396ae0108b10b1637ac31 [formerly 9d814d5494c25900c102e1c0cc3a13dd03998748] [formerly 9d814d5494c25900c102e1c0cc3a13dd03998748 [formerly 0beebaf44d8232a29651b3625f653d18ba2583a9 [formerly 20dcf114746fb2fd7ce4446e0ca4fd4a79bf655b]]]]]
Former-commit-id: d5207fdf94e6bef43fa3d84514ad4c424084b63f
Former-commit-id: 237829b7505f9fe5f24347b07f6dffd09a0608b4
Former-commit-id: 0b5561562259ea9991038cd2cf4e882546dc7729 [formerly 3d1eb948aa71bc628f8fd04a81ba8535c5954c3b]
Former-commit-id: b7512d11b3c28a1128fb5eed942c84f455fd90fe
Former-commit-id: 7effa5ab96743951cea8008ecb1468e8bd1cc8a7
Former-commit-id: d2bbdc487cc6b59da42617d489a255fd974ae9a2
Former-commit-id: 176d6d7bd7f727147079db3e9c89ae73e2fcf532
Former-commit-id: 0283f2ca3211a1aea57c7e0169497f7c0eb6269f
|
2018-09-11 10:37:06 +08:00 |
|
liyang
|
dcaca434af
|
更改字体大小后重新加载页面
Former-commit-id: 8bd2181aebe2d5bb0031d3f14285d99dd71cd600 [formerly 51cfdcb33fea7ed230623e6af1c6fabf82f46385] [formerly 8bd2181aebe2d5bb0031d3f14285d99dd71cd600 [formerly 51cfdcb33fea7ed230623e6af1c6fabf82f46385] [formerly 8bd2181aebe2d5bb0031d3f14285d99dd71cd600 [formerly 51cfdcb33fea7ed230623e6af1c6fabf82f46385] [formerly 51cfdcb33fea7ed230623e6af1c6fabf82f46385 [formerly 3971f03675e8e0821dbd3f368256e16a994b6e51 [formerly 776505901685f2c95336c3c436d2534b31f398a8]]]]]
Former-commit-id: 2f6323c1e76bde0b8ab10eba2a682e1002dbb5db
Former-commit-id: f3022bef3c6cbc5a692597c92469bdac1949765b
Former-commit-id: ff9779ffcd0a7249242431e09ac9dd1115282d4a [formerly 0ddfd187a6f0078ccb8f6c73b4486221c5a23a06]
Former-commit-id: 753bce6ee4c53f6ae3d635d4756562ce75bf5ad1
Former-commit-id: 90faedc34e09c7caea4ab6c86835f19963121d45
Former-commit-id: e51610d40966f4b6ef460e6c350a61e51fbf52c9
Former-commit-id: ce9941f577755eae35b65f684bf2c937fd2aeaac
Former-commit-id: dfc181c42686598941822acffe437e596550c01d
|
2018-09-11 10:28:47 +08:00 |
|