Commit Graph
100 Commits
Author SHA1 Message Date
liyang b0acc2edd9 Merge branch 'hotfix/错词' into develop
Former-commit-id: 8373c73980b8531d2e278333d05b055b0f31b375
2019-01-08 14:54:27 +08:00
liyang 5569648918 errorCreate
Former-commit-id: ae769a84dc297376e8db7264c8786f3fa0719bcb
2019-01-08 14:54:21 +08:00
李杨 6cd17e4a4f Merge pull request #11 from sunyongmofang/work
将requiresAuth修改为auth

Former-commit-id: c5956775c6f70ee742c6c8301fe1b3108752295e
2019-01-08 14:27:07 +08:00
liyang ebe3f1ac08 Merge branch 'develop'
Former-commit-id: f25e65fa315b9432e262f6c93e93931c7fee9689
2018-12-26 13:42:21 +08:00
liyang 7dbae4cee5 1.6.10
Former-commit-id: 1d694e8eee0b02d33eac0749afc5293e88f8a422
2018-12-26 13:42:13 +08:00
liyang 8c7c731a6a Merge branch 'hotfix/issues/149'
Former-commit-id: 09ce8b807a17e8fa60e4b96dffa0d71feb1bc348
2018-12-26 13:38:51 +08:00
liyang 69ca7bc3db Merge branch 'hotfix/issues/149' into develop
Former-commit-id: ea870d8fdf02152f13650cbd071e8d9ee9bef613
2018-12-26 13:38:51 +08:00
liyang 9fbfd26dcc fixed
Former-commit-id: 288c6b756cea6c92c512f59acc115b6bb4b52101
2018-12-26 13:38:40 +08:00
liyang 8b1b0954c6 Merge branch 'hotfix/12-16'
Former-commit-id: a24414bc5eb7e16004e918424d8c2fcf434779c1
2018-12-16 20:10:06 +08:00
liyang c0aeefb896 Merge branch 'hotfix/12-16' into develop
Former-commit-id: 2eb080481bc745eaf55f8136b72f503ed1c2fffd
2018-12-16 20:10:06 +08:00
liyang bf170bdb39 no message
Former-commit-id: 487e22a0c9bf5da4474f9449ce95070e9a4ed727
2018-12-16 20:09:57 +08:00
liyang 9e12e91c38 clean
Former-commit-id: 6d7a4adb3f160ed8ecc06ea9b3f566bffdcc086b
2018-12-16 19:44:44 +08:00
李杨 55ea4dc64c Merge pull request #7 from imageslr/patch-1
fix: 调用next(...)重定向不会触发router.afterEach钩子
Former-commit-id: d5cca9eae0353df214800d5fcf71ec8c6109d893
2018-11-20 16:38:19 +08:00
liyang 10cc910729 Merge branch 'hotfix/1.5.9' into develop
Former-commit-id: 52189066a5de49a89a1bd2f9f6de5590793528e2
2018-11-08 12:50:37 +08:00
liyang f719225b5c Merge branch 'hotfix/1.5.9'
Former-commit-id: efcf73f956546f39764c3ee835a4a5c70d5bd8a0
2018-11-08 12:50:37 +08:00
liyang e0207020ab update
Former-commit-id: bf59905ab0fa0ac6ea0cd791e75068604601c64d
2018-11-08 12:50:28 +08:00
liyang 6571c38c6b Merge branch 'hotfix/1.5.8' into develop
Former-commit-id: 2fc2f5a4423ce10faa36c023136b5eff2abe0848
2018-11-07 15:19:42 +08:00
liyang 9665d32061 Merge branch 'hotfix/1.5.8'
Former-commit-id: 2ea74474a2abf7d9243ff486d977d58087fa928f
2018-11-07 15:19:42 +08:00
liyang e66c81d32d update
Former-commit-id: e45a95c1f373e6f4d4ee2720c8a4e48dcc9c2852
2018-11-07 15:19:35 +08:00
liyang 3e79a5750e Merge branch 'hotfix/1.5.7' into develop
Former-commit-id: c9f968ce794e9a68134ea58e3ed858f86d4a9068
2018-11-06 23:30:02 +08:00
liyang c27d250af1 Merge branch 'hotfix/1.5.7'
Former-commit-id: 85cebf9ea5a4dfb95a70ff466e11cc1e0cc19ef9
2018-11-06 23:30:02 +08:00
liyang d4c28522fe no message
Former-commit-id: 0c19f83985ef8b25d0c30a7fb861808a6490c180
2018-11-06 23:29:50 +08:00
liyang 4fa7b08fa8 Merge branch 'hotfix/优化' into develop
Former-commit-id: 3a805dc7d2979a47f1ff070393262144a568a7ee
2018-11-02 13:24:40 +08:00
liyang 9de364f6ee Merge branch 'hotfix/优化'
Former-commit-id: 97240ed1409b98594aa5e3449b586577e526a429
2018-11-02 13:24:40 +08:00
liyang d85b4e0e29 优化
Former-commit-id: 23dbf65aeb10765ddda7c8f4faa33d423d59f420
2018-11-02 13:24:33 +08:00
liyang a1a8615329 Merge branch 'hotfix/新版本' into develop
Former-commit-id: 2ba2d0cca6533a6841067bfb3786c22e2cc20262
2018-10-30 23:27:08 +08:00
liyang 99728bc8a5 Merge branch 'hotfix/新版本'
Former-commit-id: a1536f5dfbce2629f8205ccfb08c843dd411f85d
2018-10-30 23:27:08 +08:00
liyang 9ac047e67a 简化介绍信息
Former-commit-id: 0faef55632e5c24aab54a884e5561632947aef2a
2018-10-30 23:20:34 +08:00
liyang 23811e58cc Merge branch 'hotfix/新版本' into develop
Former-commit-id: 1876c640bca3e47b8c92a47f92d5847a010446dd
2018-10-30 20:59:09 +08:00
liyang 426408a9fd Merge branch 'hotfix/新版本'
Former-commit-id: 701cb1ab3a944aa55d830f365f479534242acf91
2018-10-30 20:59:09 +08:00
liyang 52454d3334 travis
Former-commit-id: e4223f2f7c832708d2679004042040d416a7034f
2018-10-30 20:53:10 +08:00
liyang 1ae33278a0 更新依赖
Former-commit-id: 93de86ecd6e2bc0408be9167a039ef059efec9e6
2018-10-30 20:44:19 +08:00
liyang efc8dd4694 删除依赖
Former-commit-id: 69bb8479931e65117c25761552a97d908a04bf97
2018-10-30 20:17:14 +08:00
liyang 5a54260483 main.js
Former-commit-id: 86e5af838453143f3d0e96669fb4189d319acebd
2018-10-30 20:11:50 +08:00
liyang 8bd1af6625 router
Former-commit-id: 7d8ea44f3d9d2058440fca1f6a0aa9c398d5453b
2018-10-30 20:10:00 +08:00
liyang f7f4ce2043 删除插件
Former-commit-id: 9417c79ef9b19d2b6d9779f88374667074ab3fcd
2018-10-30 20:08:31 +08:00
liyang 364d50c507 示例页面
Former-commit-id: 7c6694902563c8ecd062a4e4acd508ca475fc97e
2018-10-30 20:07:38 +08:00
liyang 0b4acf781a menu 设置
Former-commit-id: 29011ec1882cac7ed89433a9112a343be272df6d
2018-10-30 20:06:14 +08:00
liyang e1cf5ccd2b 删除不必要组件
Former-commit-id: abbe65f8f090ce4f93c2d26d41bc38e5ad8581a3
2018-10-30 20:04:33 +08:00
liyang 7335cdce9b 删除无用的样式补丁
Former-commit-id: 8eabc349dfa7650846e663fbb17a022b9f1bb041
2018-10-30 20:02:55 +08:00
liyang 31e09277df 删除无用的 svg 图标
Former-commit-id: 644811931d6328fdfb44e919927c6ae0b575faf7
2018-10-30 20:01:52 +08:00
liyang 316a93f678 删除文件夹
Former-commit-id: 90222263f0d525cd3cde7070521695b9134f020e
2018-10-30 20:01:17 +08:00
liyang 08b63fa6b9 从完整版转移
Former-commit-id: d164dbcc7f4a728304b1683d763d45fdebca8170
2018-10-30 19:53:02 +08:00
liyang e24098b148 清空
Former-commit-id: d88f8229de770edd6beb1483cb0ff29bf4d609cb
2018-10-30 19:51:49 +08:00
liyang a3e18a6211 Merge branch 'hotfix/cdn' into develop
Former-commit-id: 097dea0b498672c0a3242a41ab8f7a2c477349f7
2018-10-24 18:25:26 +08:00
liyang abda5cc1d2 Merge branch 'hotfix/cdn'
Former-commit-id: 3878e97b9cc58a9108aa58ddba8c91d14b521d27
2018-10-24 18:25:26 +08:00
liyang 8c43fa5bfa no message
Former-commit-id: 5c719fa213774efe0820aaf83fe78db048eb0c1f
2018-10-24 18:25:15 +08:00
liyang cf0b80cfda Merge branch 'hotfix/cdn' into develop
Former-commit-id: 38bbde8b2c7b2a82b4dc555cae33b3109edb85c4
2018-10-24 18:22:20 +08:00
liyang 4abf0a3ef0 Merge branch 'hotfix/cdn'
Former-commit-id: fc4951a28fca446506d90903e3d8658717d7bb2a
2018-10-24 18:22:20 +08:00
liyang 2db51f8bc7 hm
Former-commit-id: 867a8c90f3bafd0a59176664a65c27a69648d6af
2018-10-24 18:22:08 +08:00
liyang 8f381f0f5f Merge branch 'hotfix/cdn' into develop
Former-commit-id: 65ac319d80e6c3981d7c85e0d4c050db3bdc3f01
2018-10-24 18:15:17 +08:00
liyang 24580e7d43 Merge branch 'hotfix/cdn'
Former-commit-id: 32f35df52e48e7ebba10312fa4d5cac6b7a3ca9d
2018-10-24 18:15:17 +08:00
liyang 3499f79fa7 no message
Former-commit-id: 6c1c1d575c50ca1820c44615fa1ec6470d89b9ca
2018-10-24 18:15:07 +08:00
liyang e9bb49c3ff Merge remote-tracking branch 'origin/develop'
Former-commit-id: d107625324a8dd16563b12ecd07cb105df9e2c6e
2018-10-15 22:44:45 +08:00
liyang a622930d17 no message
Former-commit-id: 8151a2ba0ab431db737e6055c8b1402da75921e9
2018-10-15 22:05:42 +08:00
liyang ea0243aedb Merge remote-tracking branch 'origin/develop'
Former-commit-id: d0fa704b1dad757a9fb8bc908d710489e108c8ac
2018-10-13 20:54:23 +08:00
liyang 937f06aeb3 no message
Former-commit-id: 48ce55e25af864bfe346d08437bb3f47dae7095d
2018-10-13 20:54:07 +08:00
liyang 3929710809 no message
Former-commit-id: 8a1bbc6a42e8679d9edb3a2ee6e3d0a7022dec34
2018-10-13 20:50:55 +08:00
liyang 31d56143f5 no message
Former-commit-id: 4f114549b4f048298ef6d2bd37b7cb57ca4cecca
2018-10-13 20:48:33 +08:00
liyang a7c76aac75 Merge branch 'hotfix/router_split'
Former-commit-id: 2ca85dcc116fc9779ecafda1657e277165b1bdad
2018-10-12 09:55:12 +08:00
liyang 0a8abb19f1 Merge branch 'hotfix/router_split' into develop
Former-commit-id: e73de10eb7a3f3884b4e22832f3321b1b3804d32
2018-10-12 09:55:12 +08:00
liyang a60f3e5118 no message
Former-commit-id: a7c4a5db0e74c6f70083cf0d11c636e0f9b2dce4
2018-10-12 09:54:53 +08:00
liyang a6a9e5ae69 Merge remote-tracking branch 'origin/develop'
Former-commit-id: 0d30fb38c33819dbd497a7bcbfd6fd41dfbae2de
2018-10-12 06:49:47 +08:00
liyang b5b9e926b0 1.5.1
Former-commit-id: 84ad4736f4bd072ce623602a9aa104157ec785da
2018-10-12 06:49:30 +08:00
liyang d602c584d0 Merge branch 'hotfix/1.5.0'
Former-commit-id: dcd2ac35daff893e4f7441d05d8b1d67fda26c1d
2018-09-29 19:48:12 +08:00
liyang 0bd9ec0060 Merge branch 'hotfix/1.5.0' into develop
Former-commit-id: 1753b71682548044866b5093db639dd7d12cbaba
2018-09-29 19:48:12 +08:00
liyang 6a1a3e36de 添加了 crud 注释
Former-commit-id: fd988081fa1cc853d388ce62ead8957340f7177c
2018-09-29 19:41:48 +08:00
liyang c94cd843cc add crud
Former-commit-id: bc2949f2d62a386c44c3230b789ad3a1316fc761
2018-09-29 17:28:10 +08:00
liyang e69054ded3 no message
Former-commit-id: 071f5f99465e967623d9ac03d5e494e82b750415
2018-09-29 17:14:16 +08:00
liyang ec3838fa53 Merge branch 'hotfix/from1.4.8'
Former-commit-id: a3f063630e5c8094dc5579c42e0137a769c109e8
2018-09-20 14:37:30 +08:00
liyang b2bef9c72f no message
Former-commit-id: 94fecc266ecc01d33f9bb60531e910909765c3ff
2018-09-20 14:36:23 +08:00
liyang 9839f47d20 done
Former-commit-id: f4d2097b236a5c20e84ff57c2d4e9e62a3f0fefb
2018-09-20 14:33:38 +08:00
liyang e0ce56c7e9 clean
Former-commit-id: 61000dc9b721435e9111ebdd2fcf59fc709a0a66
2018-09-20 14:12:11 +08:00
liyang f56ca5c254 Merge branch 'hotfix/readme_update'
Former-commit-id: 146a7a7cd05c0f5bc21ffd6c116eb5c12f291595
2018-09-04 19:30:59 +08:00
liyang ff8d0c2c7c add gitee
Former-commit-id: 408aff476aee2f98113748ad409bcddcabc8eb24
2018-09-04 19:30:51 +08:00
liyang d19de45042 Merge branch 'hotfix/readme_update'
Former-commit-id: ca3e4da7fad0b74dff5aed23690d60ea482746f2
2018-09-04 15:43:40 +08:00
liyang 7a99e5188b baseurl
Former-commit-id: a2be079749e4e4397cb95a0e5421b5fde4b1dd17
2018-09-04 15:43:29 +08:00
liyang b88d69bcef Merge branch 'hotfix/readme_update'
Former-commit-id: 33e98d8bd635b965b6eaac454922ee7efa1ef6e6
2018-09-04 15:36:59 +08:00
liyang 24e266cc24 no message
Former-commit-id: 5731a32a4b719902fe66154ac188ad3bed8b46c3
2018-09-04 15:36:49 +08:00
liyang 4c14bf2998 Merge branch 'release/v1.3.0'
Former-commit-id: a05db95ae4dfef9bcdd510e57aa956e87901dea1
2018-09-04 15:26:17 +08:00
liyang 336164da41 no message
Former-commit-id: 13cddc6e80583fea2d48d618c9ff9de4d8e7dfea
2018-09-04 15:14:19 +08:00
liyang e088020cc8 Merge branch 'hotfix/1.2.0'
Former-commit-id: 6ff073ce9c558dc59bce8e80e196a212fc441e60
2018-08-22 15:44:04 +08:00
liyang 32f527ca93 Merge branch 'hotfix/1.2.0' into develop
Former-commit-id: fde074bc47e6f75ec4b044b15dd1ceddd503fc24
2018-08-22 15:44:04 +08:00
liyang da49d64646 删除无用文件
Former-commit-id: 68c566c8ba3bd7acb4eff08f0a8c0106ccd26586
2018-08-22 15:41:11 +08:00
liyang 78c5e67aa4 删除无用代码
Former-commit-id: a8c39c0b52ccc33816d3f8011988f2e7fad565a0
2018-08-22 15:36:11 +08:00
liyang b832835608 新版文件
Former-commit-id: f8cb004bc9c5fe881993aec4bc46f696bbc5a2c8
2018-08-22 15:15:20 +08:00
liyang e4a16cf07e 删除上个版本的代码
Former-commit-id: 6bda49593a2b4816ad2b4b947fa353c6240b2a06
2018-08-22 15:12:03 +08:00
liyang 6be09084ce Merge branch 'hotfix/优化多标签页关闭逻辑' into develop
Former-commit-id: 64b62c99233903b8f1cf61adbb94ba3c0ebd5d06
2018-08-09 19:40:15 +08:00
liyang d424a6ace3 Merge branch 'hotfix/优化多标签页关闭逻辑'
Former-commit-id: f7df6641ee72d1c53ca3f667e8e338570535e3e0
2018-08-09 19:40:15 +08:00
liyang 4574b86ad9 bug fixed
Former-commit-id: 57ef462e2e645409890c3176973694ac9fba1fbb
2018-08-09 19:40:04 +08:00
liyang 2626982b1f Merge branch 'hotfix/关闭标签报错' into develop
Former-commit-id: 45767b738588577e3edfe0f575499a21784cf7ba
2018-08-09 19:24:59 +08:00
liyang 1055adaea7 Merge branch 'hotfix/关闭标签报错'
Former-commit-id: 0be39a8a66a783ffd320b8cde4721199157b43df
2018-08-09 19:24:59 +08:00
liyang 5e8e173592 bug fixed
Former-commit-id: b8b630d866fd50f114e543c9cf35cc69f6732b9d
2018-08-09 19:24:47 +08:00
liyang b93b9f85e0 Merge branch 'hotfix/contextmenu-on-close-btn' into develop
Former-commit-id: a903dfad50a844bfb4fe6d1fcfd1aa17e5e56903
2018-08-04 07:37:26 +08:00
liyang 3ab1c417d0 Merge branch 'hotfix/contextmenu-on-close-btn'
Former-commit-id: 08262e38b7d3a58d53a1bad4388394bdb6c3ae79
2018-08-04 07:37:26 +08:00
liyang b4d96c4913 bug fixed https://github.com/d2-projects/d2-admin/issues/54
Former-commit-id: 473236d97e89a6b454e5037e411bbadd83bbd743
2018-08-04 07:36:30 +08:00
liyang 986d9386dd Merge branch 'dev'
Former-commit-id: 3d53c21ac9aa99cf0125f4a73d7d462c5d8a775c
2018-08-02 14:28:43 +08:00
liyang 682a57ed5a 更改版本号
Former-commit-id: ef6df7bba10eaad1d37a2a027732183a13adaf6b
2018-08-02 14:28:27 +08:00
李杨 17981960a7 Merge pull request #3 from d2-projects/dev
1.1.5

Former-commit-id: 9a7cc8423aee4bcab80e19946ecfea72de44e705
2018-07-30 00:15:26 +08:00
liyang c2503fe54e 删除无用注释
Former-commit-id: 554ef13abda90a7c420612fcc4b5c8aa870ae9aa
2018-07-29 10:26:50 +08:00