 孙广明
|
cfc43ece4f
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76483
See merge request easycorp/zentaopms!6271
|
2022-11-21 02:59:58 +00:00 |
|
|
lanzongjun
|
8b84363de8
|
* Fix task #76483
|
2022-11-21 10:58:48 +08:00 |
|
|
王怡栋
|
d9e22f5976
|
* fix bug #29670.
|
2022-11-21 10:48:07 +08:00 |
|
|
孙广明
|
6d9a360ef2
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76458
See merge request easycorp/zentaopms!6269
|
2022-11-21 02:38:46 +00:00 |
|
|
lanzongjun
|
4dce7205ac
|
* Fix task #76458
|
2022-11-21 10:36:28 +08:00 |
|
|
xieqiyu
|
bdb570c00e
|
* Fix bug#29461.
|
2022-11-21 09:43:56 +08:00 |
|
|
王怡栋
|
e55339258b
|
Merge branch 'master_feedback_1353' into 'master'
* Resolved feedback #1353.
See merge request easycorp/zentaopms!6015
|
2022-11-21 01:16:39 +00:00 |
|
|
王怡栋
|
40e9827d45
|
Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug
See merge request easycorp/zentaopms!6260
|
2022-11-18 08:29:41 +00:00 |
|
|
王怡栋
|
d8f5a8bb60
|
Merge branch 'tianshujie_css' into 'master'
* Modify the execution name width problem in the execution list.
See merge request easycorp/zentaopms!6253
|
2022-11-18 07:23:13 +00:00 |
|
|
王怡栋
|
28f7de276c
|
Merge branch 'master_xieqiyu_76490' into 'master'
* Fix bug#29677.
See merge request easycorp/zentaopms!6252
|
2022-11-18 07:22:17 +00:00 |
|
|
王怡栋
|
abfdcaa4f5
|
Merge branch 'zentaopms_261_bug_#29948' into 'master'
* Fix bug #29948.
See merge request easycorp/zentaopms!6247
|
2022-11-18 07:19:49 +00:00 |
|
|
王怡栋
|
c291211ac9
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76459
See merge request easycorp/zentaopms!6246
|
2022-11-18 07:19:36 +00:00 |
|
|
xieqiyu
|
de8cfb9fec
|
* Fix bug#29997.
|
2022-11-18 15:19:18 +08:00 |
|
|
lanzongjun
|
0b2bb1a273
|
* Fix bug #29442#29695
|
2022-11-18 15:18:57 +08:00 |
|
|
lanzongjun
|
35fd254797
|
* Fix bug create execution
|
2022-11-18 14:57:52 +08:00 |
|
|
tianshujie
|
6faaaf865c
|
* Fix bug #29847.
|
2022-11-18 14:24:41 +08:00 |
|
|
tianshujie
|
22b1c539f6
|
* Modify the execution name width problem in the execution list.
|
2022-11-18 14:00:34 +08:00 |
|
|
daitingting
|
8bc0455d36
|
* Fix bug #29948.
|
2022-11-18 03:21:58 +00:00 |
|
|
daitingting
|
ef60d89f47
|
* Fix bug #29653.
|
2022-11-18 02:55:33 +00:00 |
|
|
lanzongjun
|
ccbf2ee9eb
|
* Fix task #76414
|
2022-11-18 09:59:39 +08:00 |
|
|
lanzongjun
|
85a5d00a53
|
* Fix bug #29947
|
2022-11-17 16:03:27 +08:00 |
|
|
lanzongjun
|
6b7b4ae6c2
|
* Fix task #76409
|
2022-11-17 10:06:22 +08:00 |
|
|
孙广明
|
46a1701d05
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# module/project/lang/de.php
# module/project/lang/en.php
# module/project/lang/fr.php
|
2022-11-16 08:29:00 +00:00 |
|
|
lanzongjun
|
d07579f5eb
|
* fix bug #29877#29878
|
2022-11-16 15:52:08 +08:00 |
|
|
王怡栋
|
e969873a84
|
Merge branch 'zentaopms_258_bug#29692' into 'master'
* Fix bug #29692.
See merge request easycorp/zentaopms!6190
|
2022-11-16 07:26:48 +00:00 |
|
|
王怡栋
|
dfbe3f202e
|
Merge branch 'zentaopms_258_bug#29704' into 'master'
* Fix bug #29704.
See merge request easycorp/zentaopms!6189
|
2022-11-16 07:26:31 +00:00 |
|
|
lanzongjun
|
a628acfd0b
|
fix code error
|
2022-11-16 13:52:56 +08:00 |
|
|
wangyuting
|
eb8f8bac5e
|
* Fix bug #29692.
|
2022-11-16 05:29:40 +00:00 |
|
|
wangyuting
|
594e24f884
|
* Fix bug #29704.
|
2022-11-16 05:19:19 +00:00 |
|
|
lanzongjun
|
22fe166499
|
* finish task #76402
|
2022-11-16 10:36:12 +08:00 |
|
|
王怡栋
|
5a11d47992
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75921
See merge request easycorp/zentaopms!6176
|
2022-11-16 02:04:10 +00:00 |
|
|
caoyanyi
|
4d90d01042
|
* Fix bug #29835.
|
2022-11-16 09:38:27 +08:00 |
|
|
lanzongjun
|
b18918ad22
|
* finish task #75921
|
2022-11-16 09:36:11 +08:00 |
|
|
lanzongjun
|
2f7e39685c
|
* finish task #75921
|
2022-11-16 09:34:31 +08:00 |
|
|
王怡栋
|
6fc2d1bd23
|
Merge branch 'master_feedback_1422' into 'master'
* Resolved feedback #1422.
See merge request easycorp/zentaopms!6160
|
2022-11-15 08:31:10 +00:00 |
|
|
王怡栋
|
ab5e0d9b4a
|
Merge branch 'master' into 'sprint/master_lanzongjun_fixbug'
# Conflicts:
# module/execution/control.php
|
2022-11-15 08:26:48 +00:00 |
|
|
王怡栋
|
1890c90011
|
Merge branch 'zentaopms_258_bug#29694' into 'master'
* Fix bug #29694.
See merge request easycorp/zentaopms!6161
|
2022-11-15 08:18:56 +00:00 |
|
|
王怡栋
|
a3329783e3
|
Merge branch 'zentaopms_258_bug#29735' into 'master'
* Fix bug #29735.
See merge request easycorp/zentaopms!6158
|
2022-11-15 08:15:50 +00:00 |
|
|
王怡栋
|
bcf50feeaa
|
Merge branch 'zentaopms_258_bug#29759' into 'master'
* Fix bug #29759.
See merge request easycorp/zentaopms!6156
|
2022-11-15 08:15:27 +00:00 |
|
|
孙广明
|
093069f5eb
|
Merge branch 'master_xieqiyu_75910' into 'master'
* Fix bug#29440.
See merge request easycorp/zentaopms!6148
|
2022-11-15 08:13:37 +00:00 |
|
|
lanzongjun
|
df7841c7b7
|
* finish task #75920
|
2022-11-15 15:50:05 +08:00 |
|
|
lanzongjun
|
0e6c9a88d3
|
* finish task #76330
|
2022-11-15 15:23:49 +08:00 |
|
|
mayue
|
cd7a5fd390
|
* Fix bug #29725.
|
2022-11-15 15:12:15 +08:00 |
|
|
lanzongjun
|
c155808a69
|
fix code error
|
2022-11-15 14:29:27 +08:00 |
|
|
wangyuting
|
dfdcc78206
|
* Optimize code.
|
2022-11-15 06:17:36 +00:00 |
|
|
wangyuting
|
dcd256203a
|
* Fix bug #29735.
|
2022-11-15 06:15:10 +00:00 |
|
|
wangyuting
|
0afdea4382
|
* Fix bug #29759.
|
2022-11-15 05:50:07 +00:00 |
|
|
王怡栋
|
4a18ef985d
|
Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75912#75908#75904#75919#75923#75924#76338
See merge request easycorp/zentaopms!6142
|
2022-11-15 05:39:37 +00:00 |
|
|
wangyuting
|
aed6871cd8
|
* Fix bug #29694.
|
2022-11-15 05:20:46 +00:00 |
|
|
王怡栋
|
66be15c00f
|
* fix bug #29736.
|
2022-11-15 11:13:04 +08:00 |
|