Commit Graph - cmdb - Gitea: Git with a cup of tea

7x31/cmdb

Fork 0

mirror of https://github.com/veops/cmdb.git synced 2025-10-09 23:59:18 +08:00

Commit Graph

Select branches

Hide Pull Requests

config_ruff

dependabot/npm_and_yarn/cmdb-ui/axios-1.6.0

dependabot/pip/cmdb-api/pycryptodome-3.19.1

deploy_0731

deploy_on_kylin_docker

dev_api_240518

dev_common_perm

dev_deploy

dev_ui_241106

dev_xf

fix_acl_date_joined_column

fix_decorator_perms_role_required

fix_issue#503

master

#1

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#110

#111

#113

#114

#115

#116

#117

#118

#119

#120

#121

#122

#123

#124

#125

#126

#127

#129

#13

#130

#131

#132

#133

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#152

#153

#154

#155

#156

#156

#157

#158

#159

#16

#160

#161

#162

#163

#165

#166

#167

#168

#169

#17

#170

#171

#172

#174

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#186

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#199

#2

#20

#200

#201

#202

#203

#208

#209

#21

#210

#214

#215

#216

#217

#218

#218

#22

#222

#223

#224

#225

#227

#229

#230

#231

#232

#234

#235

#236

#238

#239

#24

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#265

#267

#268

#27

#270

#271

#272

#277

#278

#279

#28

#280

#282

#286

#287

#289

#29

#292

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#303

#305

#306

#307

#308

#309

#31

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#333

#334

#335

#336

#337

#338

#339

#34

#340

#342

#343

#344

#345

#347

#348

#349

#35

#350

#351

#352

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#367

#367

#368

#369

#370

#371

#373

#374

#376

#377

#378

#379

#38

#380

#381

#382

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#401

#402

#403

#404

#405

#406

#407

#41

#411

#413

#414

#415

#42

#420

#424

#425

#426

#429

#430

#431

#437

#438

#442

#444

#445

#446

#447

#448

#449

#450

#451

#453

#454

#455

#456

#457

#458

#459

#460

#461

#462

#463

#467

#468

#469

#471

#474

#476

#478

#479

#48

#480

#482

#486

#487

#488

#49

#495

#498

#499

#500

#501

#502

#505

#51

#511

#512

#513

#515

#516

#517

#52

#521

#523

#524

#525

#527

#528

#529

#531

#532

#534

#535

#539

#54

#542

#55

#550

#551

#552

#553

#555

#557

#558

#559

#56

#560

#561

#562

#563

#564

#565

#566

#567

#568

#569

#570

#571

#572

#573

#574

#575

#577

#578

#580

#581

#582

#584

#585

#587

#588

#589

#59

#590

#591

#592

#593

#594

#595

#596

#597

#598

#599

#60

#600

#601

#602

#603

#604

#605

#606

#607

#608

#609

#61

#610

#611

#613

#615

#616

#617

#619

#622

#623

#627

#628

#629

#630

#631

#632

#633

#634

#636

#637

#638

#639

#64

#642

#643

#646

#647

#648

#649

#65

#650

#651

#652

#654

#656

#657

#658

#659

#660

#663

#664

#67

#685

#688

#689

#69

#691

#692

#693

#696

#71

#718

#722

#73

#74

#75

#76

#77

#78

#79

#80

#81

#82

#83

#84

#85

#86

#87

#88

#90

#92

#93

#95

#96

#97

#98

#99

1.0

1.5

2.0

2.1

2.2

2.3.0

2.3.1

2.3.10

2.3.11

2.3.12

2.3.13

2.3.2

2.3.3

2.3.4

2.3.5

2.3.6

2.3.7

2.3.8

2.3.9

2.4.1

2.4.2

2.4.3

2.4.4

2.4.5

v2.3.8

v2.4.10

v2.4.11

v2.4.12

v2.4.13

v2.4.14

v2.4.15

v2.4.16

v2.4.17

v2.4.6

v2.4.7

v2.4.8

v2.4.9

v2.5.1

v2.5.2

v2.5.3

v2.5.4

5abafed9c8 Merge pull request #54 from pycook/dependabot/npm_and_yarn/cmdb-ui/quill-1.3.7 pycook 2020-11-22 10:27:15 +08:00
672660330f Bump dot-prop from 4.2.0 to 4.2.1 in /cmdb-ui dependabot[bot] 2020-11-22 02:26:41 +00:00
04e249feac Bump dot-prop from 4.2.0 to 4.2.1 in /cmdb-ui dependabot[bot] 2020-11-22 02:26:41 +00:00
d6731409b5 Merge pull request #55 from pycook/dependabot/npm_and_yarn/cmdb-ui/handlebars-4.7.6 pycook 2020-11-22 10:26:38 +08:00
ef3e6bc6b0 Merge pull request #55 from pycook/dependabot/npm_and_yarn/cmdb-ui/handlebars-4.7.6 pycook 2020-11-22 10:26:38 +08:00
ed279416c8 Merge pull request #56 from pycook/dependabot/npm_and_yarn/cmdb-ui/http-proxy-1.18.1 pycook 2020-11-22 10:25:58 +08:00
d9d5f8f818 Merge pull request #56 from pycook/dependabot/npm_and_yarn/cmdb-ui/http-proxy-1.18.1 pycook 2020-11-22 10:25:58 +08:00
e8ed71afbc Bump http-proxy from 1.17.0 to 1.18.1 in /cmdb-ui dependabot[bot] 2020-09-11 00:19:27 +00:00
578da0807c Bump http-proxy from 1.17.0 to 1.18.1 in /cmdb-ui dependabot[bot] 2020-09-11 00:19:27 +00:00
51321ec86c Bump handlebars from 4.4.5 to 4.7.6 in /cmdb-ui dependabot[bot] 2020-09-10 03:19:57 +00:00
3eb35f5497 Bump handlebars from 4.4.5 to 4.7.6 in /cmdb-ui dependabot[bot] 2020-09-10 03:19:57 +00:00
d73e5e8ef0 Bump quill from 1.3.6 to 1.3.7 in /cmdb-ui dependabot[bot] 2020-09-04 00:38:10 +00:00
9669ad04cd Bump quill from 1.3.6 to 1.3.7 in /cmdb-ui dependabot[bot] 2020-09-04 00:38:10 +00:00
53779e037e Bump elliptic from 6.4.1 to 6.5.3 in /cmdb-ui dependabot[bot] 2020-08-01 08:41:43 +00:00
70214807ca Bump elliptic from 6.4.1 to 6.5.3 in /cmdb-ui dependabot[bot] 2020-08-01 08:41:43 +00:00
5b73f69d60 Merge pull request #51 from pycook/dependabot/npm_and_yarn/cmdb-ui/lodash-4.17.19 pycook 2020-07-21 18:17:46 +08:00
7c1c309f7a Merge pull request #51 from pycook/dependabot/npm_and_yarn/cmdb-ui/lodash-4.17.19 pycook 2020-07-21 18:17:46 +08:00
92637f0537 Bump lodash from 4.17.14 to 4.17.19 in /cmdb-ui dependabot[bot] 2020-07-19 03:35:06 +00:00
9b9799ff5e Bump lodash from 4.17.14 to 4.17.19 in /cmdb-ui dependabot[bot] 2020-07-19 03:35:06 +00:00
6f7b0a3b76 add command: add-user | del-user pycook 2020-06-11 21:37:41 +08:00
b2578b61fa add command: add-user | del-user pycook 2020-06-11 21:37:41 +08:00
647b11734f Merge pull request #49 from pycook/dependabot/npm_and_yarn/cmdb-ui/websocket-extensions-0.1.4 pycook 2020-06-08 18:37:31 +08:00
619f47ae13 Merge pull request #49 from pycook/dependabot/npm_and_yarn/cmdb-ui/websocket-extensions-0.1.4 pycook 2020-06-08 18:37:31 +08:00
e62d71c6c7 Bump websocket-extensions from 0.1.3 to 0.1.4 in /cmdb-ui dependabot[bot] 2020-06-07 15:54:30 +00:00
37c5e31799 Bump websocket-extensions from 0.1.3 to 0.1.4 in /cmdb-ui dependabot[bot] 2020-06-07 15:54:30 +00:00
df90a54ae7 Merge pull request #48 from lovvvve/master pycook 2020-06-01 12:05:05 +08:00
ab70b2a655 Merge pull request #48 from lovvvve/master pycook 2020-06-01 12:05:05 +08:00
4a1ed9be13 fix(sso login): sso login redirect Lovvvve 2020-06-01 12:01:55 +08:00
c285606f4a fix(sso login): sso login redirect Lovvvve 2020-06-01 12:01:55 +08:00
a44be48c7e fix(sso login): sso login redirect Lovvvve 2020-06-01 11:48:21 +08:00
6d3611bd73 fix(sso login): sso login redirect Lovvvve 2020-06-01 11:48:21 +08:00
0da1712343 fix merge conflict pycook 2020-05-28 20:39:47 +08:00
764f6a07e0 fix merge conflict pycook 2020-05-28 20:39:47 +08:00
f5472c7fa8 Readme is in Chinese by default pycook 2020-05-28 20:35:11 +08:00
ae8d487af4 Readme is in Chinese by default pycook 2020-05-28 20:35:11 +08:00
3a9a966a60 update readme pycook 2020-04-10 17:22:33 +08:00
87c6554555 update readme pycook 2020-04-10 17:22:33 +08:00
91647767ed Fix: spelling mistakes pycook 2020-04-01 21:40:51 +08:00
f5671c2a2a Fix: spelling mistakes pycook 2020-04-01 21:40:51 +08:00
e69404bada release version 2.1 pycook 2020-04-01 21:20:47 +08:00
43ad3dfa7b release version 2.1 pycook 2020-04-01 21:20:47 +08:00
332abe223d update readme pycook 2020-04-10 17:22:33 +08:00
29fa17a0b8 update readme pycook 2020-04-10 17:22:33 +08:00
3bb32e1ead Merge branch 'master' of https://github.com/pycook/cmdb pycook 2020-04-07 18:03:03 +08:00
5191d6ed73 Merge branch 'master' of https://github.com/pycook/cmdb pycook 2020-04-07 18:03:03 +08:00
66476ed254 Fix the judgment of app admin pycook 2020-04-07 18:02:26 +08:00
8348f8e7b1 Fix the judgment of app admin pycook 2020-04-07 18:02:26 +08:00
a4eb221199 Fix: spelling mistakes pycook 2020-04-01 21:40:51 +08:00
75c48a0807 Fix: spelling mistakes pycook 2020-04-01 21:40:51 +08:00
3f53eab514 release version 2.1 pycook 2020-04-01 21:20:47 +08:00
5b38385f7e release version 2.1 2.2 pycook 2020-04-01 21:20:47 +08:00
ba2a6a65b5 auth with ldap pycook 2020-04-01 20:30:44 +08:00
036e1d236b auth with ldap pycook 2020-04-01 20:30:44 +08:00
486fcac138 UI: batch update relation pycook 2020-04-01 11:09:41 +08:00
c31be0f753 UI: batch update relation pycook 2020-04-01 11:09:41 +08:00
cf5e4966c0 add .eslintrc.js pycook 2020-03-26 17:35:26 +08:00
764d2fac3f add .eslintrc.js pycook 2020-03-26 17:35:26 +08:00
79536732c1 Merge pull request #42 from pycook/dependabot/npm_and_yarn/cmdb-ui/yarn-1.22.0 pycook 2020-03-26 17:29:53 +08:00
f4079e9c3e Merge pull request #42 from pycook/dependabot/npm_and_yarn/cmdb-ui/yarn-1.22.0 pycook 2020-03-26 17:29:53 +08:00
84b7b53a73 fix: delete attribute pycook 2020-03-23 15:49:33 +08:00
2a0ed72235 fix: delete attribute pycook 2020-03-23 15:49:33 +08:00
6b11b50bd5 Bump yarn from 1.21.1 to 1.22.0 in /cmdb-ui dependabot[bot] 2020-03-22 03:14:30 +00:00
9e803ae4c7 Bump yarn from 1.21.1 to 1.22.0 in /cmdb-ui dependabot[bot] 2020-03-22 03:14:30 +00:00
ccccce262f update deps pycook 2020-03-22 11:14:09 +08:00
bebdb61adf update deps pycook 2020-03-22 11:14:09 +08:00
d4b3e259c8 Merge pull request #41 from pycook/dependabot/npm_and_yarn/cmdb-ui/acorn-5.7.4 pycook 2020-03-15 13:06:51 +08:00
f49cad771b Merge pull request #41 from pycook/dependabot/npm_and_yarn/cmdb-ui/acorn-5.7.4 pycook 2020-03-15 13:06:51 +08:00
450508efee Bump acorn from 5.7.3 to 5.7.4 in /cmdb-ui dependabot[bot] 2020-03-14 18:55:18 +00:00
a5b4fbda40 Bump acorn from 5.7.3 to 5.7.4 in /cmdb-ui dependabot[bot] 2020-03-14 18:55:18 +00:00
8ea0379a0d Fix: permission management pycook 2020-03-13 10:30:21 +08:00
2cce2d5cf2 Fix: permission management pycook 2020-03-13 10:30:21 +08:00
6f320d4440 Merge branch 'develop' of https://github.com/pycook/cmdb into develop pycook 2020-03-10 17:03:23 +08:00
e720b7af66 Merge branch 'develop' of https://github.com/pycook/cmdb into develop pycook 2020-03-10 17:03:23 +08:00
8d7897665e Merge pull request #40 from OhBonsai/develop pycook 2020-03-10 17:01:58 +08:00
09e4a5111b Merge pull request #40 from OhBonsai/develop pycook 2020-03-10 17:01:58 +08:00
1505d9d948 chore: use wait script to hang api before cache/db/es started penzai 2020-03-10 16:49:40 +08:00
3539b12503 chore: use wait script to hang api before cache/db/es started penzai 2020-03-10 16:49:40 +08:00
c0ff2ac5b9 Merge pull request #38 from AngrygrayWolf/dev pycook 2020-03-07 22:06:25 +08:00
21d8673b5d Merge pull request #38 from AngrygrayWolf/dev pycook 2020-03-07 22:06:25 +08:00
a9aff714d1 Change Pipfile what 2020-03-07 21:51:37 +08:00
7154426dc7 Change Pipfile what 2020-03-07 21:51:37 +08:00
040986df20 Change the requirements to support python3.8 what 2020-03-07 21:20:46 +08:00
ca75c7dcd0 Change the requirements to support python3.8 what 2020-03-07 21:20:46 +08:00
9ef6d3e955 fix case sensitive of ES search pycook 2020-02-28 14:32:51 +08:00
194a2254a6 fix case sensitive of ES search 2.1 pycook 2020-02-28 14:32:51 +08:00
28888a04ee Merge branch 'develop' of https://github.com/pycook/cmdb into develop pycook 2020-02-23 23:13:59 +08:00
26abad14d0 Merge branch 'develop' of https://github.com/pycook/cmdb into develop pycook 2020-02-23 23:13:59 +08:00
e7c004fa19 alter table c_preference_relation_views column name varchar(64) pycook 2020-02-23 23:13:22 +08:00
1521a71f9c alter table c_preference_relation_views column name varchar(64) pycook 2020-02-23 23:13:22 +08:00
93c0eefe3c Merge pull request #36 from OhBonsai/develop pycook 2020-02-23 23:12:36 +08:00
d425b455f1 Merge pull request #36 from OhBonsai/develop pycook 2020-02-23 23:12:36 +08:00
84fcbaefb6 version 2.1 and update readme pycook 2020-02-23 20:21:13 +08:00
230307474b version 2.1 and update readme pycook 2020-02-23 20:21:13 +08:00
b9ef7856fe / redirect to /relation_views pycook 2020-02-23 18:53:28 +08:00
69d6b40e39 / redirect to /relation_views pycook 2020-02-23 18:53:28 +08:00
c3b5b30b1f fix i18n pycook 2020-02-23 18:41:23 +08:00
5dc2f89e7f fix i18n pycook 2020-02-23 18:41:23 +08:00
9c47d9c733 add library future pycook 2020-02-21 23:29:20 +08:00
9eaca4d6a0 add library future pycook 2020-02-21 23:29:20 +08:00
c305aaaef6 Remove Chinese comments pycook 2020-02-21 23:14:26 +08:00