Commit Graph

1950 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
liyang
ec4b366d00 Merge branch 'hotfix/https'
Former-commit-id: e0d0ba372dbf46597488074122adc032593c1bbe [formerly e0d0ba372dbf46597488074122adc032593c1bbe [formerly e0d0ba372dbf46597488074122adc032593c1bbe [formerly e0d0ba372dbf46597488074122adc032593c1bbe [formerly 359f39d90c6af4dbb46d2e107ef3b708b5517a49 [formerly 108d2c9399d455fcdf98ecad5ff2a3abfba21a6f]]]]]
Former-commit-id: 541e74931eda042251c5b3d110463475fa106db5
Former-commit-id: 5178a37520c809dd3e17392aa75ed3b9e16e2a4e
Former-commit-id: 25710cbb298644e5d322aa3081a5480494596c6a [formerly 4b4c4d76bf8d64078a99a7396ee8fc46bd69732a]
Former-commit-id: 3d34645e7bc58bc59465fdb5ebaffe7c4dc41a17
Former-commit-id: 4af6f6e4d5ed57fd18ea5e8e7cd760b9462581d5
Former-commit-id: f7d851d68b50df39160a7caf15c75ed2d0b5b7d1
Former-commit-id: a414e99c34de05c0d5307264f0361b999c7c673e
Former-commit-id: e71c0aa5592c62d8a331e87a5ab1e150fb485bfd
2018-10-23 19:29:32 +08:00
liyang
ad31a2cc4f no message
Former-commit-id: f64fc2745c6ea753ed9c00d5c054acbf35152ea7 [formerly f64fc2745c6ea753ed9c00d5c054acbf35152ea7 [formerly f64fc2745c6ea753ed9c00d5c054acbf35152ea7 [formerly f64fc2745c6ea753ed9c00d5c054acbf35152ea7 [formerly d73f1dd128ec0d29b9a6f5c58b6f18d7cc589905 [formerly c26b7881a585e2ff5c3b9df732db0e5abf8f4ab3]]]]]
Former-commit-id: 4546c36ffdd4b047cf920a3e7c722b59a0677488
Former-commit-id: 1169f72717db7ef07d30d52450f6a104025696d1
Former-commit-id: 6e983d78c7b09e072301f3ff34ba70acd19078e2 [formerly 653103d7ad4394a65233c4f721123f76fc884363]
Former-commit-id: dd770dd72d110c232d143881a272ec302c78ce50
Former-commit-id: ac314be085b2f977b4c0a4eec66fea8b80064b73
Former-commit-id: 702d3b80455b95389695aa8911a014c2a43c34ed
Former-commit-id: ecdc9b07a974bf4a7ac3b2a35206bfd044671f4f
Former-commit-id: 48f2f0f68e61dba6f0cb23752c075ca2409b7d76
2018-10-23 19:29:12 +08:00
liyang
7648593182 Merge branch 'hotfix/https验证'
Former-commit-id: 5511bf5b66b738781fd189681df86a0fd11b70f7 [formerly 5511bf5b66b738781fd189681df86a0fd11b70f7 [formerly 5511bf5b66b738781fd189681df86a0fd11b70f7 [formerly 5511bf5b66b738781fd189681df86a0fd11b70f7 [formerly e5f51f586e5cff754a1ef6be35a810028cc25489 [formerly aff01d8f3bd670358728c8684b4b6a645ef5ce6a]]]]]
Former-commit-id: 0c35259dba444556a759d477362f7ce5c17814d9
Former-commit-id: f73335f9dbd30b46bed106542fc30caa84a1693c
Former-commit-id: dedfb998621d44bd651217635f66bc032d24ef65 [formerly 7dc9b3c595e06dae4b5764a899d385b9c03c6f1a]
Former-commit-id: 6fa0fc36a6d1399be8250dd6f5888361fb37a96f
Former-commit-id: 92e922bacd4a29550c03d4caf3cb1b6c7521c329
Former-commit-id: b4bce0450252c04f5363d2dfed9b5d99990a3840
Former-commit-id: 4b94db9e128a74cd4bcb2fa46b8c576249767c70
Former-commit-id: eef0720ff5fcbcf27fb694c7a7105807b1514382
2018-10-23 19:16:43 +08:00
liyang
0152795fde 添加检查文件
Former-commit-id: c527253c00647e0cd91e03fb7a828ad614c332c7 [formerly c527253c00647e0cd91e03fb7a828ad614c332c7 [formerly c527253c00647e0cd91e03fb7a828ad614c332c7 [formerly c527253c00647e0cd91e03fb7a828ad614c332c7 [formerly 97b3c55c79e6e9233cbecbd6b655f94202b6c384 [formerly 4ea7404e2bc0d98fa5261611ef19aa2fc4d4b6b1]]]]]
Former-commit-id: 75444c2d9bcd64cd7b21ddbc96086a27c38a0c26
Former-commit-id: 0261419b608524fea7d7b4dfa5377c1a2aa89af3
Former-commit-id: a343de78bb30272e5dbddaf0c2545b16d3397820 [formerly a733d97ce102e2d113cc8e55f1c77145d88afe49]
Former-commit-id: 6c9d3006169b324c585f62ed315e8fb1941af17f
Former-commit-id: 20cf5553591893f02f8bf98b95fdaa236db28325
Former-commit-id: f72722cb7e0e0a0a552e765ef03cb4b2cc0453bf
Former-commit-id: 6af16373bf6d2ba21fe8547081a75227e61330e0
Former-commit-id: 32d0e8e3dc3e5ad72479f7ef9bc9776470837d51
2018-10-23 19:16:04 +08:00
liyang
f778a5719b Merge branch 'hotfix/删除版本检查请求'
Former-commit-id: 6e2e94aedf3f5466f130cfc22349352f80ab7145 [formerly 6e2e94aedf3f5466f130cfc22349352f80ab7145 [formerly 6e2e94aedf3f5466f130cfc22349352f80ab7145 [formerly 6e2e94aedf3f5466f130cfc22349352f80ab7145 [formerly fbfc76426f2c1552bb306de81ddbe68420f6c3f6 [formerly 1e07b5cf65973de8d7a3a7fa32545a8287a1702c]]]]]
Former-commit-id: 2f0e1b78a1a273be87bdfb57797ef1df85831321
Former-commit-id: a41515ae4be9db509d3362d93ca7a8dff7b4220d
Former-commit-id: a6e4e0fcbaada53e0a49c8d556c9e04fd5bb6978 [formerly 7be01821472369dc9175697adba5bfc1d5dae6ae]
Former-commit-id: 17438896d0f5ad5d62d39fd5026578a9a975e9ce
Former-commit-id: c80844a3d02081717ed857f9cbf55c13ece678dd
Former-commit-id: ce9a71e565de85ddfd13673aab21b18c85196b3f
Former-commit-id: 7a080adc51f2a917cc85c6adaf70788eab0e25c0
Former-commit-id: 22005b5fb2b48fc28b5a4c995a54ecec9b7b677b
2018-10-23 19:12:45 +08:00
liyang
45e88cffad 删除提交代码前的检查
Former-commit-id: 060dce822cadac5bf5386c7c4e4491e0c1edea36 [formerly 060dce822cadac5bf5386c7c4e4491e0c1edea36 [formerly 060dce822cadac5bf5386c7c4e4491e0c1edea36 [formerly 060dce822cadac5bf5386c7c4e4491e0c1edea36 [formerly 976629cd297185ea54b423ee08a6f35016312594 [formerly f92bb1a770fdfcac7cbeced7de8d72bee6837cd4]]]]]
Former-commit-id: d49ce19ee905a8726cf2432113259c1849ad0132
Former-commit-id: 29188fde815643be5540a55c93113857f6e1f4ae
Former-commit-id: 36bd81eb78d9d45acdc2a98f09b0f4e0bf73e8b0 [formerly f9169a492e543d0e5e0b86ded919278b2570b362]
Former-commit-id: ca2fd7c40ec2f258755cdd8482034f743a4cb1f8
Former-commit-id: e8293033cdba6911c06331cac6a22d008d8ac631
Former-commit-id: 4ed5d397390c59a5644b4678c65ea2cf5d2f6649
Former-commit-id: 4a5dd8132c5b5229823e1e44cc9d1ac68b5094f7
Former-commit-id: 2d92615925f6133b48c8370f2fba1790958f3560
2018-10-23 19:09:53 +08:00
liyang
7b9d46655d 删除请求新版本相关的代码
Former-commit-id: c4aafa90eef4fa78782d750fc33e484d071e93af [formerly c4aafa90eef4fa78782d750fc33e484d071e93af [formerly c4aafa90eef4fa78782d750fc33e484d071e93af [formerly c4aafa90eef4fa78782d750fc33e484d071e93af [formerly 2ef73ea49b3405be63a1552eaa45649af7d559df [formerly e8792780e531de7b81bec704953a57fb05c3255e]]]]]
Former-commit-id: 80c8177590bbadb58158ea371d1aa67f05de60f5
Former-commit-id: ef3cdcd6a5eed24569fa9a0c38ead6903d8f84b0
Former-commit-id: 9874c1f8f43c8beda5404b222d53697774f808bb [formerly 810d6baa2283c6310dd8ae35fa99b810331cd7f3]
Former-commit-id: cd5531c1a53a55fa62d897a8ffa27b30b0d5be50
Former-commit-id: 79be8e7248a71c1b608c009d4b200c6cf04572ca
Former-commit-id: 0d797ed715b7091e9b9a3748dd85152a7c86549e
Former-commit-id: c175d6cb3db552a3b8749fa51c0cb6375fcfc0a7
Former-commit-id: 6c2d3338e77a6f3ca12fee92621d23ea795f7a3d
2018-10-23 19:05:33 +08:00
liyang
85da2af545 Merge branch 'hotfix/取消刷新七牛'
Former-commit-id: 708445037a6849565ba97aeb7c2bc9a615a2fa43 [formerly 708445037a6849565ba97aeb7c2bc9a615a2fa43 [formerly 708445037a6849565ba97aeb7c2bc9a615a2fa43 [formerly 708445037a6849565ba97aeb7c2bc9a615a2fa43 [formerly e5dcb769bf4ec4913238926eea56944397e2c4f6 [formerly d6c96c40ca0bde48c5e45c5221799062ff691de0]]]]]
Former-commit-id: 7b60c40c02d850274db481edb91466afb2458d9e
Former-commit-id: 80dc31bab481fb1773ed19b023cae8e80861adb3
Former-commit-id: 8b3fe3d29986e94daac6405f2be43eaf8b58023a [formerly 198628b84910b20882aabeac120f55054a1d1551]
Former-commit-id: 465dfe331f47c4fa43fb374b0e532b019e159fa6
Former-commit-id: 323b62c9cee6b78e0a0a0d21ba67c507a7241a60
Former-commit-id: 484bf8e9fec9298cdfec2978eb7d474f50e0e0ef
Former-commit-id: 8e1ffbce2c986b3c21f55fddbc830ee6ac2de8ff
Former-commit-id: 8d5da7bb1c70ae79654ba4af0a8aefc30fec0c7e
2018-10-23 18:41:21 +08:00
liyang
301846d32f 只刷新文件
Former-commit-id: 8b61c12b4764b5d54cf91c0f53637e6f145247b8 [formerly 8b61c12b4764b5d54cf91c0f53637e6f145247b8 [formerly 8b61c12b4764b5d54cf91c0f53637e6f145247b8 [formerly 8b61c12b4764b5d54cf91c0f53637e6f145247b8 [formerly 83311f8a5d7c41727633f74183f8141d3eab982e [formerly 71888a7480c5cc602603ac530909833cae8f3455]]]]]
Former-commit-id: 6d4ba2a0e2d08f5ff3b43fd4f7593ca8cb527277
Former-commit-id: 3007cb245d32fdfa309c36c9d37a5e33dc8e141c
Former-commit-id: a0f1adbe57a31c0d7d53efeb910413623c3e4082 [formerly 1433a7c32c2a3c9f1ee09518c29453e5df4dd87c]
Former-commit-id: b08854409ddf507bb84302692846b4665e3226b3
Former-commit-id: dc4443f80dbc10cc7011def415022a8c4aeaeaa7
Former-commit-id: 2f354628d622a0e46aac04d11866c36142182810
Former-commit-id: 31cb7d2019d3f342018b5c78d3dba57b9135fecc
Former-commit-id: 49eb260af347b023da7d931cd66a0124232b5b92
2018-10-23 18:40:51 +08:00
liyang
d0ea39bf42 Merge branch 'hotfix/baseUrl'
Former-commit-id: a5edffea73250612acf28af7e088dba4d5cb94c7 [formerly a5edffea73250612acf28af7e088dba4d5cb94c7 [formerly a5edffea73250612acf28af7e088dba4d5cb94c7 [formerly a5edffea73250612acf28af7e088dba4d5cb94c7 [formerly 449ade313a103a12ed243a974fe2b784c6059542 [formerly 14733b6c29476870572293066739e230dfaf19d7]]]]]
Former-commit-id: d6b2a59cc301dbe85553aa69553a5a353b1594eb
Former-commit-id: 95ac869424cab4cf61819d26a05c856f6e040b59
Former-commit-id: 546a2e14490442d33aee4a6397ad6e4c36d010bc [formerly c3fdf815fbd1e9f6558468d5332ad7f72f9df5f5]
Former-commit-id: 6b6f67f647d1a9b075135c91b915fd771d8ba07c
Former-commit-id: d56541f2f547eb7dd5b8162eaa4946cffb168009
Former-commit-id: 945cfe130df72f84964bea3606bc9e7dbd0eb0e9
Former-commit-id: 47ccb8fb88ab33c10d41cd3651d0259c57b8a1f3
Former-commit-id: 8bb03dcd299a6bdb24cf8ff091326ae8e37d150b
2018-10-23 14:14:39 +08:00
liyang
8aff8df786 no message
Former-commit-id: 29c77f5c247ac658b0c04a6ba77ccc41771f2221 [formerly 29c77f5c247ac658b0c04a6ba77ccc41771f2221 [formerly 29c77f5c247ac658b0c04a6ba77ccc41771f2221 [formerly 29c77f5c247ac658b0c04a6ba77ccc41771f2221 [formerly 54625fb4f09d57bc6eed83ac9cfe0680f0910055 [formerly 19417cc1a53751720430b1e7abf639eca17c5ad2]]]]]
Former-commit-id: 3dffd623294849e9ad9be5a8b7f1eaf2c121d636
Former-commit-id: 01fdb979c9e6fed6e0eb0b921a09cc4a3fa4f7fa
Former-commit-id: 79c8e2d185bf242153f168057add11330258047a [formerly 0cb5fdacb42922f704a87c666752b58c72682d32]
Former-commit-id: 9cb2ccb5a6b73722ea76c8bcc5d4e54dd21065be
Former-commit-id: ca9b7c8b919ed53faf334b323a99d27ea2cacebc
Former-commit-id: 22d9c51a9af00ccad7c4218d84e4f152b034d7af
Former-commit-id: 9237a5ba539132b2861653fd63e1cf8565ed10ce
Former-commit-id: f78a733620f5af2d464e10b8b009f6d5ddf346bc
2018-10-23 14:14:29 +08:00
liyang
28016a2bff Merge branch 'hotfix/cdn'
Former-commit-id: 1023c2bde63d87cc0730aabbc2e61a212cd8a630 [formerly 1023c2bde63d87cc0730aabbc2e61a212cd8a630 [formerly 1023c2bde63d87cc0730aabbc2e61a212cd8a630 [formerly 1023c2bde63d87cc0730aabbc2e61a212cd8a630 [formerly 4c151e72d77cf68e470cfa0a2b3bef93ed514fe9 [formerly 64ee2bec4cc680ab20803c3bef7199893e5642ab]]]]]
Former-commit-id: a3e8bf0930447c58d59ea64aaae748833e34bf97
Former-commit-id: 1c3f05490849b320dce8064ce57a931e57d9f326
Former-commit-id: 56e6a2751ff36f571e821523cc33f552ad010094 [formerly 2d708cd74c166b10c4a4b3bb06a9976cc453377a]
Former-commit-id: 2e2e355ae9573b511c1cb1d59b0934484ea6ad5f
Former-commit-id: 9ebb4163c7cacedff620893273c69aaa42637b90
Former-commit-id: f43a9ede3474f7d1ced0014f2f9b97279a779794
Former-commit-id: 34d67ce7ff755b8f20abf2458da64ccceb72be80
Former-commit-id: d7befb8bfac87c5611d356e78057e4d28b47b669
2018-10-23 13:51:57 +08:00
liyang
1d80034641 CI setting update
Former-commit-id: 8c132cda293860ae9455efd76780d8235954cbf9 [formerly 8c132cda293860ae9455efd76780d8235954cbf9 [formerly 8c132cda293860ae9455efd76780d8235954cbf9 [formerly 8c132cda293860ae9455efd76780d8235954cbf9 [formerly e1fc7f01a34d73f4cbf3585bba07e119a7c9edba [formerly ef21ea8f017d1771f07fec1c2d85ed6d85efa0dc]]]]]
Former-commit-id: e312709cf2363da7ab6c19e51933c9d89748fc4e
Former-commit-id: 9338bea56f6d91a90b75dd682fd5da41b4dfab59
Former-commit-id: 6fa547861a969bdfed447d8f869871b361ea4571 [formerly 29ea57ff2586b0e6cae3f8c3e35953793f2d2ef8]
Former-commit-id: b3d307718571288bdfb7f96c412ab9722c636768
Former-commit-id: 5c3e60ab7ae8c527d9113de944c93ecb1d927806
Former-commit-id: e42bb5b53554ab05620be83de57d4a38bbbda088
Former-commit-id: 328ae19ecc6279471bdc26639aa81b56079f93d3
Former-commit-id: e7baa65366b0c120138dea10e1398adf59f9f7d2
2018-10-23 13:51:40 +08:00
liyang
3329df29c3 Merge branch 'hotfix/v'
Former-commit-id: 43d073cb63f03ed96c04be3ac62ac61789d4555c [formerly 43d073cb63f03ed96c04be3ac62ac61789d4555c [formerly 43d073cb63f03ed96c04be3ac62ac61789d4555c [formerly 43d073cb63f03ed96c04be3ac62ac61789d4555c [formerly 7f6ab4b5fe5c7e34e336893289911dccc2e7d1a2 [formerly 40b6f4e0f01af9e697d6114149c1697696c87480]]]]]
Former-commit-id: ecde6bb7aba607ae444abd15d4f997c1f2997215
Former-commit-id: 65dc958d589048b6ef4fb5358086f2b689d4e584
Former-commit-id: 8c3923cc4852a45d44d96dda2317f3882d6dd3e3 [formerly 71de710d598cf3950b8736bc1dd60e207b385a2e]
Former-commit-id: af2f83ec470f528c6df093b305a5e8fa4deedb6d
Former-commit-id: 963d9f67158c3cde3d26f7db53369e719de26947
Former-commit-id: e152eb23974681e719be3701b848363d10791d70
Former-commit-id: f9cd7fa45d7ee8935097527dc834543fe8254c11
Former-commit-id: 5ec9f504c905ecf275ec221b1785fcf592bd37d2
2018-10-22 22:28:17 +08:00
liyang
2c371750e5 no message
Former-commit-id: 77495fb88e527320e13f09f5e1456293998ba84c [formerly 77495fb88e527320e13f09f5e1456293998ba84c [formerly 77495fb88e527320e13f09f5e1456293998ba84c [formerly 77495fb88e527320e13f09f5e1456293998ba84c [formerly 9ac6e5384ab1e3ce938f70b16dbce9ad70cf16a6 [formerly cfe91022cb4423a7c563a3dd3c7e20bd898e3dad]]]]]
Former-commit-id: 4ee0daeb4d2927a06f348e768660c5e225995060
Former-commit-id: f74bd551a589a21cea1371bff0e97ab77382799d
Former-commit-id: af1bb2b6cbd5758ff46a572bbd70e6e6dd74f825 [formerly 7c4959164b4c788b254bb7af941020f834e8422d]
Former-commit-id: 66a15db4101ae9076c8e854f13b00395a7a66f3e
Former-commit-id: 1897c3ea1a420d830e16aa30312e6cbc8ca8c650
Former-commit-id: 625d6b5e56151a869940ebc9bf4494fd084476ff
Former-commit-id: da3e0432dba493d18be5d60eae972d9b8b48e922
Former-commit-id: 2c12dbdd69b5d6206d5f4efe4789e0a4b562c087
2018-10-22 22:27:28 +08:00
liyang
4e0e1349f1 Merge branch 'hotfix/xlsx'
Former-commit-id: 90ff4690a31cc041a07c4c6d11ea8290dbfa6049 [formerly 90ff4690a31cc041a07c4c6d11ea8290dbfa6049 [formerly 90ff4690a31cc041a07c4c6d11ea8290dbfa6049 [formerly 90ff4690a31cc041a07c4c6d11ea8290dbfa6049 [formerly b6ca07603ebb8beae5e412cfc42e48bd64a74af1 [formerly 8b7be6ecf2ef467a4a2527f3c07bab308b51fdcb]]]]]
Former-commit-id: eef84ca7ed0941f77fe84f66dfb4e1489154d294
Former-commit-id: 0ce5ff62e5bba080b20f4f26c2bc650af6ad8f9a
Former-commit-id: 3b647f6a6a50ca64cd64bafc27b811eb3993035e [formerly 3c1756bfed35f95f5a734cc933dbd0b40875d904]
Former-commit-id: ad3f6319bc4b336e1fde2ba07d26d6ce84816c0f
Former-commit-id: 2821b1e9aad2522b889d9f1d99a82e7836124e19
Former-commit-id: 49fe223907fc344898c5b98965b3fa30e5d92cdf
Former-commit-id: 2175c938db900e7435ae92de4e413fb3e5bf4463
Former-commit-id: 3bb1591a319674e4eeb1ecd207a0c29b78214962
2018-10-22 22:04:35 +08:00
liyang
4cc57b0645 删除备份
Former-commit-id: 01873f1fcb6decc10bb3f850bdd231bd876c122a [formerly 01873f1fcb6decc10bb3f850bdd231bd876c122a [formerly 01873f1fcb6decc10bb3f850bdd231bd876c122a [formerly 01873f1fcb6decc10bb3f850bdd231bd876c122a [formerly b72c22697c50254c7aeba282f8d78d62df593e9e [formerly 48017a6b8a4ae71b0b8fd6b171380ce7a23c7e10]]]]]
Former-commit-id: 467f17b9b429d306666d11e5e186924b06b83dc5
Former-commit-id: 64221fcc6c07492cc5ab1e37eb8ebb405712d1b5
Former-commit-id: 6a027e10de6b284f3feb237c94f985a2bade8a49 [formerly e7d72c0c2eeea156c3b008ed7826e83272dfd701]
Former-commit-id: 86966f7ea3ef61c6fd86bbdca637e47e2a6d04dd
Former-commit-id: 8e5aeaa9f9154ed54ce9c931062284c0d6769443
Former-commit-id: c0d22ae0e6ed572d10076c7fbd545d653289fcd4
Former-commit-id: be720d176af356de1a2b0b3493cdb69a4848b744
Former-commit-id: a719e87a2cafb77d007139ea49fdf1dcc48eaf29
2018-10-22 22:04:20 +08:00
CNine
f7f1d62d4c 增加 excel 导出的合并单元格选项
增加 excel 导出的第一行标题选项


Former-commit-id: 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 66de20a3d02326759333a63a1f90e93834d7d420 [formerly 3463e5feeaec05f84a8c42930edfbacaba6f0b92 [formerly 9ab91bc47458493d93f817aca80427749cb0acf6]]]]]
Former-commit-id: 94df74e7c154789c835119fc23096fa6f8202ad5
Former-commit-id: 4a005fbd1ada5ce6e4cbb085b320660f2aa626cb
Former-commit-id: 9d6dcc7b0e761e85a5295b235351b2e462c42f1f [formerly 607caf152de8bef7fede86a44e3003b1aaff2912]
Former-commit-id: e54717456d4c5db124d9b8f0536a5dd6b1c9f8d7
Former-commit-id: 360f57cad825ce848e0cc1ef27835ec49837e0a8
Former-commit-id: 48de0f2794339a594d3fb37e3f76fdc6302932a9
Former-commit-id: e037bfa8bdb5e08b116cdea79887f82737b5034f
Former-commit-id: e785e67cb2ee407b5b682bf8959767daff219ce7
2018-10-22 19:53:54 +08:00
liyang
cba26a1dc7 no message
Former-commit-id: af1c05585626d20d3bb14711634a1a8e9e46ebb7 [formerly af1c05585626d20d3bb14711634a1a8e9e46ebb7 [formerly af1c05585626d20d3bb14711634a1a8e9e46ebb7 [formerly af1c05585626d20d3bb14711634a1a8e9e46ebb7 [formerly c24a00935eccfeb35ba96be6c862cfe40ea0ef2d [formerly 1c048915531750bba35b558a1d4e08bceb7431da]]]]]
Former-commit-id: c8825b242b94cc4d840c81da64ddb3fd932aa973
Former-commit-id: 9105521cc8eada9f5b6b668f0cd058f626db2a8c
Former-commit-id: cb2c7b817ffb6bfac1909587200ddf937c5b91c6 [formerly 69693df4f0b1cbda8a737d01551cafae23edea67]
Former-commit-id: f305e0576f2d8eca20bd671cc819bface96593f7
Former-commit-id: 0d3de3c2083bad9d1041d2884d98f332862f1fcc
Former-commit-id: a691a94ff9f45858b8940f7a894b4c72b4bd9004
Former-commit-id: 900e1d1a3ee68890cf75b8a3ddac8d840c3d8def
Former-commit-id: 1870fe62e623dfc5ad708a685689c8b3a4f14980
2018-10-22 18:32:57 +08:00
liyang
7dafb8a0e7 no message
Former-commit-id: 253387fc71686e4029bc38754f194b2c04e918e5 [formerly 253387fc71686e4029bc38754f194b2c04e918e5 [formerly 253387fc71686e4029bc38754f194b2c04e918e5 [formerly 253387fc71686e4029bc38754f194b2c04e918e5 [formerly 120fe5b3f72817ec15a258dabc8d9d57fcb97c06 [formerly a0b942a1b8fc986aa9bb51932a8d9708695dd668]]]]]
Former-commit-id: 8b2b81fa34f5eecd015998a1dd7184c47b7fbc49
Former-commit-id: 8bab317b06a1da7896c235768ea99b7529149cb3
Former-commit-id: 949ac6a79e31b8a742c7d40ae256367be61b0212 [formerly 8a8088ad99a8ec356523eaf05062c0a3fdd84d2a]
Former-commit-id: e14685a9e78ed7943906c3f16635866e99318861
Former-commit-id: 461467d6a4f7aa30070cb9db56aead0b3b6d805a
Former-commit-id: 7455b94152dfb573f4333d10aa4367f4cea63657
Former-commit-id: a534dc1bf6ed6b7bc6ff439945095d663134214c
Former-commit-id: c42a1db8e55ba75b266e97a33d91143a4662a3a1
2018-10-22 18:28:35 +08:00
liyang
86c9e19293 Merge remote-tracking branch 'origin/develop'
Former-commit-id: 005e710908c01681627ddba15482406318476263 [formerly 005e710908c01681627ddba15482406318476263 [formerly 005e710908c01681627ddba15482406318476263 [formerly 005e710908c01681627ddba15482406318476263 [formerly fb3ea65ac259561d71c3c4a3cabc5e0354340e1f [formerly 43a2ed891e922cbc90322ba9aff7f1fda696edee]]]]]
Former-commit-id: 77202dc807174d8b07b28ce63214d75bdbc999ac
Former-commit-id: c16459f563c68b3254fdbff6e827a13c2f68ad16
Former-commit-id: fca59c822ccd44f01f8c044964f5f8aa741c501f [formerly b4d5ee55ddc2853ec06db9f0f81b88a802821668]
Former-commit-id: cb9804543c17187f8da188fa3cdee38a65f3c7e9
Former-commit-id: 970d3c4649bf869ffdcef8c297694f5a79cfba81
Former-commit-id: 23e5ab830a6f88cf2cbc74e2b24cd274f51e79d8
Former-commit-id: 928bf7b1f15a7b90dac5eeee40faefbd62532ae9
Former-commit-id: e82726348ecf68cf0ee331ef0ef0aa038d8924bf
2018-10-15 22:44:30 +08:00
liyang
fdef9dd69b no message
Former-commit-id: a999552c633c7468ea0dc3a02684586ee278c0af [formerly a999552c633c7468ea0dc3a02684586ee278c0af [formerly a999552c633c7468ea0dc3a02684586ee278c0af [formerly a999552c633c7468ea0dc3a02684586ee278c0af [formerly 29b89fe809b751a13b96e7da444d27fa87860650 [formerly 8cd3e077bc1f315559e9a84c9567cd508ecb82b3]]]]]
Former-commit-id: 325f7590ad3db9bf4b40b2d1934228cfe53f22c8
Former-commit-id: 75bdb2621ca0442a7f814975df296b727f53203f
Former-commit-id: 51802ef4ec4f5fc78db1aeef2c50082383446e5d [formerly f8d29a8dd71d8736d3bdf97dcdf47348638195e3]
Former-commit-id: 884d1722b50d76553006f958c373eb17a8850572
Former-commit-id: b5fe4d346a8ca33df14edde64534a2681fef68b6
Former-commit-id: 7d0bae570cb6c6ed18dae60a1a0b545f4880a174
Former-commit-id: 0134f45e357029a7582cc7ca90b185714e949734
Former-commit-id: 9dc73a3f388d5342937c2463dab29fcfdd810059
2018-10-15 22:04:32 +08:00
liyang
6b633d3780 Merge branch 'hotfix/mock_cookie'
Former-commit-id: e3b6e3f98c825c3d63460703017d097994d2d61b [formerly e3b6e3f98c825c3d63460703017d097994d2d61b [formerly e3b6e3f98c825c3d63460703017d097994d2d61b [formerly e3b6e3f98c825c3d63460703017d097994d2d61b [formerly 3d262d79eebc2b80c862bbd85432e22d63867927 [formerly 06b5b3f5027f43604eec3049e7aec2db3d76fea7]]]]]
Former-commit-id: 9cef203e38b6680f404b9cbbafe4fd5599129054
Former-commit-id: 9eda3f70b6ea8fa9f5e93c172b9a64e6f2a33270
Former-commit-id: f7bebd4c17a07aa1ac7a885bbbb4e5c60aa4c134 [formerly c556dcda1c3eb1bf7d67f1780becfa8fcdab8497]
Former-commit-id: 9dd7df8fb8757eae50b5e36df48fc99eaae4e7f4
Former-commit-id: ff5ff1b336886c7980e4af13590e0314c366221d
Former-commit-id: 88276bcf7ae6f297b2e4dcf977fb121c58c80c78
Former-commit-id: f68f0dd8f28dbb09e58c0e1c9fad2466e34357e9
Former-commit-id: de5f6b5a3b1aa482e7712aa852902913f33345e2
2018-10-13 20:53:29 +08:00
liyang
fef0d2de7f Merge branch 'hotfix/mock_cookie' into develop
Former-commit-id: 3c1851b296580793b43a13fae61a4f0e54c8ae9c [formerly 3c1851b296580793b43a13fae61a4f0e54c8ae9c [formerly 3c1851b296580793b43a13fae61a4f0e54c8ae9c [formerly 3c1851b296580793b43a13fae61a4f0e54c8ae9c [formerly f6868eeb1774258c2e08b0519447c6ba504d6812 [formerly 1074f84e5dd01b2731a590d7d840eef2cd56c7e9]]]]]
Former-commit-id: d424af7886642a2483b1b8e4ec5db8b2de01f0d8
Former-commit-id: 73caaab600a67a83cdc7cca1df0c96d59dcc7aff
Former-commit-id: 29edec4793650b50bba982c3ac4d778530a154c2 [formerly 7fe2a1c7926816fe038150a0faf867070e79da1c]
Former-commit-id: 417f6eb6d9853b529e04223e509cb006425d764e
Former-commit-id: 9c11f49368da627ccebc0c0f36e3d32415a441dd
Former-commit-id: fcfc6f7fcfef9cfa7712149979b84e45e4eec849
Former-commit-id: e90b02db21d1e488b9b90adb47e1c407c4c8e73c
Former-commit-id: 61f645c5bed2a5b4680ac57da846bd1655b6d9bf
2018-10-13 20:53:29 +08:00
liyang
4839d4e012 no message
Former-commit-id: b7453845d040c582f4458ab15dfa0522bafa6616 [formerly 53fae434f86195f623d9d964be0ad5956c5f0638] [formerly b7453845d040c582f4458ab15dfa0522bafa6616 [formerly 53fae434f86195f623d9d964be0ad5956c5f0638] [formerly b7453845d040c582f4458ab15dfa0522bafa6616 [formerly 53fae434f86195f623d9d964be0ad5956c5f0638] [formerly 53fae434f86195f623d9d964be0ad5956c5f0638 [formerly bf3fb82abd06b17599d1d68fa49bf56c02288976 [formerly 2ca017521c913fbdb1d19a096228a388c0e56ac3]]]]]
Former-commit-id: 818ef1b8b51d8fe3af7dc04b90ffdaf2c6f0c45d
Former-commit-id: df4e6184adc8c2677853be2b28ef22221e57c46f
Former-commit-id: c458bb07665cb83a6733c9ead2b63da3040acb79 [formerly 505ab2914c8e02f4152a74801a4c1beb71c30074]
Former-commit-id: 632c96a86bf674555bd7163ef4c13c00e15ba105
Former-commit-id: 376cff42c807e4b2c5b0550f82cb351e0f478871
Former-commit-id: 6b6e14f268336ceb650eec80ae28ce9b033160ab
Former-commit-id: 2ab2924dbfc029c521626afffea44b6a5468d6de
Former-commit-id: 9922d8d46433c7e7bdc03aded8b0a96b157b7207
2018-10-13 20:53:19 +08:00
liyang
b2a44d1356 no message
Former-commit-id: 64173729073e7540f18704ffb28a0701a36581ee [formerly 64173729073e7540f18704ffb28a0701a36581ee [formerly 64173729073e7540f18704ffb28a0701a36581ee [formerly 64173729073e7540f18704ffb28a0701a36581ee [formerly 5f4ee2187599947f17286d3bb3e54dfd090fd15e [formerly a61522201421698c4bf5148b2d8094896f673fc3]]]]]
Former-commit-id: f48de1f970e9cfdac764e8df25a39d8424bf1c8c
Former-commit-id: 476ea4773938b730931e1d9ed07cb7ea32f3075a
Former-commit-id: c836cfc9721da7ff774bd42a51e5d6224a17769c [formerly 75709120c47b08f8f922c3713d7144c7499624c2]
Former-commit-id: 330bcf325705b7a28f46bee1aa9348622e968365
Former-commit-id: eebce31e83173f9fe1d08755395ad650a29d4f7a
Former-commit-id: 365fe059c05fbb378cb56193fea7a3b64f12b97b
Former-commit-id: be8d993244dcf243e97d1586e690da4868952fa4
Former-commit-id: 58b71c1e23f509080990e2563f4e0dba45e20fff
2018-10-13 20:51:16 +08:00
liyang
2956d18cec no message
Former-commit-id: 1da5da7f5f11142545f38d6f0ebfb8c72ba52cf0 [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5] [formerly 1da5da7f5f11142545f38d6f0ebfb8c72ba52cf0 [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5] [formerly 1da5da7f5f11142545f38d6f0ebfb8c72ba52cf0 [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5] [formerly 5aa2fcf4177723d20af2feb4f797a19426acbce5 [formerly c3c60a79855d50c56a434eeaf59e29def32213c8 [formerly aadfbbd86ddb0d5b6477af805b18c5331bff96a3]]]]]
Former-commit-id: f9e8f3adda0d3b8b9b8e73a1d61622bec170898a
Former-commit-id: 95f0b3f33ebbde615ecd9eea541be2fcebe493ed
Former-commit-id: d301e8adbfee1d5edf69e15cb79f35c190eeebae [formerly 4053f1c826056cbaa146fac54aa72d444f7f24ae]
Former-commit-id: 36fa26e3d0d4f54b3a2377d31ddf094067aca0ae
Former-commit-id: f14f9ea2bd7806cbd93eddf068f437dbfbfdeb13
Former-commit-id: bad957ddc620774add82ed308e0aee5700fbfbaa
Former-commit-id: 50f57cb8433f7826233433950657257225996db4
Former-commit-id: 0a0a5e36ff82fce7001ec6d5ba04a07c1a0759d2
2018-10-13 20:47:29 +08:00
liyang
4ec18b611f Merge remote-tracking branch 'origin/develop'
Former-commit-id: 08ea2abbf021bfb87a309f5327d1a4c6a1194b13 [formerly 08ea2abbf021bfb87a309f5327d1a4c6a1194b13 [formerly 08ea2abbf021bfb87a309f5327d1a4c6a1194b13 [formerly 08ea2abbf021bfb87a309f5327d1a4c6a1194b13 [formerly d92109dfe94b5f5ef2417f4329014955960838fe [formerly 86a27dc9c3f44c2d73944c5800a903f685203d6f]]]]]
Former-commit-id: 40abc9ccceaa4b9b2bed7fd9ec1e864e8c0d05cd
Former-commit-id: 751b9c5ad3f138bc1ae45bbe29c50fa961cd4d84
Former-commit-id: a8fa161b502ebd5c658cd3f5932cdb7a32dffc60 [formerly 577f6d2adf59ad51ba034552da1f27b22ff5500b]
Former-commit-id: 072a4b0e0e6dc2658c1dc35b457b8b2e23c2ac69
Former-commit-id: b711d2867f649c789c550409d0b0e9d8312fb973
Former-commit-id: d3c1ef141f863ae3ddd9f31f1e2610428b701c09
Former-commit-id: 1b0a1b4805f826e6f5964edced98bd84fb15e445
Former-commit-id: 4ea1e704d54bdecab60ee58463642852672285e6
2018-10-12 07:10:45 +08:00
liyang
8bdcdcf12a no message
Former-commit-id: 33dbb5246eb1c76195908c60a4267997bf48c3ac [formerly 33dbb5246eb1c76195908c60a4267997bf48c3ac [formerly 33dbb5246eb1c76195908c60a4267997bf48c3ac [formerly 33dbb5246eb1c76195908c60a4267997bf48c3ac [formerly 7e3749104a3b9bf002ff4443731fa054bd2daa8d [formerly fb304ebf1a814d17c732be5141a9496835ad27ef]]]]]
Former-commit-id: 032ce71e0fece3eb585936d36f4261475be49237
Former-commit-id: 3d45913b8a557a16512fbcc98503ab667ac17f2c
Former-commit-id: ffdd24eb7784e1bf4f81185dfcd98b4900840cb1 [formerly 622633150ca71c03830dacd01f0e77fbfd08be5e]
Former-commit-id: e6a80912acb26ca21713516e3c6f4afdf5abf077
Former-commit-id: 12a0a80d23798a996c81a9efe138c393161ca9fc
Former-commit-id: b38753fe9ef650c203940edc162c32fff48a7676
Former-commit-id: ace21249def97c394f46b84e8704f2fabbde167e
Former-commit-id: 19c83f81a0e64499fcf7a3788cfc87304a610cef
2018-10-12 07:10:11 +08:00
liyang
f40a00f619 Merge branch 'hotfix/page'
Former-commit-id: cc6408a3d939531af88c3edd670dfbbfbdafd5fa [formerly cc6408a3d939531af88c3edd670dfbbfbdafd5fa [formerly cc6408a3d939531af88c3edd670dfbbfbdafd5fa [formerly cc6408a3d939531af88c3edd670dfbbfbdafd5fa [formerly ed684b2afa0d0cba89918aa8c24171434c982d97 [formerly 6f1730699f44c5bcc21122d55beae9c97541985b]]]]]
Former-commit-id: 8a2adae8924185c54e4b70d1f42b94614acfe0b6
Former-commit-id: 0e5a5a9f87023e8b4690844b000678965e16802f
Former-commit-id: bff7bcaac440a8151a2aef25c12e130a35e0ea51 [formerly 84131283053a90abddfd04edcbaf0331580824e0]
Former-commit-id: eb42a0de3ceba3eb16f25fb4c47a499858ccaead
Former-commit-id: ddd48ede47768c2ef1688a4c0b4067d93fa14d1b
Former-commit-id: a32535727c50dc9de185d7059bae8460348ed41a
Former-commit-id: 22711ba9ea778747f9ac1018e51fb650fbcbc8a5
Former-commit-id: d2d0d268f56ae55e298cea4eb667ca4d3c057474
2018-10-11 22:02:34 +08:00
liyang
b1f00ed726 Merge branch 'hotfix/page' into develop
Former-commit-id: 1678fd4d9f27ae232a8d6ce336567c1c08ddb8ae [formerly 1678fd4d9f27ae232a8d6ce336567c1c08ddb8ae [formerly 1678fd4d9f27ae232a8d6ce336567c1c08ddb8ae [formerly 1678fd4d9f27ae232a8d6ce336567c1c08ddb8ae [formerly db54af4fb10820f9de0e551f42d6f0c6c56ae35a [formerly fe50631d02c53628454fb5307a38b03afd25be72]]]]]
Former-commit-id: 74292978506f3cdbcef6dfd123a4bc8194099319
Former-commit-id: f9c3dfee12e7a5fcfd3dd9d26720a4b5db290760
Former-commit-id: 5a4ebc59b7418a73cf4e16bca192412be442af71 [formerly 4f648425c3026c7b4266746e069ad47b6556b465]
Former-commit-id: 99cd2d1da3766ca94ddbd3cab92da59ea92cf853
Former-commit-id: 3ed3c5e45656a3dc7a1f75877f2ba06f5f81bde4
Former-commit-id: b0b87e981c8bbcbb82f3a37fcc277a482aca0da9
Former-commit-id: a8a7218a60510186abd15b622d72b74e8c0556d9
Former-commit-id: d730a30170baebf0f5f9f73b458795317ee2bf24
2018-10-11 22:02:34 +08:00
liyang
9a71db1e9a 修改版本号
Former-commit-id: 81c18c13dc7e7d536030ed86fd61e97169e75b18 [formerly 91e7534633c4fe50cc77da933ca0f0f28023f390] [formerly 81c18c13dc7e7d536030ed86fd61e97169e75b18 [formerly 91e7534633c4fe50cc77da933ca0f0f28023f390] [formerly 81c18c13dc7e7d536030ed86fd61e97169e75b18 [formerly 91e7534633c4fe50cc77da933ca0f0f28023f390] [formerly 91e7534633c4fe50cc77da933ca0f0f28023f390 [formerly f8e59f0ecc0f7aa56214ff5b35701a056bac588b [formerly 3a3406ca479302a9ab3b3fc09f492a4671d4c2b9]]]]]
Former-commit-id: ad230e9793d0606fa52ccde66d335b9d261a82a1
Former-commit-id: e4dd106e54d4e8cbc7d6f5872e64e40d3ceb7882
Former-commit-id: 43e27e1f950ccc293ce7fba3a9d00a6f3875647b [formerly 7179d161626876b3511c377bd2825998390b3858]
Former-commit-id: 1184787e6ce40366072e716d52be16708af95ba8
Former-commit-id: 456206006320bda3d02f016fb12da8bea7e9aab8
Former-commit-id: 50e80936133369198caa9dc3967414c926017c4a
Former-commit-id: 032ad14d7e16d54e07a2e4517bb1e6cc5d2579ba
Former-commit-id: b17adac0a557190ea1b9aa5b2e6a1f7cd825fe56
2018-10-11 22:02:27 +08:00