Commit Graph

1233 Commits

Author SHA1 Message Date
wangyidong
e24a70f5b7 * code for task #89150. 2023-03-31 10:46:52 +08:00
wangxuepeng
bd0979b334 * Fix bug 33045. 2023-03-17 07:17:07 +00:00
liumengyi
b25022e3b0 * Fix bug #31827. 2023-03-07 06:52:09 +00:00
mayue
772ec30c37 * Resolve feedback #2132. 2023-02-23 06:46:06 +00:00
tianshujie
af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +08:00
hufangzhou
f3800e9e38 * Code for task #85049. 2023-02-21 01:38:01 +00:00
wangyidong
36150659f7 * adjst code. 2023-02-21 09:35:47 +08:00
hufangzhou
d4701a82f3 * Fix bug for project-execution feature bar active. 2023-02-20 09:14:32 +00:00
孙广明
a2dd5323ca Merge branch 'sprint/hufangzhou_task_85049' into 'master'
* Finish task #85049.

See merge request easycorp/zentaopms!7003
2023-02-20 08:26:46 +00:00
hufangzhou
2c1995d4a9 * Finish task #85049. 2023-02-20 07:23:49 +00:00
liuhong
bdac3f1ffa * Resolved feedback 2099 2023-02-20 02:27:03 +00:00
hufangzhou
75b5b2562c * Finish task #84583. 2023-02-18 16:04:53 +00:00
Yagami
f6dfccc9cd Merge branch 'zentaopms_284' 2023-02-16 17:22:15 +08:00
chaideqing
b3eeb70b26 * Fix feedback feedback2204. 2023-02-16 11:59:17 +08:00
tianshujie
484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou
f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liumengyi
7ea51e54b5 * Finish task #84584. 2023-02-14 13:13:46 +08:00
tianshujie
ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
xieqiyu
e260ad29a0 * Code for bug#31948. 2023-02-07 14:43:20 +08:00
孙广明
57dbacf882 * Code for task #83937. 2023-02-06 19:03:55 +08:00
liumengyi
4b8bc1add9 * Fix bug #31873, #31875. 2023-02-02 13:37:10 +08:00
Yagami
6c97562b57 * Code for agile plus project. 2023-01-31 09:49:58 +08:00
liuhong
40ca0b3f77 * Adjust code logic for 30389. 2023-01-31 01:38:33 +00:00
liuhong
14679274a3 * Fix bug #30389. 2023-01-29 03:08:37 +00:00
caoyanyi
5035c4a462 * Add test case and modify function name. 2023-01-13 14:11:01 +08:00
tanghucheng
62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
孙广明
137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
xieqiyu
4f56a74c60 * Code for task#81190. 2022-12-28 15:07:40 +08:00
xieqiyu
2664a0c85e * Finish task#81190. 2022-12-27 13:49:08 +08:00
zenggang
f58530fcd8 * Fix bug#26051 2022-12-23 02:56:21 +00:00
tanghucheng
5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
tanghucheng
85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
xieqiyu
fa65b4a6e0 * Code for task#79440. 2022-12-15 13:43:08 +08:00
tanghucheng
e11ec7993c Merge branch 'zenops_46' into sprint/220 2022-12-09 13:49:30 +08:00
孙广明
31ef3e0260 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Bug #30480

See merge request easycorp/zentaopms!6498
2022-12-08 06:05:50 +00:00
lanzongjun
0f4ef051bf * Finish Bug #30480 2022-12-08 13:44:28 +08:00
xieqiyu
6038b69ea4 * Fix bug#30651. 2022-12-08 13:31:00 +08:00
lanzongjun
d6f9976aae * Finish Bug #30480 2022-12-08 11:06:04 +08:00
wangyidong
3e18aa302a * fix bug #30584. 2022-12-08 09:16:17 +08:00
xieqiyu
a2d2c55e94 * Code for task#78668. Add trim. 2022-12-07 11:25:41 +08:00
xieqiyu
afe9d49024 * Finish task#78668. 2022-12-07 11:16:55 +08:00
hufangzhou
871eb1c0a3 * Fix bug #30500. 2022-12-06 09:20:32 +00:00
孙广明
f06d508e16 * Finish task #78662. 2022-12-06 15:48:09 +08:00
Yagami
55ea43c5aa Merge branch 'zentaopms_256' 2022-12-05 10:36:22 +08:00
Yagami
d7d897a8f7 * Fix code error. 2022-12-02 15:58:52 +08:00
王怡栋
d1952c69b0 Merge branch 'zentaopms_266_wangyuting' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!6446
2022-12-02 02:47:20 +00:00
lanzongjun
a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
wangyuting
e100ad058c * Fix bug. 2022-12-01 09:03:16 +00:00
王怡栋
8047908575 Merge branch 'zentaopms266_wyd' into 'master'
* fix bug #30274.

See merge request easycorp/zentaopms!6445
2022-12-01 09:00:59 +00:00
wangyidong
8007950ef9 * fix bug #30274. 2022-12-01 16:59:45 +08:00