liyang
|
5b4f66b26e
|
Merge branch 'hotfix/1.5.6' into develop
Former-commit-id: 3a23bb93719c139606418dd3db3ecdd198066b91 [formerly 109f52108e636a1539cf24c2400cd059ad13d1ea] [formerly 3a23bb93719c139606418dd3db3ecdd198066b91 [formerly 109f52108e636a1539cf24c2400cd059ad13d1ea] [formerly 3a23bb93719c139606418dd3db3ecdd198066b91 [formerly 109f52108e636a1539cf24c2400cd059ad13d1ea] [formerly 109f52108e636a1539cf24c2400cd059ad13d1ea [formerly f96e5173bdb3c81ae1f4d5ee059804b11e635dee [formerly eeebde90e72a58fbb7cd404164d81bc00e10f8ca]]]]]
Former-commit-id: 6de29c4587381d646bc2a06e89cdd4277fc896dd
Former-commit-id: 0bcb092116974e34c341746ad92f12fa291aefce
Former-commit-id: a5fbe302c76848d432741a5c1d9f697a92bbedd9 [formerly 21486a506bfcf985b80a7c31d8e47c18048bcd66]
Former-commit-id: 43977c26dd5a9bb1e0da50f15dc03b14cad84c07
Former-commit-id: 7c314597e932e5e9c3978f8b7c5458607d1dae20
Former-commit-id: cdbd1e5712d0efe15c80f35fd0639bda966c7195
Former-commit-id: 9c103e508d3076ca659a5998a7f6d7248b0fc346
Former-commit-id: 2ea76da26ebb9c98a5e4935d6cc763204766fb20
|
2018-10-30 19:28:08 +08:00 |
|
liyang
|
505530618f
|
简化写法 更新版本号
Former-commit-id: 173c42df03caa9fb7a31c9296aeac36bac0c8b76 [formerly 173c42df03caa9fb7a31c9296aeac36bac0c8b76 [formerly 173c42df03caa9fb7a31c9296aeac36bac0c8b76 [formerly 173c42df03caa9fb7a31c9296aeac36bac0c8b76 [formerly 5f0560f284a08be4bc29f7906c6c480685ac1f95 [formerly 96a39c493bf646cbc5cfe25984942ad0e338e34a]]]]]
Former-commit-id: 35232273976829c6922f36792b24cc7b56397d0f
Former-commit-id: c5ecbab7a675aa0b154fd9944d3606bf2be35a8b
Former-commit-id: 9391b0e1bb3bd37727614fbb352367d537c0e36b [formerly 3bebcb5855886940f9e7e7e1bfe198c9eff0672a]
Former-commit-id: 529c365a1c25784940c9136eedf1aa40061b3f89
Former-commit-id: 6c5886bbe6791e8f4debd4dfbda3c40e3b58dcbb
Former-commit-id: f24eddbd4645a4390f4bb9dc3ae966329cca90ca
Former-commit-id: 1e810615e81ce12e5fedb993486364aaed9ed024
Former-commit-id: 2b42527d5d3418f971054198e1e38c2d4851e1ca
|
2018-10-30 19:27:58 +08:00 |
|
liyang
|
d31780f4ee
|
Merge branch 'hotfix/优化'
Former-commit-id: 7a43d6a0094143a9fb5f02ef416b7f52d5298e66 [formerly 7a43d6a0094143a9fb5f02ef416b7f52d5298e66 [formerly 7a43d6a0094143a9fb5f02ef416b7f52d5298e66 [formerly 7a43d6a0094143a9fb5f02ef416b7f52d5298e66 [formerly 23ebd874a4df4e14a2233677e446109a7d81d1ca [formerly 3fa891f350ad65c97b6523ca159d7f62983e26a8]]]]]
Former-commit-id: cadc4e57ec71ba43675cbe2bbc120ba50b1e1120
Former-commit-id: 3908be0874c1d48a8724f452c0457b74cf21ab11
Former-commit-id: cdd143a57e072b8002c7762bfb4b2f31e6d28556 [formerly 76c562eaa03dc2334c32c54199c1d7cfcf1b5e6e]
Former-commit-id: f3c8412cbfee44ff0734ef92460e7cf16e7af599
Former-commit-id: eedaa62d22ec27d612e8b9deb41cb6c910526539
Former-commit-id: 6a4d83ee30f1b0f71535807be19d22f80c92c590
Former-commit-id: dae6ed243218dd1108a67d69abe77fffaeea81a8
Former-commit-id: d56c0806c09580543f3e927ea7c927018da806d4
|
2018-10-30 19:19:06 +08:00 |
|
liyang
|
e864e35b13
|
Merge branch 'hotfix/优化' into develop
Former-commit-id: 8287e3f5a4fe36c7d9f0d61f8e9b6a7392d93a7e [formerly 8287e3f5a4fe36c7d9f0d61f8e9b6a7392d93a7e [formerly 8287e3f5a4fe36c7d9f0d61f8e9b6a7392d93a7e [formerly 8287e3f5a4fe36c7d9f0d61f8e9b6a7392d93a7e [formerly 41f90840a89361aead4e9a29f7748c8ce705b3e1 [formerly 4d87324168af3faa5cef93a3627a8379b1b33ba7]]]]]
Former-commit-id: 3a67b7dcd2f186909179ee5dd54f16482c4b7d5d
Former-commit-id: 2bb985abd53d9f6a4b44f35696a937c2b0c410ca
Former-commit-id: a9504b1c61461b5b553247c95a7862418fae62be [formerly 215c094f6c43b535f6d6c55e193d15cbe1fb791c]
Former-commit-id: d23e90567c0484aeac678df5bbea051bb77c41ee
Former-commit-id: 37e1e87948cbc0dfa0f62131ed74b879c251e3c3
Former-commit-id: a941bf25a1d40c214c64bcc1ac08df41fe3d7ce5
Former-commit-id: f6531fd1d0d4cfa68e595356deab7cffe0819389
Former-commit-id: 9feb3101c226aaa6bcb3e97ed505b858536219ba
|
2018-10-30 19:19:06 +08:00 |
|
liyang
|
6f113cb129
|
显示方面的一些小调整
Former-commit-id: d9edf936b5f6fbce5ff5b3bb919764cb21405fae [formerly 02fee8bd1a60a242236a064ae8861dc4ee3cc0d4] [formerly d9edf936b5f6fbce5ff5b3bb919764cb21405fae [formerly 02fee8bd1a60a242236a064ae8861dc4ee3cc0d4] [formerly d9edf936b5f6fbce5ff5b3bb919764cb21405fae [formerly 02fee8bd1a60a242236a064ae8861dc4ee3cc0d4] [formerly 02fee8bd1a60a242236a064ae8861dc4ee3cc0d4 [formerly 91553c9c2488b0c1d05a3aab1c61ae82bc5b22d0 [formerly 22262fe5218eccba752298a61459defd35d26487]]]]]
Former-commit-id: 058a2bdcf2c48c07e745df38a968bfd21e9d5900
Former-commit-id: 77378df13b64ad02bbb93a42d191720e394ffde2
Former-commit-id: c59fdbac42ae5ab58ef2c3d56fd916fb8f113508 [formerly 73295579e314891b3af8ec29a6226c3c74be49ba]
Former-commit-id: 44ad5e395aff162e385f4a2dd65719d1d9a19983
Former-commit-id: 86dd96bf27e600f542a0feaab613b8dd09f7a5d9
Former-commit-id: 24904c41eb2318577d5f0864ae931966eb333883
Former-commit-id: 458fadbcddd00389d2cdd24cf56a9db3f4f6e9d9
Former-commit-id: e7809f8cad3c8b1b91aade9960fa11cd178919a7
|
2018-10-30 19:18:57 +08:00 |
|
liyang
|
433080d28b
|
Merge branch 'hotfix/优化首页内容'
Former-commit-id: 5933129c7d7126dd3693e32db86d4a88b6330329 [formerly 11f5f58bb684b183d8e8244c4e54e8724aee4dcd] [formerly 5933129c7d7126dd3693e32db86d4a88b6330329 [formerly 11f5f58bb684b183d8e8244c4e54e8724aee4dcd] [formerly 5933129c7d7126dd3693e32db86d4a88b6330329 [formerly 11f5f58bb684b183d8e8244c4e54e8724aee4dcd] [formerly 11f5f58bb684b183d8e8244c4e54e8724aee4dcd [formerly 8e4ebe0c6428153adeb8bf8477cf36ef64e962e1 [formerly a944b15fc515c6078cb5c4893b25fd1ad387badc]]]]]
Former-commit-id: 25bcc86eada205e43b29c3ac2bc33d9bfa9d39bd
Former-commit-id: db7edbc53be3bfcd01c390ffb3ee95fd999ab6a8
Former-commit-id: 18841a38fcf4a5bd709d0978769d66a19aba5a68 [formerly 0b40b1ed87339fb2f6f9b12c9e99803619935e97]
Former-commit-id: 83c2236a18807e69cf855d8d32cde0d8541bd9f3
Former-commit-id: 1ce966c8c380e8ca746658e4463758e6f102877c
Former-commit-id: 0d3927116b46ba477fcd122553de94abf15da2b1
Former-commit-id: 8bb156c696365a8ceafe34e03896b8238d529e5a
Former-commit-id: 99b4af5000f6a14075f531ac4ab4f7e3c6435c9a
|
2018-10-30 16:40:22 +08:00 |
|
liyang
|
d897638d80
|
Merge branch 'hotfix/优化首页内容' into develop
Former-commit-id: ee31540fefd625e3f0a59f1c353fbd7896cd2ce6 [formerly ee31540fefd625e3f0a59f1c353fbd7896cd2ce6 [formerly ee31540fefd625e3f0a59f1c353fbd7896cd2ce6 [formerly ee31540fefd625e3f0a59f1c353fbd7896cd2ce6 [formerly c2313d879ffe931c4e323a82544d4b54bb0dd1ea [formerly 760143941a3ed24dcf8570cd0d3784849690718e]]]]]
Former-commit-id: e87bd78fe0cd54c27a76a44a8e44b48fb1373e89
Former-commit-id: edefa63434fb7705b9dcfcef8a36da3f2a8d3873
Former-commit-id: f55192032f5d871dba785dfaa5028aca58b98cca [formerly 9bba8146cd9bf9d84a5e09939792cbe7ec6f0ba2]
Former-commit-id: 0eb82a9e7c83981e707a558681b8aa70f67a91d1
Former-commit-id: 3ac695d81c010c39973350048a46bede989cfe91
Former-commit-id: 86aa5b07dcf09521046b543f918feeb00e427653
Former-commit-id: 124fa42c2ce590e5da2fa7fc8a60410a4eb1af63
Former-commit-id: da45109b80d37c524a6188f10ce01e3fe9c4331d
|
2018-10-30 16:40:22 +08:00 |
|
liyang
|
04fb4060e2
|
no message
Former-commit-id: fe9b0de1bcad4f0f611d0d086114c9e7f9be43b0 [formerly fe9b0de1bcad4f0f611d0d086114c9e7f9be43b0 [formerly fe9b0de1bcad4f0f611d0d086114c9e7f9be43b0 [formerly fe9b0de1bcad4f0f611d0d086114c9e7f9be43b0 [formerly 25e0a91852f2614640ba4a4a1b58adb5016188a5 [formerly c27611c842b4b7d1f3246944ff05205c356d5b8a]]]]]
Former-commit-id: a24228d0383b2c2f5a4018b8ecb75fe084351635
Former-commit-id: 5566538a7ff03b71e77fcc02cd4665b9dfedfdb7
Former-commit-id: 92c2dda6d3e96b67680d4e3755ce0bba0e4a2720 [formerly 51fcd12161f3452b834b944857a6860f9ccc8401]
Former-commit-id: 5a6e6abe49d70a2ce771cb939ff0fb7a26d3a30b
Former-commit-id: 2720b59b6d614a15c5df8936009a9975fd055d44
Former-commit-id: f348c982c963e4c081b1032bcaafb29f7bc139dd
Former-commit-id: 9a248d51e72d39a8e1ebd00fe4f4217aff668c7d
Former-commit-id: 31ac3a1e002c6d3de533678beeef0c6115d41665
|
2018-10-30 16:40:12 +08:00 |
|
liyang
|
85f449d3b6
|
Merge branch 'hotfix/优化演示页面显示'
Former-commit-id: 1641a6a3ec9f2bd3bb0b6dc55c5ba3a3bafa1c9e [formerly 1641a6a3ec9f2bd3bb0b6dc55c5ba3a3bafa1c9e [formerly 1641a6a3ec9f2bd3bb0b6dc55c5ba3a3bafa1c9e [formerly 1641a6a3ec9f2bd3bb0b6dc55c5ba3a3bafa1c9e [formerly 8360331b1cf969aae23abb7db0574be2950baa61 [formerly adbbe42d9f0ca410f895ede0b29439123c75e8a4]]]]]
Former-commit-id: 925a612eb3901db82a7dc4e09b38f381e0366123
Former-commit-id: 78b34ae145ad1f7aab3023ddb383ce2f590522a8
Former-commit-id: 702264778ea4e2db8f0d1a8ed092822e1e16a9fd [formerly 3eac770f9527dca64580e37690f01a0fc6a17e41]
Former-commit-id: 7a9c5f61392e244627240909a1b91e51bf08bc73
Former-commit-id: e3090086d8e1dc4c6cf425463a470d4359a1c004
Former-commit-id: 42b48f0c407e338b96724a2851d197a5ba6d5589
Former-commit-id: 4fa9fe5650af8c5929cd9acbbaaa737dcefb4d52
Former-commit-id: aba4170b07e833602730283fd97b08a3c56cd70c
|
2018-10-30 16:29:19 +08:00 |
|
liyang
|
a9c49bc666
|
Merge branch 'hotfix/优化演示页面显示' into develop
Former-commit-id: 3922278373f8006e4b8aefd660b48b79201d2098 [formerly 3922278373f8006e4b8aefd660b48b79201d2098 [formerly 3922278373f8006e4b8aefd660b48b79201d2098 [formerly 3922278373f8006e4b8aefd660b48b79201d2098 [formerly 5a07a98765d7604167752cd7928f4e912009e0a1 [formerly b2f91f3aaf1de3e08c8566e74973147108dc5284]]]]]
Former-commit-id: d55b8f7ca5987924e9668fc1a988c668605c6fdd
Former-commit-id: bb5a116c5f5f74b0baac89d9f704a9ec57b5af11
Former-commit-id: c2982598fbfe5e775069866515fa2c3021e3e7e7 [formerly 9b3b41dd8ef1d8fce36017117649ebc6cd886e59]
Former-commit-id: afac3edd703687f74128b62347422db898f91945
Former-commit-id: ef9f39e90fe0b90df342c79aad81f496db243978
Former-commit-id: c6ad74eb0e085003de5d26c1f548b4de0d219a67
Former-commit-id: 84454527c9e191d04b235f0bcf213ca43f84bd13
Former-commit-id: 4e65ae3a2367bfd9b07b140dc9abae0d57710e43
|
2018-10-30 16:29:19 +08:00 |
|
liyang
|
1fd967c41e
|
no message
Former-commit-id: 6217ac60fa5f8070ae8a4988ac90a200d1ed0610 [formerly 2a92d7e6d7576c76e67418cce3b4af939c629f10] [formerly 6217ac60fa5f8070ae8a4988ac90a200d1ed0610 [formerly 2a92d7e6d7576c76e67418cce3b4af939c629f10] [formerly 6217ac60fa5f8070ae8a4988ac90a200d1ed0610 [formerly 2a92d7e6d7576c76e67418cce3b4af939c629f10] [formerly 2a92d7e6d7576c76e67418cce3b4af939c629f10 [formerly 54d75f564e4df2cf804fdc9342eb8fe40aa865ff [formerly a3ca40613b3156cbbb2737ed8dd517a102b4c660]]]]]
Former-commit-id: 8fcd8411f3c6994501df63022e50fd8755b10096
Former-commit-id: 244193d1a0e6df2dc24da4079e095cce53b8fcc6
Former-commit-id: d79cb0c9f186c347e8c5cb428d150723616ceaec [formerly d817b7ab3af5a96d2b75434cb8d3e47e16fe0fd4]
Former-commit-id: fe85c8325aa5ce48f74d89d66482e8c877cafd94
Former-commit-id: 3529956ee2f8bf0817bcdfe5262ab3b9f0b1d362
Former-commit-id: 342699757cf8287bb487a1ee74a0bc89260c5d8b
Former-commit-id: b633d4c17816a14bd9719f60caa97068bb02e1d6
Former-commit-id: d4443c4c9e5d7cafd5fca33e4df5b0b74cde17b2
|
2018-10-30 16:29:08 +08:00 |
|
liyang
|
d923bba4c5
|
代码格式整理
Former-commit-id: 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 1e98ad5197b1baa7e4eb268dccd1a6276a603e41 [formerly 68ea7ce423969c3238e8a558cf3d2433d3ea8e30 [formerly 2cba54ba481e2677b53a3270378b15d14c9a098e]]]]]
Former-commit-id: 59dcc46a2ab5d4ead29bfe4adab074dfd04601f6
Former-commit-id: 4a8b26437302f85729935871fcf232f669e2cec8
Former-commit-id: c5f45af5da2e877de7018e0c3cabb0d96bfc609c [formerly 73bacac1ad42a3c388d285a8ddb553d92d5712d9]
Former-commit-id: 41149bc0e3e9e9dbffc2925f5dfb171e3076aa80
Former-commit-id: 876d20819cca960c232b46a778b5bf46ff51f8fe
Former-commit-id: a5c11df824443e85e11fed6a8a66f8b8168200c5
Former-commit-id: 7d7e44630259a0760bf1f7f55337be4b55fc0221
Former-commit-id: 598b2cfe65d175362d9465ff671399bea4cd3c06
|
2018-10-27 22:47:35 +08:00 |
|
liyang
|
c854473d10
|
Merge branch 'hotfix/删除_env_无用信息'
Former-commit-id: c22e9ff810eb3bc9fd664205f702970fe3d3c22d [formerly c22e9ff810eb3bc9fd664205f702970fe3d3c22d [formerly c22e9ff810eb3bc9fd664205f702970fe3d3c22d [formerly c22e9ff810eb3bc9fd664205f702970fe3d3c22d [formerly b6377f8fb9bf9b159cd857fcb642ab5dd7985243 [formerly 36f5423cd7325af97afd61dcd5d09bd482b16911]]]]]
Former-commit-id: b2f6cda2527c1103feb29ce71d1ca4794efe525b
Former-commit-id: f3b73bd62878166bbb7a14088fd323a11a6c5688
Former-commit-id: d851ea211d6e4871d3bd366cf47ffc4ea72f135c [formerly a2d8c9d9b18a355f7d7592c697fa1555336f9318]
Former-commit-id: be83f96f83016f3171c092753b3ade4d231f1797
Former-commit-id: 9a54309aeb5dd544904b6c6b7ff754d2d2958e98
Former-commit-id: 53bd26e4cdcafd8ff0cfd448539a58c06ece10c1
Former-commit-id: 91981b2efca77e6bf9440c25238e3c12001c7c8f
Former-commit-id: 400ed63690e0bda3ce90143321efa40a58dfd5af
|
2018-10-27 22:31:10 +08:00 |
|
liyang
|
c849dbb2e1
|
Merge branch 'hotfix/删除_env_无用信息' into develop
Former-commit-id: ad9bee365e90db6e9b0c1a36a1301857b995dbcd [formerly defa8d6356c16172206dc77639ba619d0ce6edf2] [formerly ad9bee365e90db6e9b0c1a36a1301857b995dbcd [formerly defa8d6356c16172206dc77639ba619d0ce6edf2] [formerly ad9bee365e90db6e9b0c1a36a1301857b995dbcd [formerly defa8d6356c16172206dc77639ba619d0ce6edf2] [formerly defa8d6356c16172206dc77639ba619d0ce6edf2 [formerly af96495852b5c2b275590ff92acae2f999bd4584 [formerly 87e59ac5c6f3b507b6793af48eee8d35ecfc328f]]]]]
Former-commit-id: 17a047cfdeb880a79e5e5461a8452993f4c52abb
Former-commit-id: 485882a9d846486e3b48b9ad29aaab43b1b2c5e9
Former-commit-id: a10eedcf6c69de16abbf6f77104b9605e2e7904c [formerly 2910d3b8b4ee2ad47b8c80e3de79a0b14ff27d1a]
Former-commit-id: 845e8cc95fe0a793cbf9b52fdaca80caf09c2606
Former-commit-id: f97e2b1bf53d5875b2e3fdaca762721b529484cd
Former-commit-id: 3ee8b1245e5f9ca523b8a462f2f45bd0cced63fd
Former-commit-id: a084a3a4c38cb59d0150be8b631102e8c19ff0f7
Former-commit-id: 2c09787ca6e341e8243cb8fc5edeecd65a08303c
|
2018-10-27 22:31:10 +08:00 |
|
liyang
|
04c7443f01
|
删除无用信息
Former-commit-id: e4fee9fccc8e94c691ef3502949403a77c677a48 [formerly e4fee9fccc8e94c691ef3502949403a77c677a48 [formerly e4fee9fccc8e94c691ef3502949403a77c677a48 [formerly e4fee9fccc8e94c691ef3502949403a77c677a48 [formerly e6fb2fa5b3d5af36500b170a50800dfcb892d85b [formerly e2376ad896b302679cb81aa7a342910e7b156b6d]]]]]
Former-commit-id: 9903142d83a43dd868fa85be150f6e04c5d960af
Former-commit-id: 0313913de9e78bc421637fa26537e2c93fadd767
Former-commit-id: 8f8ee126174d1902aa9b659e084af1b7726ab175 [formerly 099518b3687d4c1a37a2b3f9c4dabbf9a797e8e5]
Former-commit-id: 64cda7e5142556075bdd45cdc44fe56a183c8090
Former-commit-id: db5c351271b35ca5ae9ccf14946b6e5c469dac24
Former-commit-id: 1620d08a9c82a577bb04a6381bafa8980e36ab1a
Former-commit-id: 391be59f82a3c483d3a366473c5a96dba0e63cb7
Former-commit-id: b7e87ccba390ba0936e43a2a523fb357a9b123a2
|
2018-10-27 22:30:10 +08:00 |
|
liyang
|
40246585e1
|
Merge branch 'hotfix/travis_setting_remove'
Former-commit-id: 4c51fc17a20cb86aea5f29a97111586e63faa8b2 [formerly b924d0db8b82123700cff4228824be63fe81624f] [formerly 4c51fc17a20cb86aea5f29a97111586e63faa8b2 [formerly b924d0db8b82123700cff4228824be63fe81624f] [formerly 4c51fc17a20cb86aea5f29a97111586e63faa8b2 [formerly b924d0db8b82123700cff4228824be63fe81624f] [formerly b924d0db8b82123700cff4228824be63fe81624f [formerly f50b483d58ad5f80ec4847a82ccdf9595bed8e27 [formerly 6f34ddaaf5924b326bef29161b7bc30f3773f8f9]]]]]
Former-commit-id: b85a70c07471b933ba502094f909438549140395
Former-commit-id: 899f747f18c53d35f07b207d826c44e14f4e7efd
Former-commit-id: 32fd9ca1d072f482a8de70c174fee2331bc0e90f [formerly a352eb38118dba5aec958ef6901aa075aa140d82]
Former-commit-id: d960056531766ffaf7a432fea15f8aa18721610b
Former-commit-id: 37286aeb97e9f85c3f85f41fe3a7d16dabb97521
Former-commit-id: c3c174c0eb1f6459b455383725b74b58e51243ee
Former-commit-id: 5f0e2df806272f89dc53d550c87cf7fb7f9c5b50
Former-commit-id: 435fb5a9e1a49719da846a3c91110b09704335a0
|
2018-10-27 18:48:42 +08:00 |
|
liyang
|
60518996ab
|
Merge branch 'hotfix/travis_setting_remove' into develop
Former-commit-id: 93b1f323921a9cad8377ae6ca59ba54d33651fe2 [formerly 93b1f323921a9cad8377ae6ca59ba54d33651fe2 [formerly 93b1f323921a9cad8377ae6ca59ba54d33651fe2 [formerly 93b1f323921a9cad8377ae6ca59ba54d33651fe2 [formerly 99c5df1e3b78c9fd2bdb16f43b72b4200b52c6f9 [formerly c50a2658c80b3f1158124eca0c0dbb39ab72e2c7]]]]]
Former-commit-id: 4817c592906cc881ad76683840ea417b766d021b
Former-commit-id: 2d6531b669fd47fc49c8d81d2a98037a2dcf415f
Former-commit-id: 51ae737061d4b71200e19e4b522e5a55c13d497c [formerly 606dd8c6cc1e996defe5a9ade7835b1603549f4c]
Former-commit-id: 47622907631fc4925e6d19555995f871769896b1
Former-commit-id: 69f5d4b5077a1e38e10a843a317153951443944d
Former-commit-id: 47dbcc4e5571afacd21f00183d44c94db77d99bf
Former-commit-id: 9065e99b5ccdd8a6c79cfa0f70d24a5a6264f14e
Former-commit-id: abd886464513ea88f151a582d1c29eb522e3fda8
|
2018-10-27 18:48:42 +08:00 |
|
liyang
|
e54e9986ed
|
no message
Former-commit-id: 66b4905a8567bb137d8a5640e80684b2a779beb7 [formerly 66b4905a8567bb137d8a5640e80684b2a779beb7 [formerly 66b4905a8567bb137d8a5640e80684b2a779beb7 [formerly 66b4905a8567bb137d8a5640e80684b2a779beb7 [formerly 0000680fe8801aa36a2bd1b54d2c1c29a860626b [formerly 929a9eae654c20e963b100708fb0e05f55417ef0]]]]]
Former-commit-id: 092bf114109f5da2e811cb019c92e0b6c17aafec
Former-commit-id: bc7e73e8d149e89b0d695c43cff4f47047313ef3
Former-commit-id: d25fb496b217b9dcd6b6732694770bd8ad885c58 [formerly 5daca6a294efa6b92c0022b3fb34ff4bdf5c2e61]
Former-commit-id: 8b4b2a273a0fc0aa213b9eaeef5f3b207a62f5b0
Former-commit-id: 366b34473e84faf3a8f0f72eb767543216e768cb
Former-commit-id: 282a43b5bd2f8a5b27bbb47b38c230bcdf0264f5
Former-commit-id: a54ceae1feb93c4c836040048e9a5041e2df2ffa
Former-commit-id: 821ca6ab33f4429b2e2877602ab7539db2b7ffa7
|
2018-10-27 18:48:22 +08:00 |
|
liyang
|
f42b4eeff6
|
Merge branch 'hotfix/readme_update'
Former-commit-id: 5d775742d2735954597ca0e31685e395037d9647 [formerly 5d775742d2735954597ca0e31685e395037d9647 [formerly 5d775742d2735954597ca0e31685e395037d9647 [formerly 5d775742d2735954597ca0e31685e395037d9647 [formerly 59cb92247202c13d36e22dda8b1393a2a97b88e9 [formerly d258321cfef26ff749542c8f931714539fc66b34]]]]]
Former-commit-id: db4ed4495d4eb802a47b4c9928fa6921936a4eac
Former-commit-id: a66463758c78cf34fc20c5bf5f4099580f58876f
Former-commit-id: 9e676b3c05b9d6b1645eae115d5ca8b2a4ee6b7a [formerly cc24f06c58bf1d5ea38c46f3b6b8728f60d1c6d5]
Former-commit-id: d44e2f88c269366f84afe6827e5bfaa6c171343e
Former-commit-id: de7b4ed5575b3fbc30b750c079f0e611f83a1d30
Former-commit-id: 15fc27bde112b5e89a3b7813e2a08d6ad9976ade
Former-commit-id: cbea7baa6504281baee6a278a81ff34dc4feb235
Former-commit-id: 9eb9ec3e73336f523a9b3dcc50999df7a6056df6
|
2018-10-27 18:40:57 +08:00 |
|
liyang
|
11d807623c
|
Merge branch 'hotfix/readme_update' into develop
Former-commit-id: e17135351655aabd1579d0fb92e14f9e9d807c31 [formerly e17135351655aabd1579d0fb92e14f9e9d807c31 [formerly e17135351655aabd1579d0fb92e14f9e9d807c31 [formerly e17135351655aabd1579d0fb92e14f9e9d807c31 [formerly 58a0d0df9959ec12909a9d52c0a150a6257b397d [formerly 0885c5f51b97cea25226e5f0ac9717858e0e385e]]]]]
Former-commit-id: 831b097143ae430316f375db4d95de6eafb0df7b
Former-commit-id: ced5d5c5bad66230b14b51c8854d69b79a8752d2
Former-commit-id: aa6bb0dd627639a6c7adb45a01fbed3f173ac52d [formerly 3f0c432120aa9717f53c40bf102b5cf1393871d3]
Former-commit-id: 02c0771dd4c2896ea0ea3d4545641617a6c3f0e7
Former-commit-id: 2a6693d152197f9deff9826cd13926badb77cf6e
Former-commit-id: ee1508b53870545cb8f7b50aadd38b0fe8193e23
Former-commit-id: 39afa66abc47e42cfa96d988a9d4628c87771154
Former-commit-id: ddbb0e652c01250af16eac677d3c53a1727a8a3f
|
2018-10-27 18:40:57 +08:00 |
|
liyang
|
4bf457c468
|
删除部署位置的介绍
Former-commit-id: ff0a5d0c3db8fe2f49bba841ed7ab78bf61f0587 [formerly 519a14d1806e2da13a94cc4be28c4145aedbb7c3] [formerly ff0a5d0c3db8fe2f49bba841ed7ab78bf61f0587 [formerly 519a14d1806e2da13a94cc4be28c4145aedbb7c3] [formerly ff0a5d0c3db8fe2f49bba841ed7ab78bf61f0587 [formerly 519a14d1806e2da13a94cc4be28c4145aedbb7c3] [formerly 519a14d1806e2da13a94cc4be28c4145aedbb7c3 [formerly 531c0bb3e7eaba20947d9d45d9b015cd37906ae1 [formerly 9d2fb79e2c768a413de2d74a80d482193d593140]]]]]
Former-commit-id: f50b7d71eccca811f912aa44cc38721a0a4a0afa
Former-commit-id: f672906ba597f9e835fac0372392293e27b989b1
Former-commit-id: 3d3899c0b3f611116977f90d1ed4334554147852 [formerly 24cccdc405927ec2e2280eaa080a167d85ec9c1a]
Former-commit-id: 985cb16a47a5b45b0cfc8ac289e11c1076054002
Former-commit-id: 48c07497db8f106e0a60e35cc08cc4ce479b6f43
Former-commit-id: 75ca937c5caf59a4a78d057c4ffefa5cab5f42e3
Former-commit-id: 0f4c0e123e000671f1f3f40fe4ac3407923d27fa
Former-commit-id: 034f666418cae93bb50599948740f96d5404d322
|
2018-10-27 18:40:42 +08:00 |
|
liyang
|
6e6ff4e4a5
|
Merge branch 'hotfix/1.5.5' into develop
Former-commit-id: b5ae17ba8fb2007804ada9ab8c9a414f46242531 [formerly b5ae17ba8fb2007804ada9ab8c9a414f46242531 [formerly b5ae17ba8fb2007804ada9ab8c9a414f46242531 [formerly b5ae17ba8fb2007804ada9ab8c9a414f46242531 [formerly 820e21f7444903c2c74e1dffce6754d4280aa8a9 [formerly 022308ef3a40e0e9fac3bf9e363f8482e5896fbc]]]]]
Former-commit-id: 4a540e299e997294dc9243db51710a4ec3b69e56
Former-commit-id: db3810befd8d6db837108b63aa7e38d268d100b7
Former-commit-id: 8f334a03c9c4ee7f5fa80027ce27df2f8bcd39b2 [formerly e51b11a3c9e03ba262fb7d03b80bdae62c3050a6]
Former-commit-id: f3113990057a0783c908269dc87ab6b4f2c6e6cb
Former-commit-id: 62bb0faa68f090f974d394edaabc068c7d24d71d
Former-commit-id: 7c458daaadd8a191b6463a2e70439da1d75e84e3
Former-commit-id: b83e3f2821bf69552ea52fbeb85fd0141bca33f7
Former-commit-id: 8f6f54f625a9e0ec1b391cae5d98965f4f115149
|
2018-10-27 18:38:29 +08:00 |
|
liyang
|
0cf79e4608
|
Merge branch 'hotfix/1.5.5'
Former-commit-id: 838fbb8c50745f4725b5fa70ff562fa8e65de470 [formerly 838fbb8c50745f4725b5fa70ff562fa8e65de470 [formerly 838fbb8c50745f4725b5fa70ff562fa8e65de470 [formerly 838fbb8c50745f4725b5fa70ff562fa8e65de470 [formerly a862903365925c86c28076c85ef177c0c9f98571 [formerly 93d20cc24b212df58e2493bc17d8d7e66a716dae]]]]]
Former-commit-id: 3cd90d6a74b94ba30490356810264f7be8294f1c
Former-commit-id: f286819acc91d7bef10f878a430639dc4fd62b18
Former-commit-id: 548d26f22d36edb315bd0a8f447e9d936e5da0c5 [formerly b7df7e129a7260fe90dcfc0dea04ecac79d13f50]
Former-commit-id: c2b739f950c67deb1151ade280decd2d78ce5b20
Former-commit-id: 63d51af89e0799f25a8a6851832eb573a1c9cbc0
Former-commit-id: d4309a63307d68f9b5b723fa6187292d96953ec4
Former-commit-id: e6470c421e97938f8731dcc2b2d8b6b663deaecf
Former-commit-id: 8fe567247b01d09a16d10c2a82cac66eda1ed77a
|
2018-10-27 18:38:28 +08:00 |
|
liyang
|
cad161104c
|
缓存设置方式更新
Former-commit-id: a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly a6af4ed39466b4c9e9365ad693fcb84d73036e18 [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68] [formerly 506769e37a7db720d8f86ed20d535fe2a26d9e68 [formerly 9ebaa44ba31bf6b89e6a26e7c880694317c10849 [formerly 6915b7b392bbf51a784a7a60faa5805e05749e62]]]]]
Former-commit-id: 0500901750714d3f756cdab974061f703c54a20c
Former-commit-id: 718d0d4f016503154f4d76b983fac52135d12ba8
Former-commit-id: f393f36317e7bfce386b8e8bd04d8a378552187d [formerly 74aef31060be3c3f360e1b902f5472d60ed3f360]
Former-commit-id: eacb846db5711af1dde9627b5df3001bfe524429
Former-commit-id: 00763a56295e33408b38497fd2c2ab89c635c8c9
Former-commit-id: 9447f0f2beb288dd1b07dae908148c02811cea2c
Former-commit-id: 713f4784cbf5ad1f49e8f599438cb395fcbf9d3d
Former-commit-id: e9835fb631ab8e6bff51fa25eecf1781bdb14f0f
|
2018-10-27 18:37:04 +08:00 |
|
liyang
|
5f50db24f8
|
更新介绍
Former-commit-id: 977740264c2b81426e76fc62b2a33c274d053c34 [formerly 977740264c2b81426e76fc62b2a33c274d053c34 [formerly 977740264c2b81426e76fc62b2a33c274d053c34 [formerly 977740264c2b81426e76fc62b2a33c274d053c34 [formerly e976289e205e4d3ca1a8cc710657e1d9ccd28109 [formerly ac0915917867ed3005964b424752117fb8be9f2a]]]]]
Former-commit-id: 933d002ddc3207f45097fedf9418a332ce5a9ea8
Former-commit-id: 078b56883abf255beff93f7f9ab6d2a71394be47
Former-commit-id: fb167562f8c263478dc45be85f69ce9d2651990a [formerly 188ed9e9e12750c880b38d0d3cbe6ed2a330abec]
Former-commit-id: 6519e5830db7ba96cf66e6b5fbd75ef64665cc7b
Former-commit-id: 5ed65b2b6f134d7d40e83ac4f3c9d3317429c287
Former-commit-id: 3e57c5ac8e161d677c620d3afffc094d212e1695
Former-commit-id: 10ccd5bd894429a251be1a3e30845af8b5c6f238
Former-commit-id: 4cb91d5e5672105ba139d877bb76b47035a62e2c
|
2018-10-26 14:14:56 +08:00 |
|
liyang
|
40572cb3d6
|
删除了 TODO
Former-commit-id: 1e4a87befdc0ab3f275526dcd913b38e9e7b1a0d [formerly 1e4a87befdc0ab3f275526dcd913b38e9e7b1a0d [formerly 1e4a87befdc0ab3f275526dcd913b38e9e7b1a0d [formerly 1e4a87befdc0ab3f275526dcd913b38e9e7b1a0d [formerly 73fb92ce95bbd4cabd42306ecba0e02845658d2f [formerly 3355f2883903406386ca481d04c10e1c397e5e17]]]]]
Former-commit-id: 300ba77c06fbadd113ed18dcf57bbc3084d0af4a
Former-commit-id: ad88d16695a65a1051f2e76389fafad7fb59b0cf
Former-commit-id: 7be68f7370f28b595b7589b1117dc250fd47f49f [formerly 064381347705ba1252747b7c93e09522219747de]
Former-commit-id: 5ea547e9912f750269a5d188c2bc86f34adae6db
Former-commit-id: 0d125255da5a34786d43bb7767d0822adbb8cde7
Former-commit-id: 18660ad51258acccf5f85f74fe3ae363a34da9f5
Former-commit-id: 3eecf2836e5dd56943df86559a1164a23749ceb4
Former-commit-id: 4737b27fd1d70232940dfb33b8360751bc56af96
|
2018-10-26 10:00:36 +08:00 |
|
liyang
|
513ad831bf
|
统计代码格式更新
Former-commit-id: 8e10a5999f2a1bcc37fb5d61fc50ddc74acca0e2 [formerly 8e10a5999f2a1bcc37fb5d61fc50ddc74acca0e2 [formerly 8e10a5999f2a1bcc37fb5d61fc50ddc74acca0e2 [formerly 8e10a5999f2a1bcc37fb5d61fc50ddc74acca0e2 [formerly 247e554423f3f6a6900fd867238cec39ccd62d66 [formerly 92d32aea9cec22c519ebc4ff0c6992a6016d56c4]]]]]
Former-commit-id: 810548222bba0ac5e20c0b2b3fdadee774e01a88
Former-commit-id: ad50a545797938cf79d1704f76e978037662fb5c
Former-commit-id: 58d1591cb2abe1ba68ab9edc7ccc89b6b2845596 [formerly 2c187578c9fe4b87fc7d9e3a113691d6a64ec146]
Former-commit-id: a5d97a7223be84aa1a7404bce98ae25109eabdf7
Former-commit-id: 2bd19e77bd9d2d38952281022d5019588fbd2b4e
Former-commit-id: d75f3ebd2b47ed9f3fcd7dac5df640342aff82ac
Former-commit-id: 5d50253c606a0e56b230062b94ef5925518b0fb4
Former-commit-id: 0a932e06a90e725f75a8c22579c296f931f3e04b
|
2018-10-26 09:57:10 +08:00 |
|
liyang
|
ef307293d7
|
404 页面同步更新样式
Former-commit-id: ba458736b5f8b448a21d4a42e88a4487bbc6447d [formerly ba458736b5f8b448a21d4a42e88a4487bbc6447d [formerly ba458736b5f8b448a21d4a42e88a4487bbc6447d [formerly ba458736b5f8b448a21d4a42e88a4487bbc6447d [formerly e6558b8582fd79c77ed3a488210362ba6349b716 [formerly d27a0573758b5eff85c7bda284301b5b178c14eb]]]]]
Former-commit-id: ccc355dd0527c21ee4146a540e7ffd66097dc111
Former-commit-id: 790d00b2548a876883465e23ed70645582c6a48e
Former-commit-id: bb1408c0525afa5a60481df5b3621f28afa8aef2 [formerly 18934caf62354d28c21171fb02190f3b2ad81a26]
Former-commit-id: 1e72b5ed7d44cf67ff9eaebb924c79e93a2c5769
Former-commit-id: 0715ff78402dd3c70cfdff795c428111e0c75467
Former-commit-id: ca0fab6e289453ea2ba82ef0fa36a013c76ab0b7
Former-commit-id: f2e27c288c54e194867fb57ea24ec0292e5038fd
Former-commit-id: 171622394883d7b14b1f6da9449f3d38936e46dd
|
2018-10-26 09:36:27 +08:00 |
|
liyang
|
15ddd46172
|
将CSS写成一行
Former-commit-id: 01c74b2c4ab54ba1f7f4d362298da5383c588fb3 [formerly a6dc0da296ec7cf78de08c4ace89cdbf80a725ed] [formerly 01c74b2c4ab54ba1f7f4d362298da5383c588fb3 [formerly a6dc0da296ec7cf78de08c4ace89cdbf80a725ed] [formerly 01c74b2c4ab54ba1f7f4d362298da5383c588fb3 [formerly a6dc0da296ec7cf78de08c4ace89cdbf80a725ed] [formerly a6dc0da296ec7cf78de08c4ace89cdbf80a725ed [formerly 4ee4f2394d3975278ba0cc893292de1b4a053216 [formerly 9333c57c50535aed4d0561d1b0aca05a16e30128]]]]]
Former-commit-id: 12c5fdd8d56987757c9ff75a2c09fe5a2c5a6a7f
Former-commit-id: ac7e3c4620dfb7adb0c13a18233c58263faab6c1
Former-commit-id: 0e944d034e610f631ef5d32010d11c175bed1104 [formerly 5874ecd5e73e730b2b0d710e3fa4aad009bcec99]
Former-commit-id: 767651855966da9ff31ff9d64be09ffe8fc7838a
Former-commit-id: 0d205202e755c26bdc3e350d09695024a5ebc41b
Former-commit-id: 25bd6ba9c37372f92d01a0d9b81ae1502406fab0
Former-commit-id: fbdf87922d53a7161ed35a930d449e2720136751
Former-commit-id: bb5294623d792888ca1be51236ae254a2276f4e6
|
2018-10-26 09:05:34 +08:00 |
|
liyang
|
e9b1351d0b
|
简化设置的导出方式
Former-commit-id: a55f06981c2fb7d0c10b3171aa44b51ab49b8ef3 [formerly a55f06981c2fb7d0c10b3171aa44b51ab49b8ef3 [formerly a55f06981c2fb7d0c10b3171aa44b51ab49b8ef3 [formerly a55f06981c2fb7d0c10b3171aa44b51ab49b8ef3 [formerly 37b1babc66571b867f18d3cc0235595a4585c029 [formerly fa1408f9564153089cb701c915e697bc19ab1712]]]]]
Former-commit-id: f7f422b342b6619a0f180f1b4441ccc275c42a48
Former-commit-id: 06a541d8f64e407ccd0d95bf79acbecd5181bca6
Former-commit-id: f2c2f669869e23deb7595d9a6d2269603e557cfc [formerly 767ee24a9e21ee3ebc06ea4fc523c9c7572c9545]
Former-commit-id: a0c8f2d4b607428a0943358af1cc88721c82eecb
Former-commit-id: 5f7c62076981cab47e5f19f18bf25c60bea8beca
Former-commit-id: 7dc23769bda1b3ac1dc3c376f7efe2d318a8ee4d
Former-commit-id: 6424c627f48fc00dec7e0f1e23856aa749d0360d
Former-commit-id: 3a911eec99207c169989bd54605e837af3ec5450
|
2018-10-26 00:21:12 +08:00 |
|
liyang
|
810d2eb5a4
|
新版首页载入样式
Former-commit-id: e469ecfee4e9c3fe4d21ee3ee9d0c91a2a5a2958 [formerly 1a0640c66512d49a1903237173c3d262e17949b0] [formerly e469ecfee4e9c3fe4d21ee3ee9d0c91a2a5a2958 [formerly 1a0640c66512d49a1903237173c3d262e17949b0] [formerly e469ecfee4e9c3fe4d21ee3ee9d0c91a2a5a2958 [formerly 1a0640c66512d49a1903237173c3d262e17949b0] [formerly 1a0640c66512d49a1903237173c3d262e17949b0 [formerly 6c4aa3fcf442fbf8479f9aed32d3c9eaf1246cff [formerly 54fd4afda552fc2e7128fd1db072a21f73d924f0]]]]]
Former-commit-id: cae83e98e9644388611a229282ef3d2fd10c6045
Former-commit-id: f56a9e5f69e36609be9ac86f3729a11d205678f6
Former-commit-id: c6af5cea2fb153d893097a4ad38782bacfcb645e [formerly 0aa116a0822e73d92bc7214c4f812f1505efc168]
Former-commit-id: 377a51e81339086a718587aa53a33607a949b265
Former-commit-id: 645083e12611d4d93f6c83f5b3fa026a50b46e13
Former-commit-id: 694ab08a02a5b770b97a75268091a64300bd90f5
Former-commit-id: 01269425158df45734a20ba120fe92bd792c01d7
Former-commit-id: 659a181abd0eb4d3c36c755efb6a7fb46fe0d5c2
|
2018-10-26 00:20:49 +08:00 |
|
liyang
|
75edff2260
|
新版本号
Former-commit-id: 90c1d4e56959f6529bd7429adea7fda43e047c8e [formerly 90c1d4e56959f6529bd7429adea7fda43e047c8e [formerly 90c1d4e56959f6529bd7429adea7fda43e047c8e [formerly 90c1d4e56959f6529bd7429adea7fda43e047c8e [formerly 3a8bb1567ca234e52177b6b2b7de91e1cad8b339 [formerly e2ca0a02ac182001ae34e3b701a5df42ced0bb29]]]]]
Former-commit-id: 588703593f668880f42eeeb8b557e26def3783b3
Former-commit-id: fbc918913ddcc17dca5bad52446a3a16972a5ec9
Former-commit-id: 75c53f179edd29b15df1850c86e33bc8362ee991 [formerly 676043a162e8d764f8e45a5b2fa481caf54b54c0]
Former-commit-id: f53ffba4791f2a52392f71ccc22d55960b718cd2
Former-commit-id: 601c5bf0185cc084f71a5c61260da854041f0574
Former-commit-id: 8844a432d15b9ea812f14b9bc435187ee068a101
Former-commit-id: a2b9c1286c7a434b600d370a08e5b72e2d5542d1
Former-commit-id: b719ad81f7c00083179e73c75e02edddf07e43ff
|
2018-10-26 00:20:29 +08:00 |
|
liyang
|
d4a22c80f0
|
Merge branch 'hotfix/更新简化版地址' into develop
Former-commit-id: 9da4c18c42995aaa9ab4cb62502016ca4f4e1033 [formerly 9e78c8fabdd1c33e78512776ac75054fe58862a0] [formerly 9da4c18c42995aaa9ab4cb62502016ca4f4e1033 [formerly 9e78c8fabdd1c33e78512776ac75054fe58862a0] [formerly 9da4c18c42995aaa9ab4cb62502016ca4f4e1033 [formerly 9e78c8fabdd1c33e78512776ac75054fe58862a0] [formerly 9e78c8fabdd1c33e78512776ac75054fe58862a0 [formerly 487bae459beab7ac85bb479ecbb6a7c00ab08ac6 [formerly d822b523d8e82f78745b54c73d7eb17544345df9]]]]]
Former-commit-id: a3f2fafba19242839359215e290e6380bfb825ed
Former-commit-id: 715e2ca19c7d0803105014fc05055206a0431f52
Former-commit-id: 354d72934ef9cdc64d376c39490054d03a6c8f43 [formerly bbb6b9831cf61cfcf44ea8e53b34e358d777cf07]
Former-commit-id: cc96d38bbc6121440aac417e1e3b84ded4ee5c9f
Former-commit-id: 16be51a5cc59aec3232ed20fee0f1d50bbd19dbb
Former-commit-id: 16963abbf59d8b541fb429df43b3b8a97b7af976
Former-commit-id: baccce05c8219ecd15d0b9cee7e444d15bc60684
Former-commit-id: c837a417c3606f67a675c8649ddc232e4db8c255
|
2018-10-25 09:59:39 +08:00 |
|
liyang
|
8b460b0357
|
Merge branch 'hotfix/更新简化版地址'
Former-commit-id: 7cebc8fce5185743fdb502bab63d0c522bb6558c [formerly 7cebc8fce5185743fdb502bab63d0c522bb6558c [formerly 7cebc8fce5185743fdb502bab63d0c522bb6558c [formerly 7cebc8fce5185743fdb502bab63d0c522bb6558c [formerly 76e5e6383579179744d9404a27f1e2ef7b80dd7b [formerly a97b17f3bf8c7940e6f48a38ea4b48dbf5b482b8]]]]]
Former-commit-id: 41677039524c57f3e0f61fadc0cdbd7acaed3021
Former-commit-id: aea25b5d828353b9806770cd57f09a41e25cd3be
Former-commit-id: fc926fbd640d1f38206b214f2ffed3ec293409f1 [formerly 91bd202b03766d30e26e1477e03da2a959ddf9a8]
Former-commit-id: 65064bb9962f6e891ffeecb5089d44cb4ea47ba7
Former-commit-id: df2797d71d91bfa5473c53444ed9047616477d05
Former-commit-id: f6b801905005855f1fa8f0b520a77e7623ab9b6e
Former-commit-id: 162861fda90ee5b90dfd1a39f6b247806da922df
Former-commit-id: f3f9757bbdf6d6be4483531c1ef90a0e19d697bf
|
2018-10-25 09:59:39 +08:00 |
|
liyang
|
4a1114fd7f
|
no message
Former-commit-id: c9df5294d38240a12090d5c5f33e6055c173a9ab [formerly c9df5294d38240a12090d5c5f33e6055c173a9ab [formerly c9df5294d38240a12090d5c5f33e6055c173a9ab [formerly c9df5294d38240a12090d5c5f33e6055c173a9ab [formerly d21833a2199b59f71a7ee2fc166f744ff75e436b [formerly e597cfbb62915d1399a483e69878ce357556e404]]]]]
Former-commit-id: b6d4295ca17048564e997602fad630470bdc1edc
Former-commit-id: f0e7c30d10cdd1f9d4ba1553c5b7b0679dceb0ae
Former-commit-id: 6f41287352d0fe7cfbfdf9a954eea83acfcd70e6 [formerly c8e67e7c7537aa46b1c241b083864dd1cd613382]
Former-commit-id: 9c1fdd710f80240b305cb3073e21f3c12aeb1275
Former-commit-id: b50f9079b98a9f27c23eb64694678b2078c2319e
Former-commit-id: 5b6631715fbc08daa24bc494bfb059dbcc7f10f6
Former-commit-id: a39d9ad2d23e93eb8f44663892ec6092b39d34da
Former-commit-id: 4f488226bf174b07fcd9770a915c8aeca8829ce0
|
2018-10-25 09:59:19 +08:00 |
|
liyang
|
7630028e25
|
Merge branch 'hotfix/更新简化版预览地址' into develop
Former-commit-id: ae757f3271592451a2937479ccec0cb86131ccc2 [formerly ae757f3271592451a2937479ccec0cb86131ccc2 [formerly ae757f3271592451a2937479ccec0cb86131ccc2 [formerly ae757f3271592451a2937479ccec0cb86131ccc2 [formerly ba5214e516390e8efa23e13ab6fbb1ad5069779b [formerly e8dd51269abca7cce152d96cb3bfa2073d088476]]]]]
Former-commit-id: f008e1f7522c414cef76a2a7c88726294a5c51e2
Former-commit-id: c7b775530621d0203b332c4d41281b3fc5ceab65
Former-commit-id: cc0798c7c38ad843b0c23c97bbdf8dd623c86a2b [formerly 6c15b1637196337e273713d0cd4d21fc4c525af0]
Former-commit-id: ddd15a986ef0469ea82292bbcb9b48a82138100d
Former-commit-id: 0bf921744174f157ea877e87300162027fd9bd80
Former-commit-id: 49941622f2d8e8965497fd3f3e765fc9331bafca
Former-commit-id: 1698c3718c1bb9c878273b8092e8d6c0bbcf37eb
Former-commit-id: f38f4aca01cd8e9b9d048418bb1a7bb34f92e6e4
|
2018-10-24 18:35:09 +08:00 |
|
liyang
|
62e517bfe3
|
Merge branch 'hotfix/更新简化版预览地址'
Former-commit-id: fb06ee3660ba09c06820a4eecded2e9fc0a6e126 [formerly fb06ee3660ba09c06820a4eecded2e9fc0a6e126 [formerly fb06ee3660ba09c06820a4eecded2e9fc0a6e126 [formerly fb06ee3660ba09c06820a4eecded2e9fc0a6e126 [formerly 74949704aae074d0650763fae4eb8739258fbe42 [formerly b505f90603c6f9acf07f19d9b280984c1173184e]]]]]
Former-commit-id: 5f34843a406842679c3ac99c8b2d60984aa8e5d3
Former-commit-id: 76ee9a435bb142910560eb02fdf5c1fd81228e0e
Former-commit-id: 69135809b708fb10c50a9ae08e6249905d1b6552 [formerly 06f93f92c5172e857b41d0719e3e74ba8046693d]
Former-commit-id: a8b93eaf93fcc57f9c5d4caf8b26a5e3d8236524
Former-commit-id: 68a50af246e9f3d799b8d29363ac8d78b47dd236
Former-commit-id: 8c53bcdf6a1a984ad556d528a066bfc6e8bf53ab
Former-commit-id: 3e54eeb024e1b8773971393cf016bec6276036c5
Former-commit-id: 88612d61e9a87858eaa5a3dadd0afde10c9e8072
|
2018-10-24 18:35:09 +08:00 |
|
liyang
|
33bcf06608
|
no message
Former-commit-id: ad50d1dcf2ede8c583afe07289c7b681bd336bac [formerly ad50d1dcf2ede8c583afe07289c7b681bd336bac [formerly ad50d1dcf2ede8c583afe07289c7b681bd336bac [formerly ad50d1dcf2ede8c583afe07289c7b681bd336bac [formerly dc06f5c7b0f9f3478caeb90eb81823ae9e00d5b6 [formerly a882ca2d4db75f4c7dda19b3e16d5ed94c557cd7]]]]]
Former-commit-id: 80dbca4b01b479b5917b6137662db2770c18676c
Former-commit-id: 599ba88715c8f8ad52620e378f4fc7ecf25dcf93
Former-commit-id: 160773592bd7badb1399b2414c6156ac56e0e0a1 [formerly f81132d2a05b5a07cfc9dc71a9e74a31c23ebe8d]
Former-commit-id: 3274e9a907cb0836d585ac4c5ef23a55f829f6fc
Former-commit-id: 1d85363ab886aaa96e3f46b02dfc3b16ae5c4b24
Former-commit-id: ccbf666a55ec18605f6bef5c892a0f978644a2f1
Former-commit-id: f09c76d1669816c3ba8f6a4b6267d6534c9ffea5
Former-commit-id: 7593720e15c14f3a42df9b7a0ad43b9c728a7f7f
|
2018-10-24 18:34:45 +08:00 |
|
liyang
|
f8609ebca9
|
Merge branch 'hotfix/富文本编辑器v-model问题' into develop
Former-commit-id: 19fd5340ab249a8668bf5a9b32e766282a9039f1 [formerly f9ebc7fdb4a20a1d59240d4b1177af09cd1fcb48] [formerly 19fd5340ab249a8668bf5a9b32e766282a9039f1 [formerly f9ebc7fdb4a20a1d59240d4b1177af09cd1fcb48] [formerly 19fd5340ab249a8668bf5a9b32e766282a9039f1 [formerly f9ebc7fdb4a20a1d59240d4b1177af09cd1fcb48] [formerly f9ebc7fdb4a20a1d59240d4b1177af09cd1fcb48 [formerly 5a56941cb788f282ae3949cac4191fd7e196d6f1 [formerly 52651999c81f22f5087ae4587a0e4ac7abbc12ff]]]]]
Former-commit-id: b554a641e67cc41fbc4fd0f95c6c1274728b2f64
Former-commit-id: 7c8e409937e2755116b90672fdf419d8a091f297
Former-commit-id: e39e8644a2908b264d83b55d949159cd878d48c9 [formerly 96a3f274d1c89a0e2a1aed846eca04e6df8c5008]
Former-commit-id: 295010da2f4b51e5fb3187bb5d13621a84267281
Former-commit-id: d188b00662a9680036fe9f443dca377426e6cfd6
Former-commit-id: 391dcf356f0146708044f98761a47bce751a9453
Former-commit-id: 10bb6e21340472fc277de8028ead0119a4b8d78c
Former-commit-id: 52c02aa237b45a65a375ac6ae136e1d07229b668
|
2018-10-24 11:31:52 +08:00 |
|
liyang
|
ee04a3800a
|
Merge branch 'hotfix/富文本编辑器v-model问题'
Former-commit-id: 22011040da4bf68c494a488f353a69e4a16ff0f0 [formerly 22011040da4bf68c494a488f353a69e4a16ff0f0 [formerly 22011040da4bf68c494a488f353a69e4a16ff0f0 [formerly 22011040da4bf68c494a488f353a69e4a16ff0f0 [formerly ac3ed605d580a5262c6405bc2ab776c824e42a88 [formerly 439632beaa140830f3e390e2c89b2477c7cdeca2]]]]]
Former-commit-id: f2bc770b086154232761c602588893dd3f2583d7
Former-commit-id: 4a7a51b14746fb7f60e9ed86bb874beb6c1942b4
Former-commit-id: ec33ed389b21cbed73a2f75bf73cdfe77b656d3a [formerly 2231e325c2f82183e5608ea1c8e77c1ae0b86c9c]
Former-commit-id: cf9166a480adb35f83f0a137b549bc1c1c94ace6
Former-commit-id: 8b83ba1c7b6ce967d40ff71c3a551e8674eb4f92
Former-commit-id: 34dbbf25cf08c3af918bdffa7eec4a2ab7b32bd6
Former-commit-id: ffe3491785ad69acae32579332ae2fff74284c02
Former-commit-id: 7a13e03b3dc906a792b687a789d29fb7a6ecc135
|
2018-10-24 11:31:52 +08:00 |
|
liyang
|
e8df163268
|
修复外部修改数据无法触发更新的 bug
Former-commit-id: 03d095d49bfee17f7ba355a6cdd5a59cbb95d80a [formerly 03d095d49bfee17f7ba355a6cdd5a59cbb95d80a [formerly 03d095d49bfee17f7ba355a6cdd5a59cbb95d80a [formerly 03d095d49bfee17f7ba355a6cdd5a59cbb95d80a [formerly ee00a9a643c513d59dff1cc739dc0a566bce63b4 [formerly 715c6c4ed9855dcc7ad775195f6686a427d085d3]]]]]
Former-commit-id: e567a7e3db7019f2567f9fa769fea6639e75dd42
Former-commit-id: 6df46229a1ccd1e341501e9fee419999e9daeeca
Former-commit-id: d3781c6cdf7e414047cafc9a7244a7abc6e7b778 [formerly a8d000bfdbfc4872d1383f17e8e8f6a4bdb239c3]
Former-commit-id: 1f6bad0a0b3462e6a53692af6a153b0c7fbdd0ae
Former-commit-id: e693037a587d7ddab5d87f311a4a0eda1a2c0c0b
Former-commit-id: 8294c8385c4852f8cf0a2f21cf3ac655918845f1
Former-commit-id: 7ab11d42decf2d1bba7c26919ca86de20f664918
Former-commit-id: 4ef43b3c25ce828467141dafb206bf6bc9ade6d3
|
2018-10-24 11:31:29 +08:00 |
|
liyang
|
bfb566ae75
|
Merge branch 'hotfix/更新文档地址以及恢复刷新七牛' into develop
Former-commit-id: 51cd7c5d50e9408ea70710a203aabddf5a41c6b8 [formerly 51cd7c5d50e9408ea70710a203aabddf5a41c6b8 [formerly 51cd7c5d50e9408ea70710a203aabddf5a41c6b8 [formerly 51cd7c5d50e9408ea70710a203aabddf5a41c6b8 [formerly 806fbaea1d5e2c7d621a5b670c5e8a3f0e7dc75c [formerly a790ca79f63bcae12f26c9150e2e60063c64a93b]]]]]
Former-commit-id: 9b52fc35b56277fe2bf14679d3040d0b7cbe132f
Former-commit-id: 02aa3b44ba58c80f80328288cea4224873943663
Former-commit-id: c2c4adff676d119b144ca4e6f14ecfe2f56b23ee [formerly f41d1ad1c2d06b93e85579c363d9f0983cccb57a]
Former-commit-id: f51639dd50a90e36c4f0a3310017956d0707efc4
Former-commit-id: fdfe1d8f1e2646baebf8069a9a129b1529bc80a5
Former-commit-id: fd6d6fc0a0f743e1397dd5605db8e05719f6f9f4
Former-commit-id: 27cdee5ec0f51d9851898118dbe1e2fc41ed1289
Former-commit-id: 281b4fa6093d9b6e1065a866c91569a28e037898
|
2018-10-24 10:37:29 +08:00 |
|
liyang
|
c950b0c62f
|
Merge branch 'hotfix/更新文档地址以及恢复刷新七牛'
Former-commit-id: a81a996722ea6a70da5b1c6a8a9a8bcd1b0fb197 [formerly 062a660d6c3e577b948f036434c2f112d0d2e9f5] [formerly a81a996722ea6a70da5b1c6a8a9a8bcd1b0fb197 [formerly 062a660d6c3e577b948f036434c2f112d0d2e9f5] [formerly a81a996722ea6a70da5b1c6a8a9a8bcd1b0fb197 [formerly 062a660d6c3e577b948f036434c2f112d0d2e9f5] [formerly 062a660d6c3e577b948f036434c2f112d0d2e9f5 [formerly bb0c8c8c8607650081cf14140e7b50e613bb6b94 [formerly 147b9b42f25bb5a526af78f6ccac8420125e04bd]]]]]
Former-commit-id: c2e8d1c0756d603ecf2659a3f5d64ecd5c29af69
Former-commit-id: 776dd4874e69bd3cfcf895f83892a78fc958ec69
Former-commit-id: b83ee07cbad4c9f9fec082c71caf4ab6454b6a3f [formerly 0876e4d3d3f5e4b277ca2726686d5ce312dd9708]
Former-commit-id: 610d1e2e8eefebcaa00d47b47dfd5f516872ed39
Former-commit-id: 1754d69079339c79cd70b4a5b13a0f7e5c1695cb
Former-commit-id: 18f712cee1ea7b0b6558fe5bc9c739ff4ca91d6a
Former-commit-id: ae68252f53d507023f34b0023fc07a9d737d4153
Former-commit-id: 95b98957ddbc8dfc5e50600a977468dacc9daff1
|
2018-10-24 10:37:28 +08:00 |
|
liyang
|
1691f22cf3
|
更新地址
Former-commit-id: de192e4331cf6507f1d6b65792db9c8e02e7b3d2 [formerly 91ea57c90a4d84e2524a0d1dcb95b13098bad1a6] [formerly de192e4331cf6507f1d6b65792db9c8e02e7b3d2 [formerly 91ea57c90a4d84e2524a0d1dcb95b13098bad1a6] [formerly de192e4331cf6507f1d6b65792db9c8e02e7b3d2 [formerly 91ea57c90a4d84e2524a0d1dcb95b13098bad1a6] [formerly 91ea57c90a4d84e2524a0d1dcb95b13098bad1a6 [formerly 4e659ec9585bd40193f621e2a1adfe447b01735c [formerly ee582d8ba8a8576b17cfda79064ba63bde908a2f]]]]]
Former-commit-id: 0c9e1c6252b593c4dba36c9df36e5192b6675cc3
Former-commit-id: 88bb9b5469b468a707ee148ebab85c9a2e8104c5
Former-commit-id: 836e7e9d626eec4065dc693ca0e0d51214e91506 [formerly 68980db7305a4f3f4f237c10ee4f2324cba9b37c]
Former-commit-id: 0de4be04331d37214f58befdce53c3dcf9dbdf57
Former-commit-id: a0e329466e0a5c22a69abca0e4888eedee9662e4
Former-commit-id: 02290aab53ae88a42f388f90b1ff5574c09c384e
Former-commit-id: 7bede6044d668dc346c8c8126f074d28172ea4de
Former-commit-id: 30883c4ea914733f76758639fc4c7719443099ee
|
2018-10-24 10:37:04 +08:00 |
|
liyang
|
f0f8e1af0c
|
Merge branch 'hotfix/hmt' into develop
Former-commit-id: 836ab8a6b5e190de6a1bcc83004b4028415da913 [formerly 836ab8a6b5e190de6a1bcc83004b4028415da913 [formerly 836ab8a6b5e190de6a1bcc83004b4028415da913 [formerly 836ab8a6b5e190de6a1bcc83004b4028415da913 [formerly 3c5a8e689f788b0ec82019f1b8e7134c910e0390 [formerly aa81453157e996da95ec3f5f2218767ce8ec230b]]]]]
Former-commit-id: 6795a3bb2b1cf6c03e3ee2e1588dc8893a2eef4f
Former-commit-id: 6b831a5a4a9ee740938833376938f014860a58f7
Former-commit-id: 23d5d4ddd861ab9e7d96145dc1506fc0d51c537a [formerly 3d56a2b3662cfc0837458c41832f580f1f693ec1]
Former-commit-id: afd6c178597cd8caacc9f08e814d7859e7fd1cb9
Former-commit-id: d4af62784719713dacb5991effb69d7cff7a754c
Former-commit-id: ddd08bfa708b9849dc7418099cf539bf9b1efb55
Former-commit-id: 7308a9417adf74c663f734caf8daecee3c8a0c8c
Former-commit-id: b06e53809655d5c080a6a77635351b3e510cd8ac
|
2018-10-23 21:40:45 +08:00 |
|
liyang
|
a3290aa677
|
Merge branch 'hotfix/hmt'
Former-commit-id: 02d7377e737b260a1077cacfd909348e226c4158 [formerly 02d7377e737b260a1077cacfd909348e226c4158 [formerly 02d7377e737b260a1077cacfd909348e226c4158 [formerly 02d7377e737b260a1077cacfd909348e226c4158 [formerly 136111d0112539927efe934968d7f03c552289a1 [formerly 8542f4d8bd9a6ab9639df312735385f7c3cbc5a0]]]]]
Former-commit-id: 8cc50336ed579518d9129468a6f02f9ce20c20cd
Former-commit-id: 7f2b3dbcd3053f94c4d415ef9c2c2f508aadead5
Former-commit-id: b9faefedac1fb6535b3c0131afb4c1ba6220f286 [formerly e950eaffb45a35083c9dce708a001a677d96932f]
Former-commit-id: 5fe0f93e36d607f48bc8607eacf3fb028d13c854
Former-commit-id: 5c49ccae2e3d3a7084acd364477049c46f8997f3
Former-commit-id: 9dc36c0a037b7a8d77953e71e61a6172de92a7bb
Former-commit-id: c797c18d048716f0bd967ada8d7ac7d12f6e1885
Former-commit-id: 1622d504c03027e7d8813c898df6152f480495d3
|
2018-10-23 21:40:44 +08:00 |
|
liyang
|
c3c89ced6e
|
new hmt
Former-commit-id: e3bfe676a0d91a9c540c652d9dca00d5ebd6bbb2 [formerly e3bfe676a0d91a9c540c652d9dca00d5ebd6bbb2 [formerly e3bfe676a0d91a9c540c652d9dca00d5ebd6bbb2 [formerly e3bfe676a0d91a9c540c652d9dca00d5ebd6bbb2 [formerly c8ddb2c45c2b6bb66497ae4f1e55d3483c052912 [formerly df609416c6c990c163857dc1d3406f98c22da8ca]]]]]
Former-commit-id: 933f25f5eed6df4a1211fdeccee3f0b51d3ad7d0
Former-commit-id: 426345676f2a224a5349114e50f6d612041d6451
Former-commit-id: ef93ae38b3a17638886531dcfdda17ca48c8eeba [formerly 2221048b93e834a477dc0c5351e3aa08eeb60ff8]
Former-commit-id: c93d361e7d69269085f411dc14408bc9f4b16d2f
Former-commit-id: 28bba702261189f89e1d446d72887a5b567541af
Former-commit-id: c9fb180941633acb5cfb40784f78b4f2e0c7ba4d
Former-commit-id: f982b016c28f961524cf34bce1d56221467d7467
Former-commit-id: 35aa51824b2b85877f86aeaaf76310a57bf09654
|
2018-10-23 21:40:24 +08:00 |
|
liyang
|
2262f87b0d
|
Merge branch 'hotfix/修改预览地址' into develop
Former-commit-id: a29d1abc8c06e1a465e99239aeca0c5a479a5002 [formerly a29d1abc8c06e1a465e99239aeca0c5a479a5002 [formerly a29d1abc8c06e1a465e99239aeca0c5a479a5002 [formerly a29d1abc8c06e1a465e99239aeca0c5a479a5002 [formerly e4243f9301708a5b58cf398ef6f26e92335e0ec2 [formerly db6dac616b04b604253cabf1907d5820c56ba231]]]]]
Former-commit-id: 5e1cca8246aac0bf47782b25c8281047b68d6972
Former-commit-id: 875607200a8e480913595b5a4fc38b7a0dc88d4f
Former-commit-id: 025372e6da0c7af8855eb02372953a1403be411e [formerly 1f522ca1e81a62b6ea20afe7b3b37551ac84d546]
Former-commit-id: 0e392f4fc056bcdd8c5b56ed7431d7236319bcb2
Former-commit-id: 7602e1c358ecdb2c67cf5c578806a6e6bb082680
Former-commit-id: ced2177833fe3c440196c9bbfd0da689300c35b2
Former-commit-id: 204e01f9eede05395bf48e7be3b731c3aa717907
Former-commit-id: ab75602782f0996841f7edf40ff234693c524193
|
2018-10-23 20:18:39 +08:00 |
|
liyang
|
ce3b105295
|
Merge branch 'hotfix/修改预览地址'
Former-commit-id: d78cc0f46fd5c0d4684731c23a8b33d685a00457 [formerly d78cc0f46fd5c0d4684731c23a8b33d685a00457 [formerly d78cc0f46fd5c0d4684731c23a8b33d685a00457 [formerly d78cc0f46fd5c0d4684731c23a8b33d685a00457 [formerly 58b5b7a818068e5ef871b06b85f967961be87f8e [formerly 8303a2250144e3ea0b34c611b3299ac973c1c7e0]]]]]
Former-commit-id: 2af9c158d8be2cff385e1b5b24c98280fd751c34
Former-commit-id: b38be40636336b3812d2e61018717bbd6870e016
Former-commit-id: 623a13f15a98062cbcf08a0249426459d5530b60 [formerly 21c1d3a809456c78a149bbc11d53e2ebe8a55659]
Former-commit-id: e3776fc03c367954de78c83a8f9fef789a99be42
Former-commit-id: 72f66bc26243e8368d238fe9adae3a741f19f455
Former-commit-id: d34328dfc21f5a6e41a6a51808355deacff7dad7
Former-commit-id: f24174ea44bf4aee6952e3222a8be0d460a7945b
Former-commit-id: 26b3c78e84cd7de64da2674278833bdcd47fb97d
|
2018-10-23 20:18:39 +08:00 |
|
liyang
|
92ce74644b
|
修改预览地址
Former-commit-id: 488b06a75a4648511dabad7b6eca58d71c930ba1 [formerly 488b06a75a4648511dabad7b6eca58d71c930ba1 [formerly 488b06a75a4648511dabad7b6eca58d71c930ba1 [formerly 488b06a75a4648511dabad7b6eca58d71c930ba1 [formerly b31be258766b026876d7d0ed41faf55e6fdb6aa2 [formerly cf40737cef751b24a5e97d5992b411f5a8491b34]]]]]
Former-commit-id: 061130cc79cdb8b9d6c30b0b69f35e93c6d7b83a
Former-commit-id: 4228870101cd89cd2b56bf15edf79f9f95858ca1
Former-commit-id: e05514a0fd2a7978ed724c4b5264aa64977417ff [formerly d4564f0c6ed7e0a7774cb4c74996f6f9dc80cd02]
Former-commit-id: 3980d36224837ba9f3df92cca3a3ad6a135f7a3c
Former-commit-id: 4435ed5859d337aaa74ad0bd72d27e02e225452a
Former-commit-id: c349f02e6d69adb459f998edcd239d37e62d930c
Former-commit-id: 87d3c1c700261ac28245217ffc98a7e0d5436d90
Former-commit-id: 71c5dcd3be4a89f6c75a01ec1a5dd4e038481788
|
2018-10-23 20:17:54 +08:00 |
|