xieqiyu
|
79a9c38403
|
* Delete unused code.
|
2022-11-25 15:11:54 +08:00 |
|
wangyuting
|
6a445b8a42
|
* Fix bug #29566.
|
2022-11-25 01:48:56 +00:00 |
|
lanzongjun
|
13d7490288
|
* Fix Task #77263
|
2022-11-23 09:39:10 +08:00 |
|
lanzongjun
|
1d4a337af8
|
* Fix Task #77262
|
2022-11-22 16:49:32 +08:00 |
|
Yagami
|
a9bc199c38
|
* Finish task #77279.
|
2022-11-22 13:53:40 +08:00 |
|
lanzongjun
|
8b84363de8
|
* Fix task #76483
|
2022-11-21 10:58:48 +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 |
|
daitingting
|
ef60d89f47
|
* Fix bug #29653.
|
2022-11-18 02:55:33 +00: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 |
|
王怡栋
|
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 |
|
王怡栋
|
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 |
|
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 |
|
王怡栋
|
66be15c00f
|
* fix bug #29736.
|
2022-11-15 11:13:04 +08:00 |
|
liuhong
|
d7f9d55863
|
* Resolved feedback #1422.
|
2022-11-15 02:15:12 +00:00 |
|
lanzongjun
|
c512ab0d73
|
* finish task #75912
|
2022-11-14 17:06:33 +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 |
|
Yagami
|
4610d9ac66
|
* Fix bug #75360.
|
2022-11-09 11:11:18 +08:00 |
|
wangyidong
|
b32f2af9b7
|
* code for task #75236.
|
2022-11-09 10:30:30 +08:00 |
|
wangyidong
|
8ee88df5de
|
Merge branch 'zentaopms_252'
|
2022-11-08 09:23:23 +08:00 |
|
wangyidong
|
9761648d59
|
Merge branch 'zentaopms_239'
|
2022-11-08 08:41:28 +08:00 |
|
tianshujie
|
2176378af6
|
* Fix bug #29339.
|
2022-11-07 09:11:40 +08:00 |
|
liuyongkai
|
f1b7f2e045
|
* Resolve feedback #1335.
|
2022-11-04 00:25:13 +00:00 |
|
liuyongkai
|
d53024dba9
|
* Resolve feedback #1335.
|
2022-11-03 14:26:48 +08:00 |
|
liuhong
|
43be2741b4
|
* Resolved feedback #1353.
|
2022-11-03 05:42:11 +00:00 |
|
zenggang
|
26e4e6b282
|
* Fix bug #29171
|
2022-11-03 01:01:44 +00:00 |
|
wangyidong
|
df497ad610
|
* finish task #74774.
|
2022-11-02 14:48:19 +08:00 |
|
wangyidong
|
4a9e97b29c
|
* code for task #73991.
|
2022-11-01 13:28:56 +08:00 |
|
wangyidong
|
9cd542f3c7
|
* code for task #73987.
|
2022-11-01 12:10:37 +08:00 |
|
Yagami
|
c57c28f9c6
|
* Fix bug #29032.
|
2022-10-28 15:57:03 +08:00 |
|
wangyidong
|
1b5bb99103
|
* code for task #29090.
|
2022-10-28 11:23:22 +08:00 |
|
wangyidong
|
148d3d6d6b
|
Merge branch 'master' into zentaopms_239
|
2022-10-27 11:39:47 +08:00 |
|
tanghucheng
|
ba55e70ae2
|
* Code for task #73242.
|
2022-10-27 08:50:42 +08:00 |
|
tanghucheng
|
d96d6bb803
|
* Finish task #73234,73242.
|
2022-10-27 08:09:26 +08:00 |
|
wangyidong
|
6208970fde
|
* code for task #73476,73475,73474,73473.
|
2022-10-26 16:41:16 +08:00 |
|
mayue
|
b9a782d943
|
* Finish feedback #1025.
|
2022-10-25 17:02:57 +08:00 |
|