 liyuchun
|
e7670537f9
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-09-20 14:19:17 +08:00 |
|
|
liyuchun
|
4b28589ed3
|
* Fix wrong table name.
|
2022-09-20 14:18:52 +08:00 |
|
|
李玉春
|
d52c11eea8
|
Merge branch 'zenops_46_wangjianhua_68708' into 'zenops_46'
Fix sql error
See merge request easycorp/zentaopms!5422
|
2022-09-20 05:03:56 +00:00 |
|
|
wangjianhua
|
2317357594
|
* Fix sql error.
|
2022-09-20 11:53:02 +08:00 |
|
|
liyuchun
|
bf10b415df
|
Merge branch 'zenops_44' into zenops_46
|
2022-09-20 08:33:44 +08:00 |
|
|
liyuchun
|
db22664fbc
|
Merge branch 'master' into zenops_46
|
2022-09-20 08:22:38 +08:00 |
|
|
liyuchun
|
aa227a548f
|
* Adjust host api.
|
2022-09-19 21:09:17 +08:00 |
|
|
李玉春
|
4a0fe3fc6f
|
Merge branch 'zenops_46_wangjianhua_68709' into 'zenops_46'
Finish task #68709: delete VM template.
See merge request easycorp/zentaopms!5396
|
2022-09-19 12:42:38 +00:00 |
|
|
孙广明
|
2a17a2c345
|
Merge branch 'zenops_liyuchun_executionnode' into 'zenops_46'
* Finish task #68711.
See merge request easycorp/zentaopms!5399
|
2022-09-19 09:24:43 +00:00 |
|
|
孙广明
|
995653a760
|
Merge branch 'mayue_fix_bug#27535' into 'master'
* Fix bug #27535.
See merge request easycorp/zentaopms!5406
|
2022-09-19 09:24:09 +00:00 |
|
|
孙广明
|
9dca9eb0e1
|
Merge branch 'feedback_zhouxin_254' into 'master'
* Solve feedback #254.
See merge request easycorp/zentaopms!5413
|
2022-09-19 09:23:18 +00:00 |
|
|
zhouxin
|
55dd069752
|
* Solve feedback #254.
|
2022-09-19 16:58:56 +08:00 |
|
|
wangjianhua
|
d4a406b063
|
* Fix wrong privileges.
|
2022-09-19 16:36:41 +08:00 |
|
|
wangjianhua
|
fca1d29e20
|
* Change die() to print().
|
2022-09-19 16:18:47 +08:00 |
|
|
李玉春
|
ed4a647336
|
Merge branch 'zenops_46_wangjianhua_68708' into 'zenops_46'
Finish task #68708: edit VM template
See merge request easycorp/zentaopms!5390
|
2022-09-19 07:58:36 +00:00 |
|
|
李玉春
|
a2a62c58a7
|
Merge branch 'ta_liyang' into 'master'
* Fix user password.
See merge request easycorp/zentaopms!5403
|
2022-09-19 07:57:36 +00:00 |
|
|
liyang
|
5d61e777bd
|
* Fix user password.
|
2022-09-19 07:36:19 +00:00 |
|
|
wangjianhua
|
bceb918a64
|
Merge branch 'zenops_46_wangjianhua_68708' into zenops_46_wangjianhua_68709
|
2022-09-19 15:09:33 +08:00 |
|
|
wangjianhua
|
a0b40264c6
|
* Modify defalult value of variable.
|
2022-09-19 15:06:30 +08:00 |
|
|
liyuchun
|
4057bf55a2
|
* Add auth.
|
2022-09-19 14:51:37 +08:00 |
|
|
wangjianhua
|
91c4870580
|
Merge branch 'zenops_45_wangjianhua_68708' into zenops_46_wangjianhua_68709
|
2022-09-19 14:46:34 +08:00 |
|
|
wangjianhua
|
e61cf8eea0
|
* Remove space letter.
|
2022-09-19 14:45:18 +08:00 |
|
|
liyuchun
|
327952a5c6
|
* Delete unused file.
|
2022-09-19 14:42:57 +08:00 |
|
|
liyuchun
|
b348850046
|
* Finish task #68711.
|
2022-09-19 14:38:07 +08:00 |
|
|
李玉春
|
b79de55fc6
|
Merge branch 'cyy_bug_import' into 'master'
* Modify bug import.
See merge request easycorp/zentaopms!5398
|
2022-09-19 06:22:19 +00:00 |
|
|
李玉春
|
e5b693af5e
|
Merge branch 'dht_unittest' into 'master'
* Fix set null qusetion.
See merge request easycorp/zentaopms!5386
|
2022-09-19 06:21:47 +00:00 |
|
|
曹延义
|
4b5987fd29
|
* Modify bug import.
|
2022-09-19 14:17:13 +08:00 |
|
|
wangjianhua
|
fc7f0e6e64
|
* Finish task #68709: delete VM template.
|
2022-09-19 14:09:10 +08:00 |
|
|
wangjianhua
|
330a995630
|
* Modify lang items and add privileges.
|
2022-09-19 14:00:01 +08:00 |
|
|
mayue
|
f206391ee6
|
* Fix bug #27535.
|
2022-09-19 13:54:34 +08:00 |
|
|
wangyidong
|
47a855e35f
|
Merge branch 'sprint/wangyidong_bug'
|
2022-09-19 13:48:27 +08:00 |
|
|
王怡栋
|
a86c5da4fe
|
Merge branch 'feedback_835' into 'master'
* Code for feedback#835
See merge request easycorp/zentaopms!5355
|
2022-09-19 05:43:09 +00:00 |
|
|
王怡栋
|
e067e74363
|
Merge branch 'feedback_878' into 'master'
* Code for feedback#878
See merge request easycorp/zentaopms!5316
|
2022-09-19 05:38:18 +00:00 |
|
|
王怡栋
|
fea946a6d0
|
Merge branch 'master_xieqiyu_27528' into 'master'
* Fix bug#27528.
See merge request easycorp/zentaopms!5384
|
2022-09-19 05:37:47 +00:00 |
|
|
王怡栋
|
ecdce29687
|
Merge branch 'master_liuhong_27291' into 'master'
Master liuhong 27291
See merge request easycorp/zentaopms!5385
|
2022-09-19 05:37:25 +00:00 |
|
|
王怡栋
|
0801b4a668
|
Merge branch 'master_liuhong_27183' into 'master'
Master liuhong 27183
See merge request easycorp/zentaopms!5388
|
2022-09-19 05:36:46 +00:00 |
|
|
wangjianhua
|
7effb6d349
|
Merge branch 'zenops_46' into zenops_46_wangjianhua_68708
|
2022-09-19 11:25:01 +08:00 |
|
|
wangjianhua
|
f9f4e51862
|
* Finish task #68708: edit VM template.
|
2022-09-19 11:22:22 +08:00 |
|
|
liuhong
|
624c000f7d
|
*Fix bug #27183 for newline when kanban create task.
|
2022-09-19 02:15:34 +00:00 |
|
|
denghongtao
|
86f4412952
|
* Fix set null qusetion.
|
2022-09-19 00:57:08 +00:00 |
|
|
liuhong
|
c3a1bedeef
|
*Fix bug #27291.
|
2022-09-19 00:27:43 +00:00 |
|
|
李玉春
|
e6457d0fc9
|
Merge branch 'zenops_46_wangjianhua_68266' into 'zenops_46'
* Fix host ID.
See merge request easycorp/zentaopms!5383
|
2022-09-19 00:27:28 +00:00 |
|
|
xieqiyu
|
104787503b
|
* Fix bug#27528.
|
2022-09-19 00:19:56 +00:00 |
|
|
wangjianhua
|
0657bf31ba
|
* Edit VM template.
|
2022-09-18 23:50:58 +08:00 |
|
|
liuhong
|
3c27ea607f
|
*Fix bug #27291 for show duplicate requirements.
|
2022-09-18 13:21:03 +00:00 |
|
|
wangjianhua
|
641dc1a8b3
|
* Fix host ID.
|
2022-09-16 23:38:57 +08:00 |
|
|
liyuchun
|
ca672078b7
|
* Fix error when create vm template.
|
2022-09-16 15:58:54 +08:00 |
|
|
liyuchun
|
8f1735de1b
|
* Add field to zt_host.
|
2022-09-16 15:47:46 +08:00 |
|
|
liyuchun
|
62c6b45d70
|
* Add function to select template.
|
2022-09-16 15:47:10 +08:00 |
|
|
李玉春
|
118b4469a0
|
Merge branch 'zenops_46_wangjianhua_68266' into 'zenops_46'
Load image list by ajax.
See merge request easycorp/zentaopms!5380
|
2022-09-16 07:23:45 +00:00 |
|