Commit Graph

210 Commits

Author SHA1 Message Date
tianshujie
665422c7ce * Fix bug #32761. 2023-03-09 16:50:22 +08:00
tianshujie
af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +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
Yagami
7f6892bf38 * Fix edit waterfall project bug. 2023-02-02 16:39:57 +08:00
Yagami
fd399560f9 * Code for task #83209. 2023-01-31 08:54:50 +08:00
zenggang
f58530fcd8 * Fix bug#26051 2022-12-23 02:56:21 +00:00
Yagami
7a843ece37 * Code for task #77800. 2022-12-01 13:52:46 +08:00
tanghucheng
3ca705de9f * Adjust code for bug #30011,24060. 2022-11-24 14:58:59 +08:00
lanzongjun
9f692f5b23 * Fix project edit width 2022-11-24 10:17:44 +08:00
lanzongjun
eac16b903f * Fix Bug #30156 2022-11-23 16:54:49 +08:00
lanzongjun
40ee11ba30 * Fix Bug #30157 2022-11-23 15:59:21 +08:00
lanzongjun
0a5cd963cf * Fix Task #76951 2022-11-22 08:50:39 +08:00
wangyuting
aed53849d1 * Finish task #75248. 2022-11-09 02:10:29 +00:00
wangyidong
8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +08:00
daitingting
b163bd0f32 * Finish task #73985. 2022-11-02 02:09:34 +00:00
wangyidong
3a8ef27bec * code for task #73993. 2022-11-01 08:45:15 +08:00
Yagami
1ec7f132ea * Code for edit product page. 2022-10-28 08:35:15 +08:00
Yagami
2f04710843 * Finish task #73233. 2022-10-26 15:41:53 +08:00
孙广明
e24e771dee * Code for task #73233. 2022-10-26 09:27:33 +08:00
Yagami
c232ec7c7d * Code for task #73233. 2022-10-24 15:43:36 +08:00
wangyuting2
05f6ade106 * Finish task #71569. 2022-10-20 08:30:23 +00:00
daitingting
6948b02a8c * Finish task #71568. 2022-10-19 03:01:18 +00:00
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong
a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
daitingting
f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
tianshujie
85d0124403 * Fix bug #27778. 2022-09-23 09:48:39 +08:00
lanzongjun
c4c57794ea * fix bug #27788 2022-09-22 14:49:33 +08:00
lanzongjun
305e8cd794 * finish task #69698#69703#69704#69705 2022-09-20 08:58:41 +08:00
wangyidong
63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
liugang
fefdfe5b49 * Adjust the vertical align. 2022-09-15 13:07:43 +08:00
liugang
93b221c6a6 * Display the products and the plans on the edit page of the project module if the project has product. 2022-09-15 13:06:23 +08:00
liugang
042a9a97c3 * Display the project type on the edit page of the project module. 2022-09-15 13:05:14 +08:00
zhouxudong
6312af0dea * Fix bug #26612. 2022-08-19 03:11:05 +00:00
zhouxudong
49d654cabc * Finish task #64888. 2022-08-16 05:37:22 +00:00
zhouxudong
266fdf9ca7 * Update code. 2022-08-10 05:42:26 +00:00
zhouxudong
ef847f1169 * Finish task #63581. 2022-08-08 14:37:33 +00:00
zhouxudong
abc59ed7aa * Finish task #63679. 2022-08-07 15:21:43 +00:00
zhouxudong
cf009e9c80 * Reconstruction method. 2022-08-05 01:58:27 +00:00
zhouxudong
84f3796c88 * Finish task #62850. 2022-08-04 01:53:21 +00:00
zhouxudong
ace4fde7a8 * Finish task #62850. 2022-08-04 01:48:56 +00:00
zhouxudong
461e3275db * Finish task #62850. 2022-08-04 01:32:48 +00:00
zhouxudong
9f26275965 * Finish task #62850. 2022-08-04 01:27:07 +00:00
zhouxudong
545f58f944 * Finish task #62850. 2022-08-03 09:25:08 +00:00
zhouxudong
18504478db * Finish task #62850. 2022-08-02 09:39:55 +00:00
zhouxudong
6a784fdfda * Finish task #62850. 2022-08-02 08:50:16 +00:00
zhouxudong
364a5009f4 * Finish task #62850. 2022-08-02 07:21:03 +00:00
tianshujie
7eed8e4a2b * Finish task #61180. 2022-07-19 13:52:40 +08:00
sunjun
cf11a3a4fe fixConflict_24687 2022-07-13 05:31:43 +00:00