7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
251 Commits 14 Branches 38 Tags 93 MiB
Commit Graph

251 Commits

Author SHA1 Message Date
Lovvvve 56753d0106 fix(sso login): sso login redirect 2020-06-01 12:01:55 +08:00
Lovvvve d5e65bd9e4 fix(sso login): sso login redirect 2020-06-01 11:48:21 +08:00
pycook 27e0f76b6c fix merge conflict 2020-05-28 20:39:47 +08:00
pycook 36bee95df4 Readme is in Chinese by default 
Committer: pycook <pycook@126.com>

Author:    pycook <pycook@126.com>
 2020-05-28 20:35:11 +08:00
pycook ba4f509d5a update readme 2020-05-28 20:28:49 +08:00
pycook e0330f3d84 Fix: spelling mistakes 2020-05-28 20:28:49 +08:00
pycook 7c8b71831e release version 2.1 2020-05-28 20:28:49 +08:00
pycook 554330aa8e update sql 2020-05-28 20:28:49 +08:00
pycook cd9288d752 update readme 2020-04-10 17:22:33 +08:00
pycook 854202881d Merge branch 'master' of https://github.com/pycook/cmdb 2020-04-07 18:03:03 +08:00
pycook f2dcd7b82a Fix the judgment of app admin 2020-04-07 18:02:26 +08:00
pycook c60bfe6dd3 Fix: spelling mistakes 2020-04-01 21:40:51 +08:00
pycook 21dd4b139d release version 2.1 2020-04-01 21:20:47 +08:00
pycook 864e7eb5c1 update sql 2020-04-01 20:34:57 +08:00
pycook 3cb61e0d0c auth with ldap 2020-04-01 20:30:44 +08:00
pycook 9ff69529ab UI: batch update relation 2020-04-01 11:09:41 +08:00
pycook e37c23b38e add .eslintrc.js 2020-03-26 17:35:26 +08:00
pycook 07899f8cf4
Merge pull request #42 from pycook/dependabot/npm_and_yarn/cmdb-ui/yarn-1.22.0 
Bump yarn from 1.21.1 to 1.22.0 in /cmdb-ui
 2020-03-26 17:29:53 +08:00
pycook 0f8bfd9322 fix: delete attribute 2020-03-23 15:49:33 +08:00
dependabot[bot] ba5d1878db
Bump yarn from 1.21.1 to 1.22.0 in /cmdb-ui 
Bumps [yarn](https://github.com/yarnpkg/yarn) from 1.21.1 to 1.22.0.
- [Release notes](https://github.com/yarnpkg/yarn/releases)
- [Changelog](https://github.com/yarnpkg/yarn/blob/master/CHANGELOG.md)
- [Commits](https://github.com/yarnpkg/yarn/compare/v1.21.1...v1.22.0)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-22 03:14:30 +00:00
pycook 9c03550518 update deps 2020-03-22 11:14:09 +08:00
pycook 670b26f879
Merge pull request #41 from pycook/dependabot/npm_and_yarn/cmdb-ui/acorn-5.7.4 
Bump acorn from 5.7.3 to 5.7.4 in /cmdb-ui
 2020-03-15 13:06:51 +08:00
dependabot[bot] e3f96ea947
Bump acorn from 5.7.3 to 5.7.4 in /cmdb-ui 
Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-03-14 18:55:18 +00:00
pycook 83cbae849a Fix: permission management 2020-03-13 10:30:21 +08:00
pycook 7d271176a1 Merge branch 'develop' of https://github.com/pycook/cmdb into develop 2020-03-10 17:03:23 +08:00
pycook 62730ca106
Merge pull request #40 from OhBonsai/develop 
chore: use wait script to hang api before cache/db/es started
 2020-03-10 17:01:58 +08:00
penzai ae75034e34 chore: use wait script to hang api before cache/db/es started 2020-03-10 16:49:40 +08:00
pycook b2039578d5
Merge pull request #38 from AngrygrayWolf/dev 
Change the requirements to support python3.8
 2020-03-07 22:06:25 +08:00
what 40253e193c Change Pipfile 2020-03-07 21:51:37 +08:00
what 38f53632a5 Change the requirements to support python3.8 2020-03-07 21:20:46 +08:00
pycook 0d28f62b1f fix case sensitive of ES search 2020-02-28 14:32:51 +08:00
pycook e709b90cf3 Merge branch 'develop' of https://github.com/pycook/cmdb into develop 2020-02-23 23:13:59 +08:00
pycook 658e6236ac alter table c_preference_relation_views column name varchar(64) 2020-02-23 23:13:22 +08:00
pycook f0d18c2fc3
Merge pull request #36 from OhBonsai/develop 
test: add ci and ci relation crud test cases
 2020-02-23 23:12:36 +08:00
pycook 94cf6139c1 version 2.1 and update readme 2020-02-23 20:21:13 +08:00
pycook 08da6be938 / redirect to /relation_views 2020-02-23 18:53:28 +08:00
pycook 0b08d85472 fix i18n 2020-02-23 18:41:23 +08:00
pycook 2209d06d69 add library future 2020-02-21 23:29:20 +08:00
pycook f778fed5dc Remove Chinese comments 2020-02-21 23:14:26 +08:00
pycook 27ba67b27c lint 2020-02-21 22:46:12 +08:00
pycook db13a5b8b1 The resource view is made into a two-level menu 2020-02-21 22:44:10 +08:00
penzai 9cfa00a8f2 test: add ci and ci relation crud test cases 2020-02-18 22:05:13 +08:00
pycook 9cb60060f8 logo left justify 2020-02-16 19:18:51 +08:00
pycook 17616fafbd
Merge pull request #35 from shaohaojiecoder/i18n 
I18n
 2020-02-16 19:06:58 +08:00
pycook 2823249a07
Merge pull request #34 from OhBonsai/develop 
add test cases
 2020-02-16 19:06:24 +08:00
shaohaojiecoder 7624b45480 Merge branch 'develop' into i18n 2020-02-16 18:19:09 +08:00
shaohaojiecoder 1acc3b3f42 add a log pic 2020-02-16 18:18:15 +08:00
penzai c9f7a8122f test: add some test cases 2020-02-16 18:03:33 +08:00
penzai a1e510d812 model: allow origin and ticket_id nullable in OperationRecord 2020-02-16 18:03:08 +08:00
penzai f40d6924aa auth: add user in flask.g when auth by jwt 2020-02-16 18:02:24 +08:00