Commit Graph

1438 Commits

Author SHA1 Message Date
xieqiyu
e260ad29a0 * Code for bug#31948. 2023-02-07 14:43:20 +08:00
tianshujie
43978561eb * Fix bug #30004. 2023-02-01 13:15:24 +08:00
xieqiyu
1a12607799 * Fix bug#25663. 2023-01-19 11:47:54 +08:00
caoyanyi
5035c4a462 * Add test case and modify function name. 2023-01-13 14:11:01 +08:00
wangyidong
56c5cac759 * code for task #81410. 2022-12-28 14:32:22 +08:00
zenggang
f58530fcd8 * Fix bug#26051 2022-12-23 02:56:21 +00:00
zenggang
d926fe817d * Resolve feedback#1576 2022-12-13 03:07:29 +00:00
zenggang
4239813b6b * Resolve feedback#1661 2022-12-06 09:30:48 +00:00
hufangzhou
15d3437046 * Handle ticket #144. 2022-12-06 06:53:34 +00:00
lanzongjun
a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
wangyidong
8007950ef9 * fix bug #30274. 2022-12-01 16:59:45 +08:00
Yagami
cfc70e8176 * Code for task #77800. 2022-12-01 15:15:07 +08:00
Yagami
7a843ece37 * Code for task #77800. 2022-12-01 13:52:46 +08:00
Yagami
6263ee7a5c * Code for task #77801. 2022-12-01 10:34:23 +08:00
lanzongjun
9077e9b4a3 * Fix Task #77798 2022-11-29 14:35:07 +08:00
Yagami
76b3882e55 * Fix project manage products bug. 2022-11-25 14:10:07 +08:00
xieqiyu
4813aea7b3 * Fix bug#30214. 2022-11-24 14:31:10 +08:00
孙广明
9e573b74d7 Merge branch 'master_xieqiyu_76423' into 'master'
* Fix bug#29430.

See merge request easycorp/zentaopms!6218
2022-11-17 08:09:01 +00:00
王怡栋
93a772e01e * fix bug #29834. 2022-11-17 14:01:33 +08:00
xieqiyu
4a7b338bad * Fix bug#29430. 2022-11-17 10:36:25 +08:00
孙广明
e656871dcf Merge branch 'master_xieqiyu_29860' into 'master'
* Fix bug#29860.

See merge request easycorp/zentaopms!6180
2022-11-16 02:21:28 +00:00
xieqiyu
930e378c0a * Fix bug#29860. 2022-11-16 10:18:25 +08:00
caoyanyi
b2adb6ab92 * Fix bug #29839. 2022-11-16 09:32:02 +08:00
王怡栋
f950d1fa82 * fix bug #76334. 2022-11-15 15:03:32 +08:00
王怡栋
66be15c00f * fix bug #29736. 2022-11-15 11:13:04 +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
daitingting
cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyidong
4a0a5649a0 * adjust code. 2022-11-02 09:16:51 +08:00
daitingting
219f7d6a24 * Optimize codes. 2022-11-01 06:19:45 +00:00
wangyidong
4a9e97b29c * code for task #73991. 2022-11-01 13:28:56 +08:00
caoyanyi
f54b412c3b * Modify project icon. 2022-10-31 17:11:39 +08:00
Yagami
644e28c670 * Fix bug #29099. 2022-10-28 16:28:48 +08:00
wangyidong
cabc10ad73 * code for task #73474. 2022-10-28 10:50:57 +08:00
wangyuting2
64b19e32a6 * Fix bug for php56. 2022-10-27 08:25:14 +00:00
Yagami
bce03159e7 * Code for code review. 2022-10-27 16:22:09 +08:00
daitingting
4e9109c5a7 * Finish task #72756. 2022-10-27 05:11:55 +00:00
wangyidong
14a17688cd * adjust for task #73474. 2022-10-27 08:58:11 +08:00
wangyidong
6208970fde * code for task #73476,73475,73474,73473. 2022-10-26 16:41:16 +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
1875b5be0e * Fix bug #73233. 2022-10-25 09:25:07 +08:00
wangyuting2
ee4ffb51eb * Optimize code. 2022-10-24 08:49:37 +00:00
wangjianhua
5a6ea5fc09 * Fix bug #28553: not display project of shadow product. 2022-10-24 12:28:46 +08:00
wangyidong
4f80c56549 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_239 2022-10-21 14:20:28 +08:00
wangyidong
72f8f8b89e * code for bug #72261. 2022-10-21 14:19:18 +08:00
王 于听
941471d0f1 Merge branch 'zentaopms_239_task_#71574' into 'zentaopms_239'
* Finish task #71574.

See merge request easycorp/zentaopms!5843
2022-10-21 02:34:32 +00:00
daitingting
dc4865c9d1 * Unlink execution with product. 2022-10-21 01:22:22 +00:00
daitingting
b09405cdef * Adjust codes. 2022-10-21 01:07:48 +00:00
wangyuting2
b5916c9b0e * Fix bug #28747. 2022-10-21 01:03:34 +00:00