7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-11-04 13:46:17 +08:00
Code Issues Packages Projects Releases Wiki Activity
532 Commits 14 Branches 41 Tags
e577dce4ee482d7161c9243bed080739299b8d6e
Commit Graph

532 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
dependabot[bot]
92637f0537 Bump lodash from 4.17.14 to 4.17.19 in /cmdb-ui 
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.14 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.14...4.17.19)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-07-19 03:35:06 +00:00
pycook
6f7b0a3b76 add command: add-user | del-user 2020-06-11 21:37:41 +08:00
pycook
647b11734f Merge pull request #49 from pycook/dependabot/npm_and_yarn/cmdb-ui/websocket-extensions-0.1.4 
Bump websocket-extensions from 0.1.3 to 0.1.4 in /cmdb-ui
 2020-06-08 18:37:31 +08:00
dependabot[bot]
e62d71c6c7 Bump websocket-extensions from 0.1.3 to 0.1.4 in /cmdb-ui 
Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/faye/websocket-extensions-node/compare/0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-06-07 15:54:30 +00:00
pycook
df90a54ae7 Merge pull request #48 from lovvvve/master 
fix(sso login): sso login redirect
 2020-06-01 12:05:05 +08:00
Lovvvve
4a1ed9be13 fix(sso login): sso login redirect 2020-06-01 12:01:55 +08:00
Lovvvve
a44be48c7e fix(sso login): sso login redirect 2020-06-01 11:48:21 +08:00
pycook
0da1712343 fix merge conflict 2020-05-28 20:39:47 +08:00
pycook
f5472c7fa8 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
3a9a966a60 update readme 2020-05-28 20:28:49 +08:00
pycook
91647767ed Fix: spelling mistakes 2020-05-28 20:28:49 +08:00
pycook
e69404bada release version 2.1 2020-05-28 20:28:49 +08:00
pycook
332abe223d update readme 2020-04-10 17:22:33 +08:00
pycook
3bb32e1ead Merge branch 'master' of https://github.com/pycook/cmdb 2020-04-07 18:03:03 +08:00
pycook
66476ed254 Fix the judgment of app admin 2020-04-07 18:02:26 +08:00
pycook
a4eb221199 Fix: spelling mistakes 2020-04-01 21:40:51 +08:00
pycook
3f53eab514 release version 2.1 2020-04-01 21:20:47 +08:00
pycook
ba2a6a65b5 auth with ldap 2020-04-01 20:30:44 +08:00
pycook
486fcac138 UI: batch update relation 2020-04-01 11:09:41 +08:00
pycook
cf5e4966c0 add .eslintrc.js 2020-03-26 17:35:26 +08:00
pycook
79536732c1 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
84b7b53a73 fix: delete attribute 2020-03-23 15:49:33 +08:00
dependabot[bot]
6b11b50bd5 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
ccccce262f update deps 2020-03-22 11:14:09 +08:00
pycook
d4b3e259c8 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]
450508efee 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
8ea0379a0d Fix: permission management 2020-03-13 10:30:21 +08:00
pycook
6f320d4440 Merge branch 'develop' of https://github.com/pycook/cmdb into develop 2020-03-10 17:03:23 +08:00
pycook
8d7897665e 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
1505d9d948 chore: use wait script to hang api before cache/db/es started 2020-03-10 16:49:40 +08:00
pycook
c0ff2ac5b9 Merge pull request #38 from AngrygrayWolf/dev 
Change the requirements to support python3.8
 2020-03-07 22:06:25 +08:00
what
a9aff714d1 Change Pipfile 2020-03-07 21:51:37 +08:00
what
040986df20 Change the requirements to support python3.8 2020-03-07 21:20:46 +08:00
pycook
9ef6d3e955 fix case sensitive of ES search 2020-02-28 14:32:51 +08:00
pycook
28888a04ee Merge branch 'develop' of https://github.com/pycook/cmdb into develop 2020-02-23 23:13:59 +08:00
pycook
e7c004fa19 alter table c_preference_relation_views column name varchar(64) 2020-02-23 23:13:22 +08:00
pycook
93c0eefe3c 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
84fcbaefb6 version 2.1 and update readme 2020-02-23 20:21:13 +08:00
pycook
b9ef7856fe / redirect to /relation_views 2020-02-23 18:53:28 +08:00
pycook
c3b5b30b1f fix i18n 2020-02-23 18:41:23 +08:00
pycook
9c47d9c733 add library future 2020-02-21 23:29:20 +08:00
pycook
c305aaaef6 Remove Chinese comments 2020-02-21 23:14:26 +08:00
pycook
2ed10069f1 lint 2020-02-21 22:46:12 +08:00
pycook
8d3756566b The resource view is made into a two-level menu 2020-02-21 22:44:10 +08:00
penzai
91c844ba63 test: add ci and ci relation crud test cases 2020-02-18 22:05:13 +08:00
pycook
93ebc8d2e9 logo left justify 2020-02-16 19:18:51 +08:00
pycook
342a79ed0c Merge pull request #35 from shaohaojiecoder/i18n 
I18n
 2020-02-16 19:06:58 +08:00
pycook
ddc3b564fb Merge pull request #34 from OhBonsai/develop 
add test cases
 2020-02-16 19:06:24 +08:00
shaohaojiecoder
bacda2ed1e Merge branch 'develop' into i18n 2020-02-16 18:19:09 +08:00
shaohaojiecoder
61e6f36e0c add a log pic 2020-02-16 18:18:15 +08:00