Commit Graph

  • aae3b6e2ff Merge pull request #4 from pycook/master kdyq007 2019-11-23 17:36:42 +08:00
  • 6c4eefa9c0 fix acl resource_type pycook 2019-11-23 17:24:43 +08:00
  • b370c7d46e fix acl resource_type pycook 2019-11-23 17:24:43 +08:00
  • a492f97199 Merge pull request #3 from pycook/master kdyq007 2019-11-23 14:52:41 +08:00
  • efa5a8ea5d Merge pull request #3 from pycook/master kdyq007 2019-11-23 14:52:41 +08:00
  • 4c7deee866 relative view api [done] pycook 2019-11-22 18:18:22 +08:00
  • fd532626ac relative view api [done] pycook 2019-11-22 18:18:22 +08:00
  • 31a97d7ad0 Realize /api/v0.1/ci_relations/s [done] pycook 2019-11-21 18:21:03 +08:00
  • 617337c614 Realize /api/v0.1/ci_relations/s [done] pycook 2019-11-21 18:21:03 +08:00
  • 9a3d24ac81 [更新] 保存一下 kdyq007 2019-11-20 19:02:36 +08:00
  • c2e4090aea Merge branch 'master' of https://github.com/kdyq007/cmdb kdyq007 2019-11-19 21:52:33 +08:00
  • 454dd4c56b Merge branch 'master' of https://github.com/kdyq007/cmdb kdyq007 2019-11-19 21:52:33 +08:00
  • 40e49aa1e9 Merge pull request #2 from pycook/master kdyq007 2019-11-19 21:52:02 +08:00
  • 88ad72d4dc Merge pull request #2 from pycook/master kdyq007 2019-11-19 21:52:02 +08:00
  • 0bf8bfb113 [更新] 完成基础role和user管理 kdyq007 2019-11-19 21:49:51 +08:00
  • 8d1517d550 [更新] 完成基础role和user管理 kdyq007 2019-11-19 21:49:51 +08:00
  • bc7b51c544 fix get user by uid pycook 2019-11-19 21:46:53 +08:00
  • d3a8ef5966 fix get user by uid pycook 2019-11-19 21:46:53 +08:00
  • 1c6d056d58 acl: resource type api pycook 2019-11-19 21:41:46 +08:00
  • e5baa5012d acl: resource type api pycook 2019-11-19 21:41:46 +08:00
  • f3a0761ffc fix search pycook 2019-11-19 18:32:35 +08:00
  • a1f63b00dd fix search pycook 2019-11-19 18:32:35 +08:00
  • 2ce8a6bdbf elastic search [done] pycook 2019-11-19 18:16:31 +08:00
  • 47ded84231 elastic search [done] pycook 2019-11-19 18:16:31 +08:00
  • 224a48a5f3 [更新] 去除app_id kdyq007 2019-11-18 22:22:38 +08:00
  • 7ae58611c0 es search update pycook 2019-11-18 22:05:59 +08:00
  • 0e7c52df71 es search update pycook 2019-11-18 22:05:59 +08:00
  • 4ec3b310e4 search by elasticsearch [doing] pycook 2019-11-18 20:02:25 +08:00
  • ff701cc770 search by elasticsearch [doing] pycook 2019-11-18 20:02:25 +08:00
  • bd34023512 Merge pull request #1 from pycook/master kdyq007 2019-11-18 18:31:14 +08:00
  • 6a7bb725cc Merge pull request #1 from pycook/master kdyq007 2019-11-18 18:31:14 +08:00
  • 2205c359b8 fix acl api pycook 2019-11-18 12:02:02 +08:00
  • 0a13186c13 fix acl api pycook 2019-11-18 12:02:02 +08:00
  • a0ffeb9950 [更新] 完成角色管理页面 kdyq007 2019-11-17 21:08:04 +08:00
  • 2723f187ac [更新] 完成roles基本接口 kdyq007 2019-11-17 17:09:24 +08:00
  • 6c70ec6d53 [更新] 完成roles基本接口 kdyq007 2019-11-17 17:09:24 +08:00
  • 4b5f82699a [更新] 完成用户管理页面 qiqi 2019-11-17 09:32:39 +08:00
  • bb91f21e40 pep8 pycook 2019-11-15 18:03:06 +08:00
  • f78c3b928b pep8 pycook 2019-11-15 18:03:06 +08:00
  • f1c2bcbd79 update acl pycook 2019-11-15 16:54:56 +08:00
  • 332659c1d5 update acl pycook 2019-11-15 16:54:56 +08:00
  • a8255d2b69 Merge pull request #18 from kdyq007/master pycook 2019-11-14 21:59:38 +08:00
  • 3beb2706dc Merge pull request #18 from kdyq007/master pycook 2019-11-14 21:59:38 +08:00
  • 22c02f94e0 [更新] 优化格式 qiqi 2019-11-14 21:51:58 +08:00
  • a14111e1ce [更新] 优化格式 qiqi 2019-11-14 21:51:58 +08:00
  • e1a5c01438 [更新] 更换图片位置、压缩图片 qiqi 2019-11-14 21:48:36 +08:00
  • c4320c14f9 [更新] 更换图片位置、压缩图片 qiqi 2019-11-14 21:48:36 +08:00
  • fd21dfe94d [更新] 优化说明文件格式 qiqi 2019-11-14 21:00:24 +08:00
  • 4c5442748f [更新] 优化说明文件格式 qiqi 2019-11-14 21:00:24 +08:00
  • 4bc6492b21 [更新] 新增Q群 README.md qiqi 2019-11-14 20:55:48 +08:00
  • a81750acba [更新] 新增Q群 README.md qiqi 2019-11-14 20:55:48 +08:00
  • eaa5cb8bf1 update acl pycook 2019-11-14 18:35:31 +08:00
  • 0439e2462b update acl pycook 2019-11-14 18:35:31 +08:00
  • 47c66be179 update readme pycook 2019-11-13 14:02:02 +08:00
  • 3b62bd7ac9 update readme pycook 2019-11-13 14:02:02 +08:00
  • 089a17ded8 python3.7 timezone fix pycook 2019-11-13 13:56:44 +08:00
  • f6add52721 python3.7 timezone fix pycook 2019-11-13 13:56:44 +08:00
  • cb0eb7eadd update acl pycook 2019-11-13 13:25:42 +08:00
  • c85e535288 update acl pycook 2019-11-13 13:25:42 +08:00
  • 82a402883b docker images use aliyun pycook 2019-11-13 11:56:17 +08:00
  • c0c6d116b5 docker images use aliyun pycook 2019-11-13 11:56:17 +08:00
  • 00f6e8e7d9 update Makefile and support for install by make pycook 2019-11-12 11:55:04 +08:00
  • 39153e92d1 update Makefile and support for install by make pycook 2019-11-12 11:55:04 +08:00
  • 63cae8510f fix py3 pycook 2019-11-12 11:15:25 +08:00
  • 42bcc2e510 fix py3 pycook 2019-11-12 11:15:25 +08:00
  • 62b56da0d8 merge Dockerfile pycook 2019-11-12 10:40:37 +08:00
  • 398fbb25dc merge Dockerfile pycook 2019-11-12 10:40:37 +08:00
  • 79a19d4b49 delete docs/Dockerfile pycook 2019-11-11 23:12:50 +08:00
  • 4b312d4f99 delete docs/Dockerfile 1.0 pycook 2019-11-11 23:12:50 +08:00
  • f91c82b241 fix timezone pycook 2019-11-11 23:11:12 +08:00
  • 10414155a5 fix timezone pycook 2019-11-11 23:11:12 +08:00
  • 89ffec35e8 update README pycook 2019-11-11 16:10:02 +08:00
  • feda0c37e7 update README pycook 2019-11-11 16:10:02 +08:00
  • 2935ca5923 flask init-cache pycook 2019-11-11 15:46:57 +08:00
  • 173c120b64 flask init-cache pycook 2019-11-11 15:46:57 +08:00
  • 46213dd758 Remove package-lock.json and remove some compile warnings pycook 2019-11-11 13:15:21 +08:00
  • 5f2a0d1a7b Remove package-lock.json and remove some compile warnings pycook 2019-11-11 13:15:21 +08:00
  • aee66c075b add command init-cache pycook 2019-11-11 11:27:43 +08:00
  • 50f894a01d add command init-cache pycook 2019-11-11 11:27:43 +08:00
  • 29e80f8597 Merge branch 'master' of https://github.com/pycook/cmdb pycook 2019-11-11 09:20:07 +08:00
  • 66e93e73af Merge branch 'master' of https://github.com/pycook/cmdb pycook 2019-11-11 09:20:07 +08:00
  • 618cd7ff16 vue lint pycook 2019-11-11 00:25:22 +08:00
  • 58ad9d3f05 vue lint pycook 2019-11-11 00:25:22 +08:00
  • de22a4e04b gunicorn==19.5.0 pycook 2019-11-10 19:10:23 +08:00
  • 08c96039e9 gunicorn==19.5.0 pycook 2019-11-10 19:10:23 +08:00
  • 3fdfa4dc92 Docker to production pycook 2019-11-10 19:06:38 +08:00
  • ca0dd97626 Docker to production pycook 2019-11-10 19:06:38 +08:00
  • 7da14f6aa0 Partially completed backend development of permissions management pycook 2019-11-08 17:42:13 +08:00
  • 7810ee3974 Partially completed backend development of permissions management pycook 2019-11-08 17:42:13 +08:00
  • 046d0e60b7 Update README.md pycook 2019-11-08 15:26:22 +08:00
  • 2cfea7ef08 Update README.md pycook 2019-11-08 15:26:22 +08:00
  • dc18e3b82f fix py2.7 unicode encoding error pycook 2019-11-08 15:15:31 +08:00
  • 0cee6cea25 fix py2.7 unicode encoding error pycook 2019-11-08 15:15:31 +08:00
  • cb8ef65e79 users drop is_admin pycook 2019-11-08 14:58:21 +08:00
  • 5d13ba2f26 users drop is_admin pycook 2019-11-08 14:58:21 +08:00
  • 341a4359fa fix unicode encode error pycook 2019-11-08 14:37:53 +08:00
  • a583433530 fix unicode encode error pycook 2019-11-08 14:37:53 +08:00
  • f89169de96 移除多余的docker-start目录 fxiang21 2019-11-07 19:51:44 +08:00
  • 733ac3b2b4 移除多余的docker-start目录 fxiang21 2019-11-07 19:51:44 +08:00
  • 47767e22d8 修复nginx转发问题 fxiang21 2019-11-07 18:55:41 +08:00