liyang
|
bcffe29c6a
|
Merge branch 'hotfix/vuex'
Former-commit-id: d0bc0c32e6f87c7ed9e55b94d9fd4b44c82c77f0 [formerly d0bc0c32e6f87c7ed9e55b94d9fd4b44c82c77f0 [formerly d0bc0c32e6f87c7ed9e55b94d9fd4b44c82c77f0 [formerly d0bc0c32e6f87c7ed9e55b94d9fd4b44c82c77f0 [formerly b2f8c807728cb089df348c3115f8dc49070f4395 [formerly 1a4ac5b0fc9116f26898d26c335f6d3ee369fd1a]]]]]
Former-commit-id: acaf281908f54af4901aa218c235ac8a11fd058b
Former-commit-id: f6dd8f78d814a818331d8af60f6c5a00cb8f0ae6
Former-commit-id: 6d8842ba7dcd35663f9c0f0e5d5f7920fe1c92d0 [formerly 0b34c31f143fba9724b3c22bdfc8bbae51be0d04]
Former-commit-id: 7378dc416b6be8b623c8d17c121bb9b9302f3da5
Former-commit-id: 6fd6882f6a371f0d4d98c70d14c31e485717d6c0
Former-commit-id: 4565199f323fcb2cd89015d681887fca974dffe6
Former-commit-id: de585579980eea217b0fc1aea9ee4c39a113643d
Former-commit-id: 022a1700b83ac6a1966f925538bb29cdef3635c6
|
2018-09-18 11:16:29 +08:00 |
|
liyang
|
12aabd1d58
|
no message
Former-commit-id: 48559a6c19dcf2c2dc386c50b39eaec3676fa1e6 [formerly 48559a6c19dcf2c2dc386c50b39eaec3676fa1e6 [formerly 48559a6c19dcf2c2dc386c50b39eaec3676fa1e6 [formerly 48559a6c19dcf2c2dc386c50b39eaec3676fa1e6 [formerly 8d0683612bf0b8cdb70b21b6badc69cfd620df5a [formerly dafeae1d99aae939a8d74ff7136e3cb20187f9b5]]]]]
Former-commit-id: 74d80f9cdcc0e0b715301fc9dc2e1c60b5d6584f
Former-commit-id: fb8ae970044e24416eb4ed5845c8c8f7686732d7
Former-commit-id: 1970627df90cd7afaef7ceaae479c78f8f1a1271 [formerly 867fa683b162cd05b0cd62eb93cad7e04db59193]
Former-commit-id: b280766dae7b983a49a8f5e76ce8299edb3686f9
Former-commit-id: 8ef7dabe9284e66b07da42de959f2efbd0629f90
Former-commit-id: ad38ec7743de387e3448e721d22f81320a5450aa
Former-commit-id: 7054fc758430ce204c932ba521831b3cf418a469
Former-commit-id: 48556d369d24e25344cd1ee8a50fefda6922779f
|
2018-09-18 11:16:19 +08:00 |
|
liyang
|
6f5a70f532
|
Merge branch 'hotfix/vuex'
Former-commit-id: 3b51cbb060607f08e9263ef654d0748256bf3387 [formerly 3b51cbb060607f08e9263ef654d0748256bf3387 [formerly 3b51cbb060607f08e9263ef654d0748256bf3387 [formerly 3b51cbb060607f08e9263ef654d0748256bf3387 [formerly dfadfbfa308b8f50a148a094f8e16d41c1921333 [formerly 540551128ffd9b5c873eaaffe248fc62f36fc16e]]]]]
Former-commit-id: 4ec0bc0abf046d80ca4c2c72553af6ed46586388
Former-commit-id: 2600d95da4cd4aa9f23f8de95bc79af5a3f8db67
Former-commit-id: eda122a957232ae530c00cbc291ad287160295ee [formerly 808cb7d9917308326ac98807502dda4aa2a68afd]
Former-commit-id: a862b92b9d99047086998b670c8852e7d126f4c9
Former-commit-id: 721eac99b45b2de0431edf0a405b6a4bad03c371
Former-commit-id: b2c0f248c59da3dca441186373afdf25d440bb9a
Former-commit-id: 6ddd242d5dcb9fa856265a02fb765ba73d3b18e4
Former-commit-id: c88bb6c6a0db48f6f7a7c1ba382cf4abab98cb77
|
2018-09-18 10:24:27 +08:00 |
|
liyang
|
e50c58d8a2
|
no message
Former-commit-id: 9750308bef790df38a3ef6bcba316fb0f9697866 [formerly 9750308bef790df38a3ef6bcba316fb0f9697866 [formerly 9750308bef790df38a3ef6bcba316fb0f9697866 [formerly 9750308bef790df38a3ef6bcba316fb0f9697866 [formerly 0479091286ca61f30b123810db0a87196eb3dac1 [formerly 61ec8193c62099b658488bb91d60dd1abeddb91e]]]]]
Former-commit-id: 273d4d2602874c9604866d0a9af1ec8d5fe9cd3c
Former-commit-id: 8b55642a785c01930f42ff8fe14ba4dd88b7d4aa
Former-commit-id: 671e44d2cd87e2c454fe1c302e6ce760dedb12f6 [formerly 143ea9e6283c5f3106ee3b9beaa46c6eb046dc45]
Former-commit-id: 0a5cc3c3446d71c20881750235c6427238f620cf
Former-commit-id: 8c8b365399c92d91d971505edcbaa080e8fed779
Former-commit-id: 35e40f3cf4ce652c06583f715736cb7bab335e23
Former-commit-id: f5e3930b893573dcfc82aa8d5d663db56d7656a4
Former-commit-id: f4728a96b3be4e92709c1e5b813fe155be5d1bfd
|
2018-09-18 10:04:36 +08:00 |
|
liyang
|
ded0f48e02
|
fullscreen
Former-commit-id: 8e0fad24ac1d8a84386fc1a358239bbab9d1abd7 [formerly 8e0fad24ac1d8a84386fc1a358239bbab9d1abd7 [formerly 8e0fad24ac1d8a84386fc1a358239bbab9d1abd7 [formerly 8e0fad24ac1d8a84386fc1a358239bbab9d1abd7 [formerly 8f6580957550c9c8d530b71ab430aaa07cd07413 [formerly 77cbd9e33dc270afdf0d71d9c5b06bdb286650d3]]]]]
Former-commit-id: a4b60763db9904803c2e307ce890e8b2e2764fa8
Former-commit-id: dc642785a8bfe603fdc5cda7ff02c494ae2dc8f4
Former-commit-id: d5da1f86afc2e8525d2f4036f1d13fd26e7e0a6c [formerly c355a17a90a32446e69c91f110417df0b16614fe]
Former-commit-id: 822d0836dea34d84516a60ece8f1787c4ac15f4e
Former-commit-id: 2e903eeb5d15357643c3618cea0e87db7fe99209
Former-commit-id: c6b50b28ef54513fcd796c97173ccdc988284d17
Former-commit-id: 239c00dc8d3190e64957c80faf838905414b3719
Former-commit-id: ae1482194ac6b24e445207a84ef446a1151136ad
|
2018-09-18 09:44:55 +08:00 |
|
liyang
|
5776e013a8
|
pageKeepAliveClean
Former-commit-id: ebe16566152c4aa33c0e7d1993e458c62a7073c5 [formerly ebe16566152c4aa33c0e7d1993e458c62a7073c5 [formerly ebe16566152c4aa33c0e7d1993e458c62a7073c5 [formerly ebe16566152c4aa33c0e7d1993e458c62a7073c5 [formerly f7f44bfb8cd1dd731d69176083538554bbb94e8c [formerly 72f4b2ffe8936fa551667cdfbc1ce5c88c49b467]]]]]
Former-commit-id: 032cc1e37c902d9d936e48437e126e2247c6be69
Former-commit-id: 82f32731d6aa4e146a3550b02177a96d8e1c3e0f
Former-commit-id: 661e658d01ff0568436ec998544f27ac74e5f5b2 [formerly c20d8c52df9985521230246e6bc500fa88d33991]
Former-commit-id: c79b7b69cdba7e002a02e296c444af9402afe2ed
Former-commit-id: cae4f106ba68364a925f15896afa15633601242e
Former-commit-id: 8a5d2b15e3f262d9f1f526f0ea009aafcf2ee535
Former-commit-id: 29918980b561a29e8805e29c3c041f793a911f6f
Former-commit-id: 190a7724a7779f5f0e4e6baf8b6a91f8638c41c4
|
2018-09-17 16:17:34 +08:00 |
|
liyang
|
40b508bda8
|
no message
Former-commit-id: 333139d4a53a1f904c1b869e882849b8b3eb2827 [formerly a39ee532a8dceea8c54e30fdf0eeb8981615355f] [formerly 333139d4a53a1f904c1b869e882849b8b3eb2827 [formerly a39ee532a8dceea8c54e30fdf0eeb8981615355f] [formerly 333139d4a53a1f904c1b869e882849b8b3eb2827 [formerly a39ee532a8dceea8c54e30fdf0eeb8981615355f] [formerly a39ee532a8dceea8c54e30fdf0eeb8981615355f [formerly 43851ea42b4406d2090813a0ae239e17c008cbec [formerly 17743573baa14404bef2c8498f1f4bdeb8eb4fed]]]]]
Former-commit-id: d7d425fd5f12873937f3011a193fecc340e22e4b
Former-commit-id: 190ccaccd5dc1d20df13eccc335be960067bb75c
Former-commit-id: ed2090a558c9fd303b0d124932b486be4ac4f432 [formerly 5189d7bc300e41387c1e1a85d34c66d1db2528aa]
Former-commit-id: 245ce33805193704eb23f363735975d2c901aed2
Former-commit-id: 222176cae5165f847398a263b4d51961cea937e6
Former-commit-id: 427b07b46144fb14c23ac9fe9ea5f5cfaebe9f0b
Former-commit-id: 3bf5d4f2d473a6b35074ff0c3e497624349ffffc
Former-commit-id: bb3351e6c47392b78cb1c9d1e25a5f6d39d00c8a
|
2018-09-17 09:44:46 +08:00 |
|
liyang
|
00238fe540
|
Merge branch 'hotfix/v'
Former-commit-id: be7723d23cf19e6a29a2caa6eae409f7455c0a2c [formerly be7723d23cf19e6a29a2caa6eae409f7455c0a2c [formerly be7723d23cf19e6a29a2caa6eae409f7455c0a2c [formerly be7723d23cf19e6a29a2caa6eae409f7455c0a2c [formerly b710195a5a2b4afaf450d23853a32ff796f06da1 [formerly c3a86ff38dacf8f3faf2ff7ac39b6a47527c0d02]]]]]
Former-commit-id: 8edd5096db39945e4e8b1c9df977dd99212dedf1
Former-commit-id: 101a576ef35388d7f5a1c5860be3a52cdf0da461
Former-commit-id: 0c6cc4a180874997152dfe7f683c88a52ff62b89 [formerly 0971c5b9acc4c721236e9cd072a9df75270c7f18]
Former-commit-id: a59caf4acb86f5e5c17f0842c7267fafcf38539c
Former-commit-id: 17d1a03680172a9bb331027299fab852ca87caa2
Former-commit-id: 199145f44e022cc461f5121a9b85cd9a24d834c3
Former-commit-id: 7fc4c3741eb21a09ee7fe6f939e1da51fb2f75f0
Former-commit-id: ef86a1b50f8f581b3fe19565017a4911ca260d4b
|
2018-09-15 11:59:57 +08:00 |
|
liyang
|
0ff3d79e36
|
1.4.5
Former-commit-id: 18d7d615c6ce5c3a7fe5a06d20a699bf99f01f04 [formerly 18d7d615c6ce5c3a7fe5a06d20a699bf99f01f04 [formerly 18d7d615c6ce5c3a7fe5a06d20a699bf99f01f04 [formerly 18d7d615c6ce5c3a7fe5a06d20a699bf99f01f04 [formerly ad47b7a950c180abeadce3cd902c3ab07e118eb6 [formerly df6a228184db6f54b8205954a61b845267043c91]]]]]
Former-commit-id: e33cbfd066c76b0fbfd599fd17b4057b38a9fc18
Former-commit-id: 6f6a36921995d22ac73ec592420ca4b946195d60
Former-commit-id: 76d981f4b4420bd753415356ad40b672a9a94220 [formerly 512e08ac137aec7b4352a9a9eed6c8bfe3fedc6b]
Former-commit-id: 7c842fd391a18ee1396c95491807500f42c63570
Former-commit-id: 048efe8d2f96d697425e8838d04f5cc89b1a3831
Former-commit-id: 79fa304e9d3741bf54540a2513a1825893b05c92
Former-commit-id: 0e650190cc715af3e3aa5c5a6f97f28b81606293
Former-commit-id: 2c5094e8da6bd242037c2bed1bfb129e622fed22
|
2018-09-15 11:59:49 +08:00 |
|
liyang
|
c853e01c07
|
Merge branch 'hotfix/index_script_src'
Former-commit-id: 1aa1860b821e2c143d4902beb960e686acf67531 [formerly 1aa1860b821e2c143d4902beb960e686acf67531 [formerly 1aa1860b821e2c143d4902beb960e686acf67531 [formerly 1aa1860b821e2c143d4902beb960e686acf67531 [formerly b84212d8aa3fa4779d54d62b69f4f36256d18cac [formerly 9d9535ab6382beb16e74115f3fc7ce3eeffad53a]]]]]
Former-commit-id: 4405e8d111518ed7a2bee836ee618d78779abf25
Former-commit-id: 66e57890163c6fbd20d279f67c6f1df6e9d6f5e9
Former-commit-id: ee9ddeee657db6e19033094b3bc6ed22ffd8bee9 [formerly 567690f3933fd1c0355f5b58f1bda18474f35da2]
Former-commit-id: d7cdab469a59e64c1ce9bcd78d9426a43dd98ec1
Former-commit-id: 72655392c6bfe848aa69c17c35be0d0f6f3bdf33
Former-commit-id: fb089d18e28c05f6af9035380256259f40731aed
Former-commit-id: dafae4ddc6fa66d8570e2785c535b1f86e155151
Former-commit-id: 50d8a459bda8936737b704060b76252ae4cb5211
|
2018-09-15 11:59:02 +08:00 |
|
liyang
|
6e6e8e7e2d
|
no message
Former-commit-id: 6f9ed888287e7afdd77743fc3cacb365909358b6 [formerly 7027d68cf3e67b292527c9a90483c46e3eff9da0] [formerly 6f9ed888287e7afdd77743fc3cacb365909358b6 [formerly 7027d68cf3e67b292527c9a90483c46e3eff9da0] [formerly 6f9ed888287e7afdd77743fc3cacb365909358b6 [formerly 7027d68cf3e67b292527c9a90483c46e3eff9da0] [formerly 7027d68cf3e67b292527c9a90483c46e3eff9da0 [formerly bc9ab269b4d43b538df20b373062f272b39e3479 [formerly a57c759206e2f95005af0da41c23569bf76f67cc]]]]]
Former-commit-id: 8ee9689290c7985f742720802ae98122cd738fcd
Former-commit-id: 9d056f15610d6b815eb6e88d3a509e7d665eabfd
Former-commit-id: 626ee5e841f7214b0c6cd46d16988966fecb3138 [formerly 59cbbac27f67a29688920dd0a729c2e28289df4b]
Former-commit-id: c04df1a400d50b73878ed34b57f77f2b1a9d6473
Former-commit-id: 0f861d56413be93c66a0d1a4006cf007f4a0a96b
Former-commit-id: fe9f26ccfdd4ea55bdac257dde9ddb2b50f4745b
Former-commit-id: 76b12c7309bb9a8d0ea48a487547418830f03009
Former-commit-id: a9fa32a4d292814ff131926d0a18c73a2ead6e8c
|
2018-09-15 11:58:52 +08:00 |
|
liyang
|
64b37771d3
|
no message
Former-commit-id: 9de6a4d161e89ad97a2980ca96a1c91aceb4360d [formerly 75cf026286ae0920687116206efa57c661eedb94] [formerly 9de6a4d161e89ad97a2980ca96a1c91aceb4360d [formerly 75cf026286ae0920687116206efa57c661eedb94] [formerly 9de6a4d161e89ad97a2980ca96a1c91aceb4360d [formerly 75cf026286ae0920687116206efa57c661eedb94] [formerly 75cf026286ae0920687116206efa57c661eedb94 [formerly e15c08b980ebf8fb74b335cb5e96bc38cf8dfcad [formerly 01b627f3b450c2a04753844d7ffee4c442122566]]]]]
Former-commit-id: d02313a518af2874dd60d4bf9f017f892b92e0c0
Former-commit-id: c03e7d53fd15fd496aa4650a089ec15156dd2456
Former-commit-id: 0f06179ec5560396d2b0649fd2e39ccabbc5a9cc [formerly 707cc21c295585804a4014d6a4b2a8d81c9bb0e5]
Former-commit-id: 1408eed2d2fdf045da5ad9be2ccebc422ea8e9f9
Former-commit-id: ad67a23cdf3f69836ea231e905e1f3fb43604992
Former-commit-id: d623d6dbaa594061f72479a6dd4d42f2cc63e4f0
Former-commit-id: 82dd1cd211a772d3c8dca25e19b739ed32b62a0c
Former-commit-id: ca5322c12a6c34d2522695ed3af4308f5dee53b2
|
2018-09-14 22:07:17 +08:00 |
|
liyang
|
2fdf5ea70c
|
Merge branch 'hotfix/build'
Former-commit-id: ec740da164085a3d58181b1a8bb84148f058a551 [formerly 4788e46750a0919eeaf7d7037ec93e40d4307eb3] [formerly ec740da164085a3d58181b1a8bb84148f058a551 [formerly 4788e46750a0919eeaf7d7037ec93e40d4307eb3] [formerly ec740da164085a3d58181b1a8bb84148f058a551 [formerly 4788e46750a0919eeaf7d7037ec93e40d4307eb3] [formerly 4788e46750a0919eeaf7d7037ec93e40d4307eb3 [formerly 74c5a5249075fe2d19f867afd2d174afae2240cf [formerly 92cfbedbebbf3d81172f56879b5bbdb53fa01b8e]]]]]
Former-commit-id: c2e2e7d2f2e2488d298840dbc4501f2af4e60701
Former-commit-id: 9c5f9e6b73bcac9b6c4bbb82c371d83f4201c443
Former-commit-id: 98716aba1303fda78c22ded47c1380055e221e02 [formerly 3901a7e6eb43c9b13e4335fd5e1e6fd50a8fcb8e]
Former-commit-id: 5bfe303ec4c1735d6b09a73d03207572f4c6432a
Former-commit-id: 449a8a97729c825da075cddcc1d39fa4d355673a
Former-commit-id: 731608e80040bc21720d29b4035be0c7eefc19ab
Former-commit-id: af0cee810dc9099c0d021e8eebb58b20ba24f88a
Former-commit-id: 96c924defe68510ce1afc82572c7553be47647c8
|
2018-09-14 15:18:26 +08:00 |
|
liyang
|
389e4f621d
|
no message
Former-commit-id: 8477119fd5f1b00ed475d5c1d5f58fb492242ce4 [formerly 8477119fd5f1b00ed475d5c1d5f58fb492242ce4 [formerly 8477119fd5f1b00ed475d5c1d5f58fb492242ce4 [formerly 8477119fd5f1b00ed475d5c1d5f58fb492242ce4 [formerly e82e470908f00592d5c37f6b4d10962a707d7cda [formerly d5a2ba18914a998a630f8bd918576b86fc532b69]]]]]
Former-commit-id: 53b9ca1133447d78cbc2d4cddcd18db27e0b27e3
Former-commit-id: c1fc2c2a96a6e90df1f64472929e251f7492c2d5
Former-commit-id: 03fbb8422c4220c8f0e3c31ccd01b18f9319d635 [formerly ac5c11121841be6a2e16b8bfb081b1d03d042f2e]
Former-commit-id: 5ba3172089d5f347542c7ffc088b6c1848ca6db7
Former-commit-id: ac2741a5d88ca3bcbaffaf5d9a7c124457f6121c
Former-commit-id: a9a1a889b3881f46ab6c1f3216d3392240eeec86
Former-commit-id: b09071b2a852488f288e601c1aa2c92452c5974e
Former-commit-id: 29ef11c5e19601331aff01fff968b475fed7c0f4
|
2018-09-14 15:18:15 +08:00 |
|
liyang
|
a7af1acbf4
|
no message
Former-commit-id: a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly a98f0dc7f8c8202102557ec44a29081de09ef657 [formerly f244e1fdd164c1b79a79bb5a6b747ee86b9d8589 [formerly 9a88fe535b9d40bff1dcca1e9c312ab81c0961b5]]]]]
Former-commit-id: 80f45f42407a12231dcb32861eae95da8b8f27d5
Former-commit-id: 294d0beb7890b73dd462900f6634b9ed43dda50b
Former-commit-id: f639bbc1de8e27b18262e84545ff22b8556c402a [formerly 0f01b98c3d1b41eaa511bb56813d860105da930f]
Former-commit-id: 9a33c6b83d309a76711c4fad397c149dac55a8b5
Former-commit-id: f556363312d2e505acc24ec531e787fc3863f9fc
Former-commit-id: 4433f382bc7c25d437eabfab96e4a7b0dbca28b5
Former-commit-id: eb558eb22372f558e8d93ae8dac07c40016e2644
Former-commit-id: 963b8effbe52965ae14a77172a37c50dcfd6cf56
|
2018-09-14 15:09:58 +08:00 |
|
liyang
|
b08fe0fc37
|
size
Former-commit-id: 016185852e1b512e544e2b8e0fe17105acadfc5a [formerly 016185852e1b512e544e2b8e0fe17105acadfc5a [formerly 016185852e1b512e544e2b8e0fe17105acadfc5a [formerly 016185852e1b512e544e2b8e0fe17105acadfc5a [formerly d4f506d1081f7073019db760921eb46132c3b0ef [formerly 8739959da40c0bb125b6d54e8eebd40bdbb289e0]]]]]
Former-commit-id: dd1ebd76877a12270738d07f4ad1b2a740738424
Former-commit-id: 31f092bdb4429c2821231385fe49544992b39c53
Former-commit-id: edaee9c02fa155ae126d72da323a5e4976db9b0a [formerly 7e407f62941d07994d32ef351c43b14ac8b8bea6]
Former-commit-id: b2348abfddfd93fe005b5cf2c98e8a2d7d807edd
Former-commit-id: 7c838eacbffac28bc9e4ed2898e7527d843cf0d1
Former-commit-id: f417c10eb84acbe70bcb7e34c2a569720a3c9f0c
Former-commit-id: f7aa3d5f2e78ca5cef82c82ffef1f62f9126d3f0
Former-commit-id: 010b19eafb2042f6247522f7f1b3bbcb044eb311
|
2018-09-14 10:06:46 +08:00 |
|
liyang
|
e5fe71d955
|
menu
Former-commit-id: f7643a7bc73cc1c678c2c4a6574d54ecf939e529 [formerly f7643a7bc73cc1c678c2c4a6574d54ecf939e529 [formerly f7643a7bc73cc1c678c2c4a6574d54ecf939e529 [formerly f7643a7bc73cc1c678c2c4a6574d54ecf939e529 [formerly a63c247d1756615695e4cd743c8b9ff1bb30f297 [formerly 7e5f49d341a9037b2dd77ac6c7ea0bfb8998f307]]]]]
Former-commit-id: 6d11cf118e7916d07ac08c51706469046011968b
Former-commit-id: fb85bcdd39e82f5b4567d8e8c712d2499555eb3e
Former-commit-id: aa74cf284d58e2671677e911a61babee0a36932e [formerly 50dce6ce583a14ad116c7ebadd7d835ac8be03c5]
Former-commit-id: e7085366dbe0ca59b31077537d6499eb49e5ae1b
Former-commit-id: 77117d4838bdc9680f45d0c534dbefdb957ef778
Former-commit-id: e4e8f0bd37dfc653561b928abf473b3cc32850df
Former-commit-id: 01ac1a30c777399eaff801ab5b4ebbc2c617cdbf
Former-commit-id: 2a651e242aba08678d20696759de7e022a3f35de
|
2018-09-14 09:45:23 +08:00 |
|
liyang
|
8c3c2f81eb
|
transition
Former-commit-id: 02bd7f913030974f8fea14eca765da453cad40f1 [formerly 02bd7f913030974f8fea14eca765da453cad40f1 [formerly 02bd7f913030974f8fea14eca765da453cad40f1 [formerly 02bd7f913030974f8fea14eca765da453cad40f1 [formerly c80358c9fd4064bdcbb3e8208cdae8960ad29c76 [formerly 339084b596728ca59169ccee025cd5cfb04cc0ea]]]]]
Former-commit-id: 0eca34a7cefeac571a42b089b7b606bb0b58321e
Former-commit-id: 66da672644dbfbe7ced81383b12a48db14eef43e
Former-commit-id: 6580885c5fc24b70ab60017af72f33a9a17a7816 [formerly e217ea71e67a326b82c2dead714fd845af6451d5]
Former-commit-id: c8f62875e94b755e14caff6e1f43fada83b5cadf
Former-commit-id: 54e5871a85ecbb0e8e23c9359fab455f4d096457
Former-commit-id: 4e15d8fa611c28e7750c974cfd95e43ef6031f7a
Former-commit-id: ab1da431925c17c7ff42f73d54897e72a98aa092
Former-commit-id: 6f8297b77f9bf5d960a74cbc6ac787e58241b42f
|
2018-09-14 09:02:49 +08:00 |
|
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
|
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
|
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 |
|