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

#69

#71

#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

Mono Color

• 82c921bb88 auth: add user in flask.g when auth by jwt penzai 2020-02-16 18:02:24 +0800
• bc72e58886 auth: add user in flask.g when auth by jwt penzai 2020-02-16 18:02:24 +0800
• f40d6924aa auth: add user in flask.g when auth by jwt penzai 2020-02-16 18:02:24 +0800
• d975aceaab ACL i18n pycook 2020-02-16 17:36:03 +0800
• 9e78955ba1 ACL i18n pycook 2020-02-16 17:36:03 +0800
• 00f1035cd2 ACL i18n pycook 2020-02-16 17:36:03 +0800
• a188218818 Merge pull request #33 from shaohaojiecoder/i18n pycook 2020-02-16 14:51:59 +0800
• 136853d9a4 Merge pull request #33 from shaohaojiecoder/i18n pycook 2020-02-16 14:51:59 +0800
• 616c1df0b4
  Merge pull request #33 from shaohaojiecoder/i18n pycook 2020-02-16 14:51:59 +0800
• 1484a308cf modeling i18n pycook 2020-02-16 14:50:17 +0800
• 036e3ad00d modeling i18n pycook 2020-02-16 14:50:17 +0800
• 69d43806f5 modeling i18n pycook 2020-02-16 14:50:17 +0800
• ea0a7df472 fix local storage for defalut lang shaohaojiecoder 2020-02-16 13:47:30 +0800
• 5ce6c93237 fix local storage for defalut lang shaohaojiecoder 2020-02-16 13:47:30 +0800
• 084d2e2993 fix local storage for defalut lang shaohaojiecoder 2020-02-16 13:47:30 +0800
• b4de2bdb9e Merge pull request #32 from OhBonsai/develop pycook 2020-02-16 10:38:27 +0800
• 43dba7f7ed Merge pull request #32 from OhBonsai/develop pycook 2020-02-16 10:38:27 +0800
• c6fd02b07c
  Merge pull request #32 from OhBonsai/develop pycook 2020-02-16 10:38:27 +0800
• d2f3589154 fix: recycle import by celery task penzai 2020-02-16 09:39:33 +0800
• f4879d20d6 fix: recycle import by celery task penzai 2020-02-16 09:39:33 +0800
• da0d2595cd fix: recycle import by celery task penzai 2020-02-16 09:39:33 +0800
• 07d2af6671 i18n pycook 2020-02-15 20:57:05 +0800
• 740e4c6034 i18n pycook 2020-02-15 20:57:05 +0800
• 0875a0c644 i18n pycook 2020-02-15 20:57:05 +0800
• acf881dcb7 Merge pull request #31 from shaohaojiecoder/i18n pycook 2020-02-11 09:50:50 +0800
• 0f2baa1d94 Merge pull request #31 from shaohaojiecoder/i18n pycook 2020-02-11 09:50:50 +0800
• 7f9d990381
  Merge pull request #31 from shaohaojiecoder/i18n pycook 2020-02-11 09:50:50 +0800
• cd0797e860 Merge branch 'develop' into i18n pycook 2020-02-11 09:50:11 +0800
• 405b0af72c Merge branch 'develop' into i18n pycook 2020-02-11 09:50:11 +0800
• ba99e5758c
  Merge branch 'develop' into i18n pycook 2020-02-11 09:50:11 +0800
• 328d678455 fix meta title shaohaojiecoder 2020-02-09 19:50:23 +0800
• a4e5178979 fix meta title shaohaojiecoder 2020-02-09 19:50:23 +0800
• af96a724b5 fix meta title shaohaojiecoder 2020-02-09 19:50:23 +0800
• 4e0dc1282f add i18n basic structure shaohaojiecoder 2020-02-09 17:54:57 +0800
• c14fe23283 add i18n basic structure shaohaojiecoder 2020-02-09 17:54:57 +0800
• 43a1149055 add i18n basic structure shaohaojiecoder 2020-02-09 17:54:57 +0800
• e336b31902 add something shaohaojiecoder 2020-02-09 17:22:17 +0800
• b3a058f908 add something shaohaojiecoder 2020-02-09 17:22:17 +0800
• 1434b0a0dc add something shaohaojiecoder 2020-02-09 17:22:17 +0800
• f6c3edfac1 add some shaohaojiecoder 2020-02-08 22:27:56 +0800
• bd82a0e27c add some shaohaojiecoder 2020-02-08 22:27:56 +0800
• f1d14d6c68 add some shaohaojiecoder 2020-02-08 22:27:56 +0800
• e7f856fecd Define display fields pycook 2020-02-08 17:39:42 +0800
• f22a5c3543 Define display fields pycook 2020-02-08 17:39:42 +0800
• b043a27b1b Define display fields pycook 2020-02-08 17:39:42 +0800
• 780c51c364 Define display fields pycook 2020-02-08 17:36:54 +0800
• ed81c3f091 Define display fields pycook 2020-02-08 17:36:54 +0800
• 12345f8963 Define display fields pycook 2020-02-08 17:36:54 +0800
• ba142266fb add basic shaohaojiecoder 2020-02-07 22:05:52 +0800
• 07814b85f9 add basic shaohaojiecoder 2020-02-07 22:05:52 +0800
• e79f5e008c add basic shaohaojiecoder 2020-02-07 22:05:52 +0800
• aa10b0d8b4 update cmdb.sql pycook 2020-02-06 13:41:16 +0800
• 87deba2e46 fix jwt decode pycook 2020-02-06 09:59:24 +0800
• db52b28d6b fix jwt decode pycook 2020-02-06 09:59:24 +0800
• f86a0b49d5 fix jwt decode pycook 2020-02-06 09:59:24 +0800
• 048f556936 Merge pull request #29 from OhBonsai/master pycook 2020-02-04 12:47:15 +0800
• fc85ba21c8 Merge pull request #29 from OhBonsai/master pycook 2020-02-04 12:47:15 +0800
• 39d13d1993
  Merge pull request #29 from OhBonsai/master pycook 2020-02-04 12:47:15 +0800
• 90a97402ef Merge pull request #2 from pycook/master Bonsai 2020-02-04 10:56:03 +0800
• 6c5ee3fcd9 Merge pull request #2 from pycook/master Bonsai 2020-02-04 10:56:03 +0800
• 0d23731bd4
  Merge pull request #2 from pycook/master Bonsai 2020-02-04 10:56:03 +0800
• 362122952b test: add ci_type test cases penzai 2020-02-04 10:54:16 +0800
• 40f1ef88a9 test: add ci_type test cases penzai 2020-02-04 10:54:16 +0800
• 32cb3f82db test: add ci_type test cases penzai 2020-02-04 10:54:16 +0800
• 00f4eeb90d fix: update attribute group without name params will fail. #tests/test_cmdb_ci_type.py::test_update_attribute_group_ci_type penzai 2020-02-04 10:53:07 +0800
• bce422ffc8 fix: update attribute group without name params will fail. #tests/test_cmdb_ci_type.py::test_update_attribute_group_ci_type penzai 2020-02-04 10:53:07 +0800
• 1883047e3c fix: update attribute group without name params will fail. #tests/test_cmdb_ci_type.py::test_update_attribute_group_ci_type penzai 2020-02-04 10:53:07 +0800
• 5da5d32b54 Merge branch 'master' of https://github.com/pycook/cmdb pycook 2020-01-19 18:18:43 +0800
• 7c79066532 Merge branch 'master' of https://github.com/pycook/cmdb pycook 2020-01-19 18:18:43 +0800
• 717ef3255e Merge branch 'master' of https://github.com/pycook/cmdb pycook 2020-01-19 18:18:43 +0800
• d49cd99881 Merge pull request #28 from shaohaojiecoder/master pycook 2020-01-19 18:18:23 +0800
• 1129ac93fb Merge pull request #28 from shaohaojiecoder/master pycook 2020-01-19 18:18:23 +0800
• aa38f41d8c
  Merge pull request #28 from shaohaojiecoder/master pycook 2020-01-19 18:18:23 +0800
• 680a547df4 fix drag group and attrs haojie.shao 2020-01-19 18:14:53 +0800
• 5ab0e7e737 fix drag group and attrs haojie.shao 2020-01-19 18:14:53 +0800
• 901e3f7a9f fix drag group and attrs haojie.shao 2020-01-19 18:14:53 +0800
• ea712bcf9f merge fix haojie.shao 2020-01-19 18:03:39 +0800
• 356cf58135 /ci_types/<int:type_id>/attributes/transfer and /ci_types/<int:type_id>/attribute_groups/transfer pycook 2020-01-19 17:59:32 +0800
• 23319c7417 /ci_types/<int:type_id>/attributes/transfer and /ci_types/<int:type_id>/attribute_groups/transfer pycook 2020-01-19 17:59:32 +0800
• bf43d7c069 /ci_types/<int:type_id>/attributes/transfer and /ci_types/<int:type_id>/attribute_groups/transfer pycook 2020-01-19 17:59:32 +0800
• 58af9d6bee merge origin haojie.shao 2020-01-19 17:58:25 +0800
• 28ff27c019 Merge pull request #26 from OhBonsai/master pycook 2020-01-17 15:34:02 +0800
• c74f85cabb Merge pull request #26 from OhBonsai/master pycook 2020-01-17 15:34:02 +0800
• 691053a40e
  Merge pull request #26 from OhBonsai/master pycook 2020-01-17 15:34:02 +0800
• bb9d7da435 Merge remote-tracking branch 'origin/master' penzai 2020-01-17 15:10:16 +0800
• fce2b689fb Merge remote-tracking branch 'origin/master' penzai 2020-01-17 15:10:16 +0800
• 6d04da776f Merge remote-tracking branch 'origin/master' penzai 2020-01-17 15:10:16 +0800
• 1fa9bf8880 test: add basic test code and attribute create api test case penzai 2020-01-17 15:08:46 +0800
• 105327bb0c test: add basic test code and attribute create api test case penzai 2020-01-17 15:08:46 +0800
• 35590141f6 test: add basic test code and attribute create api test case penzai 2020-01-17 15:08:46 +0800
• 75bf42ea3c Merge pull request #1 from pycook/master Bonsai 2020-01-17 10:05:05 +0800
• 745c43d0a4 Merge pull request #1 from pycook/master Bonsai 2020-01-17 10:05:05 +0800
• d65b9a0816
  Merge pull request #1 from pycook/master Bonsai 2020-01-17 10:05:05 +0800
• 5931e9879b [fix] cycle import pycook 2020-01-15 11:52:33 +0800
• 3130d94568 [fix] cycle import pycook 2020-01-15 11:52:33 +0800
• cbfca6f046 [fix] cycle import pycook 2020-01-15 11:52:33 +0800
• d82dc10451 flush cache when delete attribute pycook 2020-01-15 09:06:31 +0800
• 04a66eb239 flush cache when delete attribute pycook 2020-01-15 09:06:31 +0800
• bd48cd139e flush cache when delete attribute pycook 2020-01-15 09:06:31 +0800
• 705f4916b9 [fix] delete CIType's attribute pycook 2020-01-14 20:52:36 +0800