Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 85f449d3b6 Merge branch 'hotfix/优化演示页面显示' liyang 2018-10-30 16:29:19 +08:00
• 1fd967c41e no message liyang 2018-10-30 16:29:08 +08:00
• d923bba4c5 代码格式整理 liyang 2018-10-27 22:47:35 +08:00
• c854473d10 Merge branch 'hotfix/删除_env_无用信息' liyang 2018-10-27 22:31:10 +08:00
• c849dbb2e1 Merge branch 'hotfix/删除_env_无用信息' into develop liyang 2018-10-27 22:31:10 +08:00
• 04c7443f01 删除无用信息 liyang 2018-10-27 22:30:10 +08:00
• 60518996ab Merge branch 'hotfix/travis_setting_remove' into develop liyang 2018-10-27 18:48:42 +08:00
• 40246585e1 Merge branch 'hotfix/travis_setting_remove' liyang 2018-10-27 18:48:42 +08:00
• e54e9986ed no message liyang 2018-10-27 18:48:22 +08:00
• 11d807623c Merge branch 'hotfix/readme_update' into develop liyang 2018-10-27 18:40:57 +08:00
• f42b4eeff6 Merge branch 'hotfix/readme_update' liyang 2018-10-27 18:40:57 +08:00
• 4bf457c468 删除部署位置的介绍 liyang 2018-10-27 18:40:42 +08:00
• 6e6ff4e4a5 Merge branch 'hotfix/1.5.5' into develop liyang 2018-10-27 18:38:29 +08:00
• 0cf79e4608 Merge branch 'hotfix/1.5.5' liyang 2018-10-27 18:38:28 +08:00
• cad161104c 缓存设置方式更新 liyang 2018-10-27 18:37:04 +08:00
• 5f50db24f8 更新介绍 liyang 2018-10-26 14:14:56 +08:00
• 40572cb3d6 删除了 TODO liyang 2018-10-26 10:00:36 +08:00
• 513ad831bf 统计代码格式更新 liyang 2018-10-26 09:57:10 +08:00
• ef307293d7 404 页面同步更新样式 liyang 2018-10-26 09:36:27 +08:00
• 15ddd46172 将CSS写成一行 liyang 2018-10-26 09:05:34 +08:00
• e9b1351d0b 简化设置的导出方式 liyang 2018-10-26 00:21:12 +08:00
• 810d2eb5a4 新版首页载入样式 liyang 2018-10-26 00:20:49 +08:00
• 75edff2260 新版本号 liyang 2018-10-26 00:20:29 +08:00
• d4a22c80f0 Merge branch 'hotfix/更新简化版地址' into develop liyang 2018-10-25 09:59:39 +08:00
• 8b460b0357 Merge branch 'hotfix/更新简化版地址' liyang 2018-10-25 09:59:39 +08:00
• 4a1114fd7f no message liyang 2018-10-25 09:59:19 +08:00
• 7630028e25 Merge branch 'hotfix/更新简化版预览地址' into develop liyang 2018-10-24 18:35:09 +08:00
• 62e517bfe3 Merge branch 'hotfix/更新简化版预览地址' liyang 2018-10-24 18:35:09 +08:00
• 33bcf06608 no message liyang 2018-10-24 18:34:45 +08:00
• f8609ebca9 Merge branch 'hotfix/富文本编辑器v-model问题' into develop liyang 2018-10-24 11:31:52 +08:00
• ee04a3800a Merge branch 'hotfix/富文本编辑器v-model问题' liyang 2018-10-24 11:31:52 +08:00
• e8df163268 修复外部修改数据无法触发更新的 bug liyang 2018-10-24 11:31:29 +08:00
• bfb566ae75 Merge branch 'hotfix/更新文档地址以及恢复刷新七牛' into develop liyang 2018-10-24 10:37:29 +08:00
• c950b0c62f Merge branch 'hotfix/更新文档地址以及恢复刷新七牛' liyang 2018-10-24 10:37:28 +08:00
• 1691f22cf3 更新地址 liyang 2018-10-24 10:37:04 +08:00
• f0f8e1af0c Merge branch 'hotfix/hmt' into develop liyang 2018-10-23 21:40:45 +08:00
• a3290aa677 Merge branch 'hotfix/hmt' liyang 2018-10-23 21:40:44 +08:00
• c3c89ced6e new hmt liyang 2018-10-23 21:40:24 +08:00
• 2262f87b0d Merge branch 'hotfix/修改预览地址' into develop liyang 2018-10-23 20:18:39 +08:00
• ce3b105295 Merge branch 'hotfix/修改预览地址' liyang 2018-10-23 20:18:39 +08:00
• 92ce74644b 修改预览地址 liyang 2018-10-23 20:17:54 +08:00
• 4bb6b7ec2a Merge branch 'hotfix/https' into develop liyang 2018-10-23 19:29:32 +08:00
• ec4b366d00 Merge branch 'hotfix/https' liyang 2018-10-23 19:29:32 +08:00
• ad31a2cc4f no message liyang 2018-10-23 19:29:12 +08:00
• 95a2bb1dea Merge branch 'hotfix/https验证' into develop liyang 2018-10-23 19:16:43 +08:00
• 7648593182 Merge branch 'hotfix/https验证' liyang 2018-10-23 19:16:43 +08:00
• 0152795fde 添加检查文件 liyang 2018-10-23 19:16:04 +08:00
• 415262307a Merge branch 'hotfix/删除版本检查请求' into develop liyang 2018-10-23 19:12:45 +08:00
• f778a5719b Merge branch 'hotfix/删除版本检查请求' liyang 2018-10-23 19:12:45 +08:00
• 45e88cffad 删除提交代码前的检查 liyang 2018-10-23 19:09:53 +08:00
• 7b9d46655d 删除请求新版本相关的代码 liyang 2018-10-23 19:05:33 +08:00
• 8316a1e5b2 Merge branch 'hotfix/取消刷新七牛' into develop liyang 2018-10-23 18:41:21 +08:00
• 85da2af545 Merge branch 'hotfix/取消刷新七牛' liyang 2018-10-23 18:41:21 +08:00
• 301846d32f 只刷新文件 liyang 2018-10-23 18:40:51 +08:00
• 1590109949 Merge branch 'hotfix/baseUrl' into develop liyang 2018-10-23 14:14:40 +08:00
• d0ea39bf42 Merge branch 'hotfix/baseUrl' liyang 2018-10-23 14:14:39 +08:00
• 8aff8df786 no message liyang 2018-10-23 14:14:29 +08:00
• 3eb9b40cd3 Merge branch 'hotfix/cdn' into develop liyang 2018-10-23 13:51:57 +08:00
• 28016a2bff Merge branch 'hotfix/cdn' liyang 2018-10-23 13:51:57 +08:00
• 1d80034641 CI setting update liyang 2018-10-23 13:51:40 +08:00
• 7556f52f65 Merge branch 'hotfix/v' into develop liyang 2018-10-22 22:28:17 +08:00
• 3329df29c3 Merge branch 'hotfix/v' liyang 2018-10-22 22:28:17 +08:00
• 2c371750e5 no message liyang 2018-10-22 22:27:28 +08:00
• b3880cffea Merge branch 'hotfix/xlsx' into develop liyang 2018-10-22 22:04:35 +08:00
• 4e0e1349f1 Merge branch 'hotfix/xlsx' liyang 2018-10-22 22:04:35 +08:00
• 4cc57b0645 删除备份 liyang 2018-10-22 22:04:20 +08:00
• f7f1d62d4c 增加 excel 导出的合并单元格选项 增加 excel 导出的第一行标题选项 CNine 2018-10-22 19:53:54 +08:00
• cba26a1dc7 no message liyang 2018-10-22 18:32:57 +08:00
• 7dafb8a0e7 no message liyang 2018-10-22 18:28:35 +08:00
• 86c9e19293 Merge remote-tracking branch 'origin/develop' liyang 2018-10-15 22:44:30 +08:00
• fdef9dd69b no message liyang 2018-10-15 22:04:32 +08:00
• 6b633d3780 Merge branch 'hotfix/mock_cookie' liyang 2018-10-13 20:53:29 +08:00
• fef0d2de7f Merge branch 'hotfix/mock_cookie' into develop liyang 2018-10-13 20:53:29 +08:00
• 4839d4e012 no message liyang 2018-10-13 20:53:19 +08:00
• b2a44d1356 no message liyang 2018-10-13 20:51:16 +08:00
• 2956d18cec no message liyang 2018-10-13 20:47:29 +08:00
• 4ec18b611f Merge remote-tracking branch 'origin/develop' liyang 2018-10-12 07:10:45 +08:00
• 8bdcdcf12a no message liyang 2018-10-12 07:10:11 +08:00
• f40a00f619 Merge branch 'hotfix/page' liyang 2018-10-11 22:02:34 +08:00
• b1f00ed726 Merge branch 'hotfix/page' into develop liyang 2018-10-11 22:02:34 +08:00
• 9a71db1e9a 修改版本号 liyang 2018-10-11 22:02:27 +08:00
• 75d3f3ad1a 删除了跳板页面 将跳板页面的内容转移到了路由设置中 liyang 2018-10-11 22:01:54 +08:00
• 7cc3ac5425 Merge branch 'hotfix/v' into develop liyang 2018-09-29 15:12:48 +08:00
• df192bd249 Merge branch 'hotfix/v' liyang 2018-09-29 15:12:48 +08:00
• 77f685ce5c 1.5.0 liyang 2018-09-29 15:12:40 +08:00
• 9af718c651 Merge branch 'develop' of https://github.com/d2-projects/d2-admin into develop Lu Chaohai 2018-09-25 11:10:59 +08:00
• 3e2bde7ad9 修复 顶部菜单滚动的一个bug Lu Chaohai 2018-09-25 11:10:45 +08:00
• aa2c3fcf2b Merge tag 'd2_crud_example' into develop 孙昊翔 2018-09-21 19:32:12 +08:00
• e54e135fe2 Merge branch 'hotfix/d2_crud_example' 孙昊翔 2018-09-21 19:32:12 +08:00
• de57257fb5 demo17添加新增按钮 孙昊翔 2018-09-21 19:31:38 +08:00
• df44094c62 Merge remote-tracking branch 'origin/develop' liyang 2018-09-20 22:23:23 +08:00
• 10b60ebe8e update liyang 2018-09-20 22:21:45 +08:00
• 7cb8e91f39 Merge branch 'hotfix/addEventListener' liyang 2018-09-19 16:00:08 +08:00
• a8ebf27911 Merge branch 'hotfix/addEventListener' into develop liyang 2018-09-19 16:00:08 +08:00
• 5dd20453e2 no message liyang 2018-09-19 15:59:59 +08:00
• b82a7f1401 Merge branch 'hotfix/v' into develop liyang 2018-09-19 15:19:53 +08:00
• f9a4fc80cc Merge branch 'hotfix/v' liyang 2018-09-19 15:19:53 +08:00
• 0542c372e7 update liyang 2018-09-19 15:19:45 +08:00
• 95e658f633 Merge remote-tracking branch 'origin/develop' liyang 2018-09-19 15:18:38 +08:00
• ce1ecb5ab5 Merge branch 'feature/headermenu-scroll' into develop liyang 2018-09-19 15:17:10 +08:00