 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 |
|
|
xieqiyu
|
e2d3a349cc
|
* Fix bug#29531.
|
2022-11-15 10:55:39 +08:00 |
|
|
xieqiyu
|
6534d1b7ef
|
* Fix bug#29531.
|
2022-11-15 10:27:50 +08:00 |
|
|
lanzongjun
|
4d4b1565f4
|
* finish task #75923#75924
|
2022-11-15 10:23:54 +08:00 |
|
|
liuhong
|
d7f9d55863
|
* Resolved feedback #1422.
|
2022-11-15 02:15:12 +00:00 |
|
|
lanzongjun
|
9cc5139a08
|
* finish task #75919
|
2022-11-15 09:53:24 +08:00 |
|
|
xieqiyu
|
f86b9b0b17
|
* Fix bug#29440.
|
2022-11-15 09:51:31 +08:00 |
|
|
lanzongjun
|
334558b39e
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug
|
2022-11-15 08:44:22 +08:00 |
|
|
mayue
|
72ed3ae227
|
* Fix bug #28832.
|
2022-11-14 17:22:03 +08:00 |
|
|
lanzongjun
|
c512ab0d73
|
* finish task #75912
|
2022-11-14 17:06:33 +08:00 |
|
|
wangyuting
|
9627f33b3b
|
* Fix bug #29711.
|
2022-11-14 08:37:07 +00:00 |
|
|
孙广明
|
df539f3e38
|
Merge branch 'master_xieqiyu_75909' into 'master'
* Fix bug#29441.
See merge request easycorp/zentaopms!6135
|
2022-11-14 06:57:28 +00:00 |
|
|
xieqiyu
|
5ee8a7e1ac
|
* Fix bug#29441.
|
2022-11-14 14:46:19 +08:00 |
|
|
lanzongjun
|
e045ce8322
|
* finish task #75896
|
2022-11-14 11:24:50 +08:00 |
|
|
mayue
|
c92e9f119a
|
* Finish task #75649.
|
2022-11-11 17:02:17 +08:00 |
|
|
xieqiyu
|
38dd19a6c3
|
* Fix bug#29551.
|
2022-11-11 14:34:51 +08:00 |
|
|
wangyidong
|
a5b9f374d1
|
* merge git stash.
|
2022-11-10 15:50:17 +08:00 |
|
|
wangyidong
|
e2cf4aa1be
|
* fix bug #29534.
|
2022-11-10 12:09:14 +08:00 |
|
|
孙广明
|
c49e9f3017
|
Merge branch 'master_xieqiyu_75321' into 'master'
* Finish task#75321.
See merge request easycorp/zentaopms!6086
|
2022-11-09 07:32:07 +00:00 |
|
|
Yagami
|
4610d9ac66
|
* Fix bug #75360.
|
2022-11-09 11:11:18 +08:00 |
|
|
xieqiyu
|
abe047ee58
|
* Finish task#75321.
|
2022-11-09 03:07:57 +00:00 |
|