 tanghucheng
|
cd0454845e
|
Merge branch 'zenops_46' into zenops_46_tanghucheng
|
2022-11-29 14:25:20 +08:00 |
|
|
tanghucheng
|
ab9f2812e0
|
Merge branch 'zenops_46' into zenops_46_tanghucheng
|
2022-11-29 14:20:45 +08:00 |
|
|
caoyanyi
|
a74718a48e
|
Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46
|
2022-11-29 13:31:08 +08:00 |
|
|
caoyanyi
|
faad718cad
|
* Validate data of zahost before create it.
|
2022-11-29 13:30:44 +08:00 |
|
|
caoyanyi
|
39cbc4f2b5
|
* Modify style for repo relation.
|
2022-11-29 13:23:50 +08:00 |
|
|
Yagami
|
884bbd7fdf
|
Merge branch 'zenops_46_tanghucheng' into zenops_46
|
2022-11-29 09:39:50 +08:00 |
|
|
唐胡成
|
90155c3eea
|
Merge branch 'zenops_46' into 'zenops_46_tanghucheng'
# Conflicts:
# module/zanode/view/view.html.php
|
2022-11-29 01:38:30 +00:00 |
|
|
tanghucheng
|
d631c980c3
|
* Merge branch 'zenops_46_tanghucheng' into zenops_46.
|
2022-11-29 09:36:26 +08:00 |
|
|
tanghucheng
|
b2ae4e15a1
|
* Code for task #76213.
|
2022-11-29 09:13:53 +08:00 |
|
|
caoyanyi
|
8c97159cdc
|
Merge branch 'master' into zenops_46
|
2022-11-29 08:31:29 +08:00 |
|
|
caoyanyi
|
d433567f98
|
* Adjust codes.
|
2022-11-28 17:15:44 +08:00 |
|
|
caoyanyi
|
a4f16ed9be
|
* Optimize repo page style.
|
2022-11-28 17:11:53 +08:00 |
|
|
王怡栋
|
7a3a07061e
|
Merge branch 'cyy_repo' into 'master'
* Modify git branh check.
See merge request easycorp/zentaopms!6393
|
2022-11-28 08:38:14 +00:00 |
|
|
王怡栋
|
31a54fcc24
|
Merge branch 'zentaopms_266_task_#77605' into 'master'
* Finish task #77605.
See merge request easycorp/zentaopms!6396
|
2022-11-28 08:37:57 +00:00 |
|
|
王怡栋
|
3c8bd022d4
|
Merge branch 'zentaopms_266_task#77611' into 'master'
* Finish task #77611.
See merge request easycorp/zentaopms!6392
|
2022-11-28 08:37:00 +00:00 |
|
|
王怡栋
|
b389198bea
|
Merge branch 'sprint/hufangzhou_feedback_1479' into 'master'
* Handle feedback #1479.
See merge request easycorp/zentaopms!6391
|
2022-11-28 08:36:37 +00:00 |
|
|
daitingting
|
7025eeb91e
|
* Finish task #77605.
|
2022-11-28 08:09:10 +00:00 |
|
|
孙广明
|
d4f5170391
|
Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46'
Zenops 46 zhaoke 74993
See merge request easycorp/zentaopms!6395
|
2022-11-28 06:58:42 +00:00 |
|
|
孙广明
|
d5110488b3
|
Merge branch 'lyk_feedback_1459' into 'master'
* Resolve feedback #1459.
See merge request easycorp/zentaopms!6394
|
2022-11-28 06:58:01 +00:00 |
|
|
liuyongkai
|
9455b09e17
|
* Resolve feedback #1459.
|
2022-11-28 14:55:02 +08:00 |
|
|
zhaoke
|
fcf2169b20
|
Fix indent
|
2022-11-28 06:43:28 +00:00 |
|
|
liuyongkai
|
64fb4c10ca
|
* Resolve feedback #1459.
|
2022-11-28 14:15:58 +08:00 |
|
|
caoyanyi
|
591f4ab7b1
|
* Adjust code.
|
2022-11-28 13:30:32 +08:00 |
|
|
caoyanyi
|
b5c140fa52
|
* Modify git branh check.
|
2022-11-28 13:29:22 +08:00 |
|
|
caoyanyi
|
c492a7d238
|
* Otimize editor style.
|
2022-11-28 13:28:22 +08:00 |
|
|
wangyuting
|
fc51e379f0
|
* Finish task #77611.
|
2022-11-28 05:22:22 +00:00 |
|
|
hufangzhou
|
d839f6f593
|
* Handle feedback #1479.
|
2022-11-28 05:10:00 +00:00 |
|
|
王怡栋
|
3c9b13d794
|
Merge branch 'sprint/wangzemei/green' into 'master'
* Green theme: fix the background image width
See merge request easycorp/zentaopms!6390
|
2022-11-28 03:22:36 +00:00 |
|
|
wangzemei
|
4412e7e888
|
* Green theme: fix the background image width
|
2022-11-28 11:11:12 +08:00 |
|
|
caoyanyi
|
fc95313a40
|
Merge branch 'master' into zenops_46
|
2022-11-28 08:41:37 +08:00 |
|
|
孙广明
|
f4286ebdc0
|
Merge branch 'master_xieqiyu_30277' into 'master'
* Fix bug#30277.
See merge request easycorp/zentaopms!6387
zentaopms_18.0.beta1
|
2022-11-25 09:55:24 +00:00 |
|
|
胡方舟
|
13448090a3
|
Merge branch 'zentaopms_263_wangyuting' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!6388
|
2022-11-25 09:52:30 +00:00 |
|
|
wangyuting
|
88f5f0dd3b
|
* Fix bug.
|
2022-11-25 09:47:27 +00:00 |
|
|
xieqiyu
|
679fe9d5f2
|
* Fix bug#30277.
|
2022-11-25 16:24:54 +08:00 |
|
|
zhaoke
|
1918eba8f4
|
* Fix issue.
|
2022-11-25 08:21:18 +00:00 |
|
|
王怡栋
|
3707c77b53
|
Merge branch 'tanghucheng_fixbug' into 'master'
* Fix bug #30282.
See merge request easycorp/zentaopms!6386
|
2022-11-25 08:14:24 +00:00 |
|
|
tanghucheng
|
8f20075c51
|
* Fix bug #30282.
|
2022-11-25 16:12:51 +08:00 |
|
|
王怡栋
|
c4b3e8d18a
|
* code for bug #devops.
|
2022-11-25 15:57:52 +08:00 |
|
|
王怡栋
|
46d98dcada
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-25 15:56:16 +08:00 |
|
|
王怡栋
|
a14dc11193
|
* fix bug #30271.
|
2022-11-25 15:55:07 +08:00 |
|
|
王怡栋
|
593c7d41b2
|
Merge branch 'zentaopms_263_bug_#30020' into 'master'
* Fix bug #30020.
See merge request easycorp/zentaopms!6385
|
2022-11-25 07:40:55 +00:00 |
|
|
daitingting
|
a2aa5c325a
|
* Fix bug #30020.
|
2022-11-25 07:36:53 +00:00 |
|
|
孙广明
|
33f1b35873
|
Merge branch 'master_xieqiyu_code' into 'master'
* Delete unused code.
See merge request easycorp/zentaopms!6384
|
2022-11-25 07:14:56 +00:00 |
|
|
王怡栋
|
647547faac
|
* fix for upgrade.
|
2022-11-25 15:13:23 +08:00 |
|
|
xieqiyu
|
79a9c38403
|
* Delete unused code.
|
2022-11-25 15:11:54 +08:00 |
|
|
Yagami
|
83a76c2636
|
* Fix execution list bug.
|
2022-11-25 14:47:13 +08:00 |
|
|
zhaoke
|
895513ff33
|
* Fix bug.
|
2022-11-25 06:33:52 +00:00 |
|
|
zhaoke
|
83b5cbd8dd
|
* Fix error.
|
2022-11-25 06:20:08 +00:00 |
|
|
zhaoke
|
38f77f0ae4
|
* Remve unused code.
|
2022-11-25 06:17:10 +00:00 |
|
|
Yagami
|
545b81abe7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-11-25 14:10:22 +08:00 |
|