7x31/cmdb
1
0
Fork 0
mirror of https://github.com/veops/cmdb.git synced 2025-10-31 11:09:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
768 Commits 14 Branches 41 Tags
ae900c7d3b0066f7b8146bf31fcfb490ebf66459
Commit Graph

768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
penzai
b798d5e2cc test: add some test cases 2020-02-16 18:03:33 +08:00
penzai
7b3f95b41d model: allow origin and ticket_id nullable in OperationRecord 2020-02-16 18:03:08 +08:00
penzai
82c921bb88 auth: add user in flask.g when auth by jwt 2020-02-16 18:02:24 +08:00
pycook
d975aceaab ACL i18n 2020-02-16 17:36:03 +08:00
pycook
a188218818 Merge pull request #33 from shaohaojiecoder/i18n 
fix local storage for defalut lang
 2020-02-16 14:51:59 +08:00
pycook
1484a308cf modeling i18n 2020-02-16 14:50:17 +08:00
shaohaojiecoder
ea0a7df472 fix local storage for defalut lang 2020-02-16 13:47:30 +08:00
pycook
b4de2bdb9e Merge pull request #32 from OhBonsai/develop 
fix: recycle import by celery task
 2020-02-16 10:38:27 +08:00
penzai
d2f3589154 fix: recycle import by celery task 2020-02-16 09:39:33 +08:00
pycook
07d2af6671 i18n 2020-02-15 20:57:47 +08:00
pycook
acf881dcb7 Merge pull request #31 from shaohaojiecoder/i18n 
I18n
 2020-02-11 09:50:50 +08:00
pycook
cd0797e860 Merge branch 'develop' into i18n 2020-02-11 09:50:11 +08:00
shaohaojiecoder
328d678455 fix meta title 2020-02-09 19:50:23 +08:00
shaohaojiecoder
4e0dc1282f add i18n basic structure 2020-02-09 17:54:57 +08:00