liyang
|
3eb9b40cd3
|
Merge branch 'hotfix/cdn' into develop
Former-commit-id: 59a0e076eb2d23ee40ac033895965eb275d899a2 [formerly 59a0e076eb2d23ee40ac033895965eb275d899a2 [formerly 59a0e076eb2d23ee40ac033895965eb275d899a2 [formerly 59a0e076eb2d23ee40ac033895965eb275d899a2 [formerly 0a0284b74f5b027f9a6a03f32bb11f51e12012b2 [formerly 82ac38fd3804b9e1afe3e9e5611506e61a834f4c]]]]]
Former-commit-id: 3f476e9aced80dc1cbb83716a144d5fc9ff0a857
Former-commit-id: 3bc29dc8ae9384ea8143aaaf04de170bf49872fe
Former-commit-id: 045af7838986ef42c724c78a135e7a476916f000 [formerly f81478731f855924f898f778688817b78b0a69a0]
Former-commit-id: 80a4551946e7f1576fdc6ad6da84f229705d80e1
Former-commit-id: beacc44b35a0dfde767e24f3b8e69eabdb20fa64
Former-commit-id: 4301461cd97b9a52751c15e896fee9facfd83b69
Former-commit-id: ae7c921d275e850475c86666fe337883cb0cfa79
Former-commit-id: 7abb4010f6bfd7bda505160ed61d902b3da6bc6f
|
2018-10-23 13:51:57 +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
|
7556f52f65
|
Merge branch 'hotfix/v' into develop
Former-commit-id: 67905657aea4cafc72222001121bd8559e958304 [formerly d331b3c737c3f4d3cec471aa67e9174d0be49c45] [formerly 67905657aea4cafc72222001121bd8559e958304 [formerly d331b3c737c3f4d3cec471aa67e9174d0be49c45] [formerly 67905657aea4cafc72222001121bd8559e958304 [formerly d331b3c737c3f4d3cec471aa67e9174d0be49c45] [formerly d331b3c737c3f4d3cec471aa67e9174d0be49c45 [formerly da65065014e04de72686c9d643e9726abaca999d [formerly e82b5abc27f6bf319c78838440af94cf3c23b35d]]]]]
Former-commit-id: d5ee2c7d3370ddce77367367d79419549628a91c
Former-commit-id: 7802a5a1da82a9ee56283541044b207a36f6c8c7
Former-commit-id: 94e312960007c6f03bdde5965d10b1a0ea5927b2 [formerly 51921598151029b8ffde40a1ee4a5ab5b9e51529]
Former-commit-id: ad3cfb55b35e462cb975581b07b8c15531dca973
Former-commit-id: 4959e73aa580903595c3a583ab296fffba5a1fd2
Former-commit-id: 841a0516226a6f4792b311aba074c576f3d4fa8e
Former-commit-id: 82d8fefe96e599bf8823adac982082870dac6522
Former-commit-id: b32ac52d0645ef6298ac66aea05f499b95eb954f
|
2018-10-22 22:28:17 +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
|
b3880cffea
|
Merge branch 'hotfix/xlsx' into develop
Former-commit-id: 7797ae8804c8984bbf21d1a39450f5161f1a0b09 [formerly 7797ae8804c8984bbf21d1a39450f5161f1a0b09 [formerly 7797ae8804c8984bbf21d1a39450f5161f1a0b09 [formerly 7797ae8804c8984bbf21d1a39450f5161f1a0b09 [formerly 40a529d643b0e31127121a38458328117fd7c559 [formerly a658df1f1b614b74ffcee636e86e464a823e460d]]]]]
Former-commit-id: fb58c1fead416920a0eab0ee068c1d7debf5d9ed
Former-commit-id: 90e660bc4677c888c689923cc11c5788f455da9d
Former-commit-id: 5d015ee1554484f2e2a0f10c5643b7bb87f76dea [formerly 4064d53cac6e65dbb8051a0a23b1e1f81afb77fc]
Former-commit-id: 9e89e0dd2ff96468e7936c8e7f764a70101f1268
Former-commit-id: a8542daa09161a609b70605a164b39a770cc39da
Former-commit-id: ed85275926bd8f16e58e8613e6955fe5e9499a88
Former-commit-id: cfea533e672b208801a6fbc9e6e6983d1f05efca
Former-commit-id: 475c0afcdd0379f54a35974eab2275a902c69379
|
2018-10-22 22:04:35 +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 |
|
liyang
|
75d3f3ad1a
|
删除了跳板页面
将跳板页面的内容转移到了路由设置中
Former-commit-id: 98cb4aaba04e9d5abb2680528d1df3785c97d2f2 [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead] [formerly 98cb4aaba04e9d5abb2680528d1df3785c97d2f2 [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead] [formerly 98cb4aaba04e9d5abb2680528d1df3785c97d2f2 [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead] [formerly 44bfe2a0029bc750b066fd2a236ba0b29eafcead [formerly 328841e1f2ff4271049c0e4c2c77f604c7233332 [formerly 6c3b24af9ef2ec9aad6bf1fc831b16d4ebc231dd]]]]]
Former-commit-id: c153ece15eda3b413e055ac3ae8af347057db453
Former-commit-id: 3e0edf37e1e214be30efbfeff7e1f1eb3f8f51e5
Former-commit-id: 34f2ac943279797cb342e0fd2fe3ff06109921b1 [formerly 4c3598b0e74a65f4204655b3505cdf3c937f8a5a]
Former-commit-id: 4154c7ac3541715222ebecd2e5410f21d9aa4549
Former-commit-id: 99ce56f09a90866c95f9f10b3bec03b24c063bbc
Former-commit-id: c7b9c3c1a532582129dcaf86d0ac2b649bb253ae
Former-commit-id: 934dd2574d65647f2dda8513ab6b0407beb44abf
Former-commit-id: eb2e21a4aa92d66aa65bff40d02f0f3a33e1b6f4
|
2018-10-11 22:01:54 +08:00 |
|
liyang
|
df192bd249
|
Merge branch 'hotfix/v'
Former-commit-id: 260eb86c180bdee32d6dab69e846db930c7049fc [formerly 4c525dd3afef2891642363f76031c0f4892c1648] [formerly 260eb86c180bdee32d6dab69e846db930c7049fc [formerly 4c525dd3afef2891642363f76031c0f4892c1648] [formerly 260eb86c180bdee32d6dab69e846db930c7049fc [formerly 4c525dd3afef2891642363f76031c0f4892c1648] [formerly 4c525dd3afef2891642363f76031c0f4892c1648 [formerly 7be34c1f264033f09b0f800cd4a6f0292f9bc191 [formerly 93e5d06630a8e539aefa4ac686445f4125031f31]]]]]
Former-commit-id: b78320a0c157f1a9221ad5902095f5591a26518f
Former-commit-id: f8bc3dec52d3f4abb4b9a61546cfed942d372194
Former-commit-id: 289206c59f2d039a2476a44b078bc7d38bba3aad [formerly b13eefc697c3fc06afc2e84bc8aca2bff1cfad63]
Former-commit-id: 14a6bc45f888b2460568a28f920ff33c44558d9f
Former-commit-id: 90d72c72296e50c973515e23634e0d560c9181a4
Former-commit-id: 94b8a801291c79c6a976a444a58475ae7b96b67f
Former-commit-id: 89d0404fa4df5033640c8b0f1284d5464d06d012
Former-commit-id: aaf27b3cde89381ce82d7ff0b4807bec1650fde6
|
2018-09-29 15:12:48 +08:00 |
|
liyang
|
7cc3ac5425
|
Merge branch 'hotfix/v' into develop
Former-commit-id: 9732de6c30e818f0ad00e1c25059086a3ca8421c [formerly 9732de6c30e818f0ad00e1c25059086a3ca8421c [formerly 9732de6c30e818f0ad00e1c25059086a3ca8421c [formerly 9732de6c30e818f0ad00e1c25059086a3ca8421c [formerly 3a2429077d8a007e34dc953d2da4e043749457ca [formerly c70157b7c97685a47a498a14aa8c3b47fea564e7]]]]]
Former-commit-id: 0b7a45d7b6457342139f22eb483618428c13456d
Former-commit-id: e7f491cd29670c6a29286dc89c61e4dac152b551
Former-commit-id: 35e4c274b5da78c66a9bacce2dff5c603fc8e0bc [formerly f28794ae52b1f3352eb666d2f09cbf4ccb421c16]
Former-commit-id: 5d50b8f41deaff16940dc084562263175bfbec64
Former-commit-id: b9fea309032d1101dcbfbce9ffbd8d67a7c10291
Former-commit-id: 341249d05047d0042c4814335faf5ddbb8208a7b
Former-commit-id: fac6c4c630febb67fba9ed394e2fa5c7fa75e69d
Former-commit-id: c9c59e8bcc1c3b07fbb0c94d9a2288dbc88ba881
|
2018-09-29 15:12:48 +08:00 |
|
liyang
|
77f685ce5c
|
1.5.0
Former-commit-id: 02430ae0d16457e88e19b4658020972cfd83228f [formerly 02430ae0d16457e88e19b4658020972cfd83228f [formerly 02430ae0d16457e88e19b4658020972cfd83228f [formerly 02430ae0d16457e88e19b4658020972cfd83228f [formerly 1b12a4f8d986351d4bc707bfe4d35841ad98448f [formerly 6f075e356e37c291aaecf566813adf8f805c5ed5]]]]]
Former-commit-id: 14af424bd1437657cd12b844f15b6a3a69213f4e
Former-commit-id: 9819978da8fcda58f184aff369f2ab819b6bbe7b
Former-commit-id: 302910c49e94b7b52dd6b0f2184fcac8d315d55f [formerly 64bbfbeb3932542e2832d3d77b7a991d11241154]
Former-commit-id: 6b5a42c29102d2122ca7117abd4d075dbb9c8cd3
Former-commit-id: 05db1ae473b751997a741374378b75273c122162
Former-commit-id: 90336d37e6459dddbe9f4fcf033ce602456f81fc
Former-commit-id: 695ea5ab588aab474bf1d4f2c35f71393962a3ad
Former-commit-id: d0b0976b8b954c07507ead1f073027952ddfe236
|
2018-09-29 15:12:40 +08:00 |
|
Lu Chaohai
|
9af718c651
|
Merge branch 'develop' of https://github.com/d2-projects/d2-admin into develop
Former-commit-id: 72a21b4a2dbe255bbafb047ace2b58deead9ac45 [formerly 72a21b4a2dbe255bbafb047ace2b58deead9ac45 [formerly 72a21b4a2dbe255bbafb047ace2b58deead9ac45 [formerly 72a21b4a2dbe255bbafb047ace2b58deead9ac45 [formerly 87d9e7fcbfc6082cbeaaaa8ca27fda1cdc62f21b [formerly 0e37b994bbc29bedcccad347e6fb2c1cb615eba4]]]]]
Former-commit-id: 8cd9a54da3d640d0c659a769ca03a10d8c22ffbf
Former-commit-id: 1a62a3e203f76b1a8b5b3d6bd6425216409bf29d
Former-commit-id: ce908180ed2f364f8f025bdeace0f8c73bd5e0c4 [formerly 77a128308141d2e25d0f3d2ff23f4173d0a54228]
Former-commit-id: c900d987daf7448ffdd5f3e788ef6529d3527fe1
Former-commit-id: 2d0dce3592057efaf48b55b8ff5df97f09eb4a99
Former-commit-id: d3264169085a7230a18cf277cefc9c3112626ba1
Former-commit-id: f17bed94dbe6b8bd5d402bcaa8e3b3cdf171a58f
Former-commit-id: afb6e622ecaec0e5c517c34828311070c38796eb
|
2018-09-25 11:10:59 +08:00 |
|
Lu Chaohai
|
3e2bde7ad9
|
修复 顶部菜单滚动的一个bug
Former-commit-id: a073a125015cbb0add924e5c5bc9ac3197bc87b2 [formerly a073a125015cbb0add924e5c5bc9ac3197bc87b2 [formerly a073a125015cbb0add924e5c5bc9ac3197bc87b2 [formerly a073a125015cbb0add924e5c5bc9ac3197bc87b2 [formerly 66daa14037aec6e43c6ba88af97de64b4a50b2d3 [formerly 2114dfc43f5ad6986a769742ab26266e54cb0b6c]]]]]
Former-commit-id: 183f171b097c28f166e251331b9e514d9028f78d
Former-commit-id: 92682d28b258c607affc03588dcacf68f47be925
Former-commit-id: 2f9faec630870376eb3df7e23db37e15afed77ad [formerly 930b7c4c442af8a61884acdef83e730aa9585dec]
Former-commit-id: ea2ec0ac5bf3f9ea05b0deae96f3bf52433b6407
Former-commit-id: 99cc6af72d213c54666e94da7e97969a04c8cdf6
Former-commit-id: 239aba85af1497940905675ab224b7679389cada
Former-commit-id: 8887f62b06b3cd4e67f7749e23522fe49f77893f
Former-commit-id: 248cdd954e099a4c910894e75a0f44444ab2ae10
|
2018-09-25 11:10:45 +08:00 |
|
孙昊翔
|
aa2c3fcf2b
|
Merge tag 'd2_crud_example' into develop
no message
Former-commit-id: cde740aa77dcc23e8bb123754abe5511d55593f7 [formerly a0fd060bc745d8b3721e147ee184daef1b30ebf9] [formerly cde740aa77dcc23e8bb123754abe5511d55593f7 [formerly a0fd060bc745d8b3721e147ee184daef1b30ebf9] [formerly cde740aa77dcc23e8bb123754abe5511d55593f7 [formerly a0fd060bc745d8b3721e147ee184daef1b30ebf9] [formerly a0fd060bc745d8b3721e147ee184daef1b30ebf9 [formerly eeb3972c705967609aa6a54bb7be0a4094f84aac [formerly 43edd00fd6fee2ba167cc95ea6177f527d0e9807]]]]]
Former-commit-id: 79b54c1139435a0e6696a958b080e4fd48e84c0b
Former-commit-id: 7a18c80dce9a1a3279d4f43671b5c8934467d52e
Former-commit-id: f296768d0f9f2c5ec300ce76798438b604e1fd5e [formerly 9aef4e33157be230b9683f5bb117d95c88b61053]
Former-commit-id: aedd69f20430dbce289f3acf53b2b38fbc64af76
Former-commit-id: e7e2b8126bc602691667796cd650372799062e08
Former-commit-id: 991c47d505e44af3ae1071bff300950b2ddd04c4
Former-commit-id: 0dbea0524469ca39014e6d94b4909c0511d853d1
Former-commit-id: a412f380458d17ac47eaebaafeb24b8c087efc7e
|
2018-09-21 19:32:12 +08:00 |
|
孙昊翔
|
e54e135fe2
|
Merge branch 'hotfix/d2_crud_example'
Former-commit-id: e5d114a5c7382d8ba36bb6b7572a1fb7b9034089 [formerly 85f2e1612aa067e93679e496b580c0c5087cb523] [formerly e5d114a5c7382d8ba36bb6b7572a1fb7b9034089 [formerly 85f2e1612aa067e93679e496b580c0c5087cb523] [formerly e5d114a5c7382d8ba36bb6b7572a1fb7b9034089 [formerly 85f2e1612aa067e93679e496b580c0c5087cb523] [formerly 85f2e1612aa067e93679e496b580c0c5087cb523 [formerly 54b4dd37e7cb11b18884f62e6d472f675fa56094 [formerly 874cc854461953812202adac9ba945143765877e]]]]]
Former-commit-id: a075e360d211406cfff0d666a51c55089aac93e1
Former-commit-id: bc46a0fc5fca5333fcf54dc6749b1350a0126105
Former-commit-id: c1f8179917fd25e05c9e1393651dfeb74f996fe9 [formerly 05c26e3f3da189f22b05f2e38c39f599507c6e22]
Former-commit-id: bbfc91d35fe18a5111634e1a9912c9a4d154d332
Former-commit-id: 03b7d2116f3b569ea2612b53a3fbd7c6a334f330
Former-commit-id: 4727aee57afd1392f404d936471b96ac567f3b25
Former-commit-id: 4e88bef44098b8086370b5298eaad686f05ffee8
Former-commit-id: fc0bf068107c3f7ac0d5cbef14e5131590bfbd82
|
2018-09-21 19:32:12 +08:00 |
|
孙昊翔
|
de57257fb5
|
demo17添加新增按钮
Former-commit-id: 34d96627b919710b64e803a5e5ab68fe2235481d [formerly 34d96627b919710b64e803a5e5ab68fe2235481d [formerly 34d96627b919710b64e803a5e5ab68fe2235481d [formerly 34d96627b919710b64e803a5e5ab68fe2235481d [formerly 79475700095dccfe6def593052c8ec3546e03be3 [formerly bb8bc03ef1b92d3c3d273ab63f946950f6b93d31]]]]]
Former-commit-id: f0c50fb983eccde70c8c8aac36ea5758b0ff8260
Former-commit-id: 65958e5538546a9f5e3405611ee84a856a0c5786
Former-commit-id: 3ded50c5e6d12dae4296ee1803eec02f79d18494 [formerly 5b107d00a4b57dbbe3dadf968000725c3d9a1365]
Former-commit-id: 9544e7d44ff5aff4216e5ab453ecbb75c6ac55ca
Former-commit-id: e315194dbf92c7be8b9dcdede5c7396c073b9557
Former-commit-id: f5c2a82f27dc4913e43cfd700d1fae5b2437622c
Former-commit-id: b3a6c6aed49cde8783c3fe3266b9099343ffebea
Former-commit-id: de0594b2161cb2b0f4b65c51899820098b2abee1
|
2018-09-21 19:31:38 +08:00 |
|
liyang
|
df44094c62
|
Merge remote-tracking branch 'origin/develop'
Former-commit-id: b0d16ce1368ab5c2beb4a1c8ddfa5d40cbba1a6a [formerly b0d16ce1368ab5c2beb4a1c8ddfa5d40cbba1a6a [formerly b0d16ce1368ab5c2beb4a1c8ddfa5d40cbba1a6a [formerly b0d16ce1368ab5c2beb4a1c8ddfa5d40cbba1a6a [formerly 62c39f26b9794f01538e0a7108a010d32184ec82 [formerly 5da7b21f0221f09dc2c2497be8bca09a0164d87b]]]]]
Former-commit-id: 77eea74506bebdbf1f9bdb4f8f44d82bbfc07b42
Former-commit-id: bc0a739d921901a3cf01798aa0707603192dfb01
Former-commit-id: 345c89bc481dee865a218b71479b56b863303da8 [formerly 0a603696029ba695594352ce9a016efa52b0687c]
Former-commit-id: d1848e0ecf1441482d281a74cfc26e6100fce06c
Former-commit-id: e8621e6d491c8da3f45ac735bd8cfa178851e963
Former-commit-id: 1756ad166ddfecabdf3df79a9b4e91c252bd4398
Former-commit-id: 84837fa5b202f63cfa966da5281774dc9c4fe8ca
Former-commit-id: f87b3e76ead59267dc22671661a761e0b3122ecb
|
2018-09-20 22:23:23 +08:00 |
|
liyang
|
10b60ebe8e
|
update
Former-commit-id: 1127325be602073cd162812708cb6147e65d9e93 [formerly 1127325be602073cd162812708cb6147e65d9e93 [formerly 1127325be602073cd162812708cb6147e65d9e93 [formerly 1127325be602073cd162812708cb6147e65d9e93 [formerly c9d698f9a78bdcfd952266079fe03c4c99fb0275 [formerly c78dd42f6681c2d0c76a6b147bae7799707f43d9]]]]]
Former-commit-id: a20edd4e4048170e34e396d4d122f543f0bb1f88
Former-commit-id: 817a416979bd5270756cd055d6ac228bd8417c41
Former-commit-id: 54c5e0c015dce31757d5263bc13e7e60d423ab12 [formerly d085917724491c1a819f1b8bdb6c2bc91c162f03]
Former-commit-id: 79ada3a8bddd4e373203ea68467b4455f3ded380
Former-commit-id: 241d48c2ffea4118e1d885f73454b4f1351b81e3
Former-commit-id: 0a30cdf9e9d7cde22ffb8cb82e97bcaf5642c83e
Former-commit-id: e8381ce4cdae3b58a3d9883e82bd8443cee21723
Former-commit-id: 58ef498c289eb4b957e63eb48e66b8a995fc98f7
|
2018-09-20 22:21:45 +08:00 |
|
liyang
|
a8ebf27911
|
Merge branch 'hotfix/addEventListener' into develop
Former-commit-id: 5fcb1ecd497bf704b6d399bd8c482389fb3ce730 [formerly 5fcb1ecd497bf704b6d399bd8c482389fb3ce730 [formerly 5fcb1ecd497bf704b6d399bd8c482389fb3ce730 [formerly 5fcb1ecd497bf704b6d399bd8c482389fb3ce730 [formerly fdb86e9b61a2f5dc8a8d5ae740c0d877d7b348bc [formerly b03dca12c7bc0618bfe993a8f5f90a1895a0d846]]]]]
Former-commit-id: dcd695d8f787f13e4e90aa61e72cd40361e73f7f
Former-commit-id: 5482d0aeed3a59b3f3f4a7c09a46b6f929f2a074
Former-commit-id: 415767464c9ed461bada45ba3065629e3efe55c5 [formerly 535d2a56907ffeb2b3e88e467ed034f71487c8d6]
Former-commit-id: cdb6b96bd912c662e24e3ac3fdb27851370a7a5b
Former-commit-id: 81bb54861218b39d1fd7440de956770ec28cf1bb
Former-commit-id: ae0384aa6638d7e488c04e0f439ccb7d0198c63a
Former-commit-id: 10816c166fc765bf932bc4bc98e3b875d7396a80
Former-commit-id: f6cc971baada90fa1bbfa2d0307cf452877a719f
|
2018-09-19 16:00:08 +08:00 |
|
liyang
|
7cb8e91f39
|
Merge branch 'hotfix/addEventListener'
Former-commit-id: af59e377b5a056f141a36d8c6fb3e52d9b36c327 [formerly af59e377b5a056f141a36d8c6fb3e52d9b36c327 [formerly af59e377b5a056f141a36d8c6fb3e52d9b36c327 [formerly af59e377b5a056f141a36d8c6fb3e52d9b36c327 [formerly 6570a63a861f97717c3bdb8233506ddde732b279 [formerly b2a703c4375c13ec76635c235777a1fe3fdf8031]]]]]
Former-commit-id: 70ee8c805423278ed5ac1788a76cb08c96e024c4
Former-commit-id: 0b69b49a5c7afb94858fbc0f62f3410bf97809ef
Former-commit-id: df7ecd62d3044fb372e893052ee616ba1e6e9e7d [formerly 439c32c8bb580e6704d5ceef36c6a9eca39f931d]
Former-commit-id: 889840260e4b92e6a4621dd6f09d9d5469a80aed
Former-commit-id: 183e11b31ba7c1da6b5a40dbc3bd798efbcd5ef0
Former-commit-id: f273c972a8c4b470205e7ce017dfac2bf4cacdda
Former-commit-id: 5bfcc89d1c844c2d2767827c4da43395857ecdc7
Former-commit-id: 97331f0b0090fa0da8f5c39a311434bb3904c0f6
|
2018-09-19 16:00:08 +08:00 |
|
liyang
|
5dd20453e2
|
no message
Former-commit-id: f48834fbf8a3dd0a175694f722797153cd7268d6 [formerly f48834fbf8a3dd0a175694f722797153cd7268d6 [formerly f48834fbf8a3dd0a175694f722797153cd7268d6 [formerly f48834fbf8a3dd0a175694f722797153cd7268d6 [formerly 257001ecfa6474a3768a67ea0f134062f7f14394 [formerly da3a620cf3099acab4993873244c7f36d3340bae]]]]]
Former-commit-id: 5eca38c66b440f042bcedd69b5cfa3e522b52914
Former-commit-id: f5e1b9c1f3cb1681d39317d0111f894c854d1859
Former-commit-id: 0e1470154ae7e31807c8c99a4143837b8864dd2f [formerly e3f2ff894738e9a6b2f39a32ba1260ec19eb9a65]
Former-commit-id: 39f38e5b07abd827e112e1bd338dbb7a54d5358f
Former-commit-id: 2efb6a3e1284d36ab66457f61290199f1d1e610b
Former-commit-id: 797ccc66958f7c688d0e8411ee8f7e75f7ec7b18
Former-commit-id: 94ece070f41cf36fcf05b4096f1855bec34c49f2
Former-commit-id: 0ad1f1b3ae30bbe002e4d491782e1c62b396bf88
|
2018-09-19 15:59:59 +08:00 |
|
liyang
|
b82a7f1401
|
Merge branch 'hotfix/v' into develop
Former-commit-id: c065fc336d26f6816ceedb18e8851f5e6bbbb167 [formerly c065fc336d26f6816ceedb18e8851f5e6bbbb167 [formerly c065fc336d26f6816ceedb18e8851f5e6bbbb167 [formerly c065fc336d26f6816ceedb18e8851f5e6bbbb167 [formerly 225dd8f36431cd504a308907053b4255b123895e [formerly e1ff337d0cbe208c0ed24d8339c3433d459790da]]]]]
Former-commit-id: a10b3f1e895d609e0d2067ca7eec0e993796b2c1
Former-commit-id: 256d8b1a8b071733669b1ed662372123df4e93ba
Former-commit-id: af0277ab0fabb7ff648c75e89bd437794a74822c [formerly 3d578f5b9ea818cd95f20ede7e40259ca2e6f87c]
Former-commit-id: 762096d96cc9ee50117ce2bb9cd8dc0714a8b434
Former-commit-id: d7b2b74f0a35d07466dc55a3d4a0df43bbb52725
Former-commit-id: c11829629f4dc972e82f38af7eff36be2f3781c6
Former-commit-id: a4faccf7a580829d3648cd2b2267a8ec9f6b1ff2
Former-commit-id: fb7b760ac0658f97890f14e24f5edf16558933e9
|
2018-09-19 15:19:53 +08:00 |
|
liyang
|
f9a4fc80cc
|
Merge branch 'hotfix/v'
Former-commit-id: bd730f117f0edc3ed724928511a485f1ade74f3d [formerly bd730f117f0edc3ed724928511a485f1ade74f3d [formerly bd730f117f0edc3ed724928511a485f1ade74f3d [formerly bd730f117f0edc3ed724928511a485f1ade74f3d [formerly 4d763902c56de85ba49d5939eff6d32f3d9fcfe8 [formerly e95bb828cf8dace43654ded54b9e6ba70b683504]]]]]
Former-commit-id: 8750621d1fd1a59162555ec0eca943f5aeba512a
Former-commit-id: 4f564291e5681ef10eaeb948f7091683c6cec966
Former-commit-id: a76b41d6942092fd660623ea41ea123f3b5e3164 [formerly 51c02a14c666a299f309543b5886b8fa5d282d9d]
Former-commit-id: e21ce58639bb5191d68f46f663eec02e5980b2bd
Former-commit-id: 80e874f216159f280f47e3e8baef200ce6c70414
Former-commit-id: 610e192a6eb33ea09b15db27b3aa5e94f7fb513e
Former-commit-id: e511c397441b68bbddc4c984036c30d7dd83151f
Former-commit-id: b0b892e9b110a4960823608a10bb0f45be725a4a
|
2018-09-19 15:19:53 +08:00 |
|
liyang
|
0542c372e7
|
update
Former-commit-id: 02701d6e5368f41e78d5dbaabe046636e3bc3890 [formerly 02701d6e5368f41e78d5dbaabe046636e3bc3890 [formerly 02701d6e5368f41e78d5dbaabe046636e3bc3890 [formerly 02701d6e5368f41e78d5dbaabe046636e3bc3890 [formerly bd9113dc733a38fd61548b20f72215893a926e32 [formerly b81ce79d9b68b3b6ece5ff26de69b22a0378c37a]]]]]
Former-commit-id: 17bacc5f359a49d6799d22019e0eee23c0dab307
Former-commit-id: 32cfb9edd3400710109744c28f36f63a6be33176
Former-commit-id: cb3c10732f6545d9f8c638a2034753973dfe4118 [formerly 76b81d60ef175671964800794dbc6df486aa1726]
Former-commit-id: 9928951cc4d5e8d078f95c773f76a5426c0c2060
Former-commit-id: 2dad21bb82ea6fa87b4ffb9db7a0eb2e300e839d
Former-commit-id: 8d90e33c0a67e78688e16e1514b225b16652f0aa
Former-commit-id: 2fa2b8ce618410a1a29550f096c953561131362d
Former-commit-id: 1ba51891d6b43887f0a28b8ba9c5857159e6989c
|
2018-09-19 15:19:45 +08:00 |
|
liyang
|
95e658f633
|
Merge remote-tracking branch 'origin/develop'
Former-commit-id: 40de5670086f919d0fc6f1ab97531500a0ae9c04 [formerly 40de5670086f919d0fc6f1ab97531500a0ae9c04 [formerly 40de5670086f919d0fc6f1ab97531500a0ae9c04 [formerly 40de5670086f919d0fc6f1ab97531500a0ae9c04 [formerly f59557b824aee23363b68b37a6271152151a7b74 [formerly 52d66a3731c11c06f0cb53fa93c5a927e1bf3fdd]]]]]
Former-commit-id: 58d9709804df248d44178837cd01290dfffc0441
Former-commit-id: 4af42d6d13c10a32f1542ebf26631a092f397f76
Former-commit-id: b86494992d15f3eb485dc8c8e88f3c3260d8b9d4 [formerly 1a508b211a083fe2c753c8e8774033b4e48eac43]
Former-commit-id: 2b8f6818085483e1a7b3f07de0773c280eb4319f
Former-commit-id: a427ada0c713ab562bdf397aff6fa8ee178ef02f
Former-commit-id: 41d23f5599f22a8aad518b2fad555269d3cab2a2
Former-commit-id: f704e294928a177d1fce240487d0466c86f18949
Former-commit-id: 1b81075c354dca83e9a9726d57704d234ae1dec0
|
2018-09-19 15:18:38 +08:00 |
|
liyang
|
ce1ecb5ab5
|
Merge branch 'feature/headermenu-scroll' into develop
Former-commit-id: d2a29601bbce9559be7b016b5f1275cc2cd031ea [formerly d2a29601bbce9559be7b016b5f1275cc2cd031ea [formerly d2a29601bbce9559be7b016b5f1275cc2cd031ea [formerly d2a29601bbce9559be7b016b5f1275cc2cd031ea [formerly db12e38c06a3a458a779bf207f6e69644e8d472c [formerly 26aab1c943ca70fa3f0848e99bb51370079df053]]]]]
Former-commit-id: 45e961ff8fd0a6fb6284e04d5d0f51a1af52afd3
Former-commit-id: bcc54f9eb11678b08d64355cad18fc5b2a63d265
Former-commit-id: ac710eb0fa53a347037eed876f0df5b1fdcc887d [formerly 721a336c500bf0c9b4f018f2ee9ac07e1ec42ec5]
Former-commit-id: 463f549ddffad87c13ebc6bd645a9693861d5a4e
Former-commit-id: 8f79135d1d6095db4c9241866cadb521ce113487
Former-commit-id: cdbb290544ca7beff658b2eedbabed200e37a322
Former-commit-id: 0300b36e8275aa09d12836759ec4aa7e1e80e7da
Former-commit-id: dce7e1b1d5bdce4211277ff48ee27fe3658e9fe9
|
2018-09-19 15:17:10 +08:00 |
|
liyang
|
cc524035ec
|
修改样式
Former-commit-id: d30826af20bd7e79a8f0276cde532c2c2e2c115b [formerly 216f197dd5724f8b53dd17305817cdba13fefdef] [formerly d30826af20bd7e79a8f0276cde532c2c2e2c115b [formerly 216f197dd5724f8b53dd17305817cdba13fefdef] [formerly d30826af20bd7e79a8f0276cde532c2c2e2c115b [formerly 216f197dd5724f8b53dd17305817cdba13fefdef] [formerly 216f197dd5724f8b53dd17305817cdba13fefdef [formerly e021295fabe3798737bc267bab2875af1788a8d3 [formerly 5dc00107272218a8e490ed792847b1b44587e551]]]]]
Former-commit-id: 40493cf718ee3efd124ed096c446631d5f9da5d4
Former-commit-id: 10d1e5dd096227d644a1231196d42d213f1b801f
Former-commit-id: 43fdd834622256ed04f9ae2f8382f4488f8c1222 [formerly d9f9f7cf59ae621438afc7ef82121a72066a4e1e]
Former-commit-id: cfac13dc4110999c71d83be1c6b9a7dfa4595719
Former-commit-id: 8cf63db9d880a277446d3c1795ec51a4af223024
Former-commit-id: 9af99bd48bbfe6dd784db17388505ff1888e1c52
Former-commit-id: 00b426bb14a99716d3f06ebbde1c7c4c6b42b834
Former-commit-id: 345b95e833a29e552ad68a41accd4aef8e39c600
|
2018-09-19 15:16:56 +08:00 |
|
Lu Chaohai
|
152c71d39d
|
Merge branch 'develop' into feature/headermenu-scroll
Former-commit-id: 82039d00173295785498485193767faa85975db9 [formerly 82039d00173295785498485193767faa85975db9 [formerly 82039d00173295785498485193767faa85975db9 [formerly 82039d00173295785498485193767faa85975db9 [formerly f2f6907eead2dc347e9f960cd22214905b9d3ae2 [formerly 941bad68f597ae2073569e5f77004e9fe32e5237]]]]]
Former-commit-id: ddca9a7423317cc209e97412791b001a14d4e077
Former-commit-id: 2e61f8586ce996397bf50b8e83dbff48badc1fc8
Former-commit-id: b25ec95ca475a12639e54cb33ad2422432b4c121 [formerly fcc94fcb2e8ed5b3c7f24911c0279d3230f812cb]
Former-commit-id: 037705c17d588cd319db4d26c214bb3a48829458
Former-commit-id: 309a1eabb1112f116c06743bee2b391913cf4094
Former-commit-id: cf9f50fbdbafbd26f5bb81e7920836f6bb13eea7
Former-commit-id: c744fb3031977e93baa48604fe33c449f0e32471
Former-commit-id: fc30fe9f534928e493bfe637ffb7ea3c6c38c662
|
2018-09-19 11:19:27 +08:00 |
|
Lu Chaohai
|
3639afb511
|
新增菜单溢出滑动模块
Former-commit-id: 532709fa1a5511922eedc0d13bfed69d162e852f [formerly 532709fa1a5511922eedc0d13bfed69d162e852f [formerly 532709fa1a5511922eedc0d13bfed69d162e852f [formerly 532709fa1a5511922eedc0d13bfed69d162e852f [formerly f57575206fac486e57778c5ec91d500214ad3b27 [formerly d1aad9533b98e643188d037d0e6930f1f27d9c51]]]]]
Former-commit-id: 45a4b69ca308f0b51ea9a914536919e17ab6923b
Former-commit-id: 0734a857ac8c807713183527daa06ba849521a6a
Former-commit-id: 2b0f3d1b0a9e8532286633458cebb7f01f5dc233 [formerly 03eeb7848f8dbedab0da78ad773aa00d48ee2298]
Former-commit-id: 86fdf964739a469c11d0d1774e8ed286aa99d7ab
Former-commit-id: 5cd3b8a1919240c6502ad6510a07cd8052c54ad9
Former-commit-id: d71609fb4d80126f2d836017cc87b415c2e67dbc
Former-commit-id: 02738477cd3bb4f0c6435d780769e6fab7111d0d
Former-commit-id: df6bc33556ae3db3a473017b97dd2e4482ee41ee
|
2018-09-19 11:16:49 +08:00 |
|
liyang
|
8c7e95c075
|
Merge remote-tracking branch 'origin/develop'
Former-commit-id: 86a318d4dad8519b58321602de578639a951ba16 [formerly c801253482d6a74b316cffc808beb1c594a4916a] [formerly 86a318d4dad8519b58321602de578639a951ba16 [formerly c801253482d6a74b316cffc808beb1c594a4916a] [formerly 86a318d4dad8519b58321602de578639a951ba16 [formerly c801253482d6a74b316cffc808beb1c594a4916a] [formerly c801253482d6a74b316cffc808beb1c594a4916a [formerly 4481a2633c24941ee1a49112d0a671e3910ccd75 [formerly 22e0a759bdea9e9e4fe7a50cb72fb9427a112595]]]]]
Former-commit-id: 404fb2bc0ac72617255d763cf0e79f3c8bb75d22
Former-commit-id: af69ee921db37fe35f1e983cb9c81b0a33f04eae
Former-commit-id: 07cdd7cf684c81b4a1b41ec0b186afe1b2ddadae [formerly 2c36d5440edb9d11a798f3e87cffb8f1d6459c0a]
Former-commit-id: 303635dafc4b4b02dab144a2f6f293aed6f4e664
Former-commit-id: 423c98a6553fe1e9674539899dfc3f218c92ac55
Former-commit-id: 0dccc5084f39e92950f9343f41594d322eeacb90
Former-commit-id: d5785094ea30d1cf15d7b94a81a4e5447297a875
Former-commit-id: d58b4ec6c677b03e8c9ef7752a6cceb4f87a26f5
|
2018-09-19 11:12:11 +08:00 |
|
孙昊翔
|
8e193be379
|
Merge branch 'feature/d2_crud_example' into develop
Former-commit-id: 977e785d408f84fe7b5c940aa12c10c0a669c13e [formerly 977e785d408f84fe7b5c940aa12c10c0a669c13e [formerly 977e785d408f84fe7b5c940aa12c10c0a669c13e [formerly 977e785d408f84fe7b5c940aa12c10c0a669c13e [formerly 7308348c3f5d7fc8e64bdc4d4bca076e129aa46a [formerly b1a8d2d276cb41ff7fc0b7c9561689d80ee36b25]]]]]
Former-commit-id: 8c38123e3ef88f2a46e8cce8bc10b14b4a7f7465
Former-commit-id: 48149c49f02448adee31e176aa90302f2503a07b
Former-commit-id: 1c0173808f005ad151d23efdcc6d09d80df9d270 [formerly 7ced170c5722087a323f660780317f6efc6f1ab1]
Former-commit-id: 912e3c1e4bf31df040c09c609f392d45fba20dac
Former-commit-id: aa5cb5b39542e25c3313b1d8fdd11b706f919814
Former-commit-id: 03ac260e6ce673fe953f9584fbc0e558f487a39e
Former-commit-id: 2f4b4a7cea4f39d83bb12debcd2de488af142642
Former-commit-id: e20912e851011e9262093804d1f50e9d9ff844b4
|
2018-09-19 10:59:38 +08:00 |
|
孙昊翔
|
4aaab112c6
|
crud example
Former-commit-id: e345e832b7f55adfa312e0972693939953150e46 [formerly e345e832b7f55adfa312e0972693939953150e46 [formerly e345e832b7f55adfa312e0972693939953150e46 [formerly e345e832b7f55adfa312e0972693939953150e46 [formerly b836828ea96a2163653f09cfd4c39c1fe537b4ac [formerly 030702be43d00a35d004f13dff3bb74dd089f14a]]]]]
Former-commit-id: 5c0961245ea5c8d68bc8a5b647c251340e47c98e
Former-commit-id: 7c0668c675d4339929de35632a278bb2c7c1e62d
Former-commit-id: 75cef2b779bafae654cbd5044cc5eca8eceec67c [formerly 07c3860026c0a560111de35fcf6546dcd0fcd27d]
Former-commit-id: 39d1e5aecd1c0fb8140d3bb348457834a69aa27f
Former-commit-id: d4802ee50b46b8747a9431b60b07016ad8c5c900
Former-commit-id: 5996d6cc294f4232189f181b2b75eeafb11c7eb6
Former-commit-id: 50b5c8a0b27073ab09fa4bdde677c0a249a33a7c
Former-commit-id: 09c6958edf70626c1f1f48b683ca54dcd8131c40
|
2018-09-19 10:58:28 +08:00 |
|
liyang
|
9c48c30530
|
Merge branch 'hotfix/todo'
Former-commit-id: aebabe6f4426390fe3859fd9796a56c1b6656896 [formerly aebabe6f4426390fe3859fd9796a56c1b6656896 [formerly aebabe6f4426390fe3859fd9796a56c1b6656896 [formerly aebabe6f4426390fe3859fd9796a56c1b6656896 [formerly d73735c9304f931cf0f34c5ec4b927867ec22d6c [formerly 1d0cde273c735546e97276ff1b99560c44675b97]]]]]
Former-commit-id: a2842c9405a3e77c026bf60fc58b94a3bd99fe8d
Former-commit-id: dbed3fcc9c5a2bdcae01397fe08ce9f0c8dce00c
Former-commit-id: c1741514bc59420cf40168fef26c99defd938d35 [formerly 5222192ea1e77f420a9861157fb7b9314bcec510]
Former-commit-id: 07516b79ba63a37f1497e908254a6ae26f6215f1
Former-commit-id: f440164c0dfff6235bbd2a0525a770fe15dce2d5
Former-commit-id: cd97b1d4cc6747bfa46fd508831420b46eaa5f9a
Former-commit-id: cabb2f61db24a82395bb7fa3e354b1262f913a2e
Former-commit-id: d6d4d95fab5bc48ac122ea8a587e17bcd53f4ab4
|
2018-09-19 10:43:18 +08:00 |
|