Commit Graph

435 Commits

Author SHA1 Message Date
pycook c31be0f753 UI: batch update relation 2020-04-01 11:09:41 +08:00
pycook 764d2fac3f add .eslintrc.js 2020-03-26 17:35:26 +08:00
pycook f4079e9c3e 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 2a0ed72235 fix: delete attribute 2020-03-23 15:49:33 +08:00
dependabot[bot] 9e803ae4c7 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 bebdb61adf update deps 2020-03-22 11:14:09 +08:00
pycook f49cad771b 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] a5b4fbda40 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 2cce2d5cf2 Fix: permission management 2020-03-13 10:30:21 +08:00
pycook e720b7af66 Merge branch 'develop' of https://github.com/pycook/cmdb into develop 2020-03-10 17:03:23 +08:00
pycook 09e4a5111b 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 3539b12503 chore: use wait script to hang api before cache/db/es started 2020-03-10 16:49:40 +08:00
pycook 21d8673b5d Merge pull request #38 from AngrygrayWolf/dev
Change the requirements to support python3.8
2020-03-07 22:06:25 +08:00
what 7154426dc7 Change Pipfile 2020-03-07 21:51:37 +08:00
what ca75c7dcd0 Change the requirements to support python3.8 2020-03-07 21:20:46 +08:00
pycook 194a2254a6 fix case sensitive of ES search 2020-02-28 14:32:51 +08:00
pycook 26abad14d0 Merge branch 'develop' of https://github.com/pycook/cmdb into develop 2020-02-23 23:13:59 +08:00
pycook 1521a71f9c alter table c_preference_relation_views column name varchar(64) 2020-02-23 23:13:22 +08:00
pycook d425b455f1 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 230307474b version 2.1 and update readme 2020-02-23 20:21:13 +08:00
pycook 69d6b40e39 / redirect to /relation_views 2020-02-23 18:53:28 +08:00
pycook 5dc2f89e7f fix i18n 2020-02-23 18:41:23 +08:00
pycook 9eaca4d6a0 add library future 2020-02-21 23:29:20 +08:00
pycook 3680a462f5 Remove Chinese comments 2020-02-21 23:14:26 +08:00
pycook 3ac50e7cd8 lint 2020-02-21 22:46:12 +08:00
pycook 21b2cc1d5d The resource view is made into a two-level menu 2020-02-21 22:44:10 +08:00
penzai cd5448cc7d test: add ci and ci relation crud test cases 2020-02-18 22:05:13 +08:00
pycook 10610bdb4b logo left justify 2020-02-16 19:18:51 +08:00
pycook b5c2156387 Merge pull request #35 from shaohaojiecoder/i18n
I18n
2020-02-16 19:06:58 +08:00
pycook b05ae0d1a7 Merge pull request #34 from OhBonsai/develop
add test cases
2020-02-16 19:06:24 +08:00
shaohaojiecoder bbf6138d43 Merge branch 'develop' into i18n 2020-02-16 18:19:09 +08:00
shaohaojiecoder 1ba3e6a680 add a log pic 2020-02-16 18:18:15 +08:00
penzai 64045c1f93 test: add some test cases 2020-02-16 18:03:33 +08:00
penzai 5a3e55813c model: allow origin and ticket_id nullable in OperationRecord 2020-02-16 18:03:08 +08:00
penzai bc72e58886 auth: add user in flask.g when auth by jwt 2020-02-16 18:02:24 +08:00
pycook 9e78955ba1 ACL i18n 2020-02-16 17:36:03 +08:00
pycook 136853d9a4 Merge pull request #33 from shaohaojiecoder/i18n
fix local storage for defalut lang
2020-02-16 14:51:59 +08:00
pycook 036e3ad00d modeling i18n 2020-02-16 14:50:17 +08:00
shaohaojiecoder 5ce6c93237 fix local storage for defalut lang 2020-02-16 13:47:30 +08:00
pycook 43dba7f7ed Merge pull request #32 from OhBonsai/develop
fix: recycle import by celery task
2020-02-16 10:38:27 +08:00
penzai f4879d20d6 fix: recycle import by celery task 2020-02-16 09:39:33 +08:00
pycook 740e4c6034 i18n 2020-02-15 20:57:47 +08:00
pycook 0f2baa1d94 Merge pull request #31 from shaohaojiecoder/i18n
I18n
2020-02-11 09:50:50 +08:00
pycook 405b0af72c Merge branch 'develop' into i18n 2020-02-11 09:50:11 +08:00
shaohaojiecoder a4e5178979 fix meta title 2020-02-09 19:50:23 +08:00
shaohaojiecoder c14fe23283 add i18n basic structure 2020-02-09 17:54:57 +08:00
shaohaojiecoder b3a058f908 add something 2020-02-09 17:22:17 +08:00
shaohaojiecoder bd82a0e27c add some 2020-02-08 22:27:56 +08:00
pycook f22a5c3543 Define display fields 2020-02-08 17:39:42 +08:00
pycook ed81c3f091 Define display fields 2020-02-08 17:36:54 +08:00