Commit Graph

906 Commits

Author SHA1 Message Date
wangyidong
bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
tianshujie98
c9c76ded4f * Fix bug #13950. 2021-07-30 10:36:18 +08:00
wangyidong
3def2a4713 * adjust update userview for project involved execution. 2021-07-29 16:52:13 +08:00
hufangzhou
885d0f5c85 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-29 14:52:48 +08:00
hufangzhou
1468397f36 * Fix bug #13908. 2021-07-29 14:52:43 +08:00
tianshujie98
be6f9a010b fy the remaining working hours of the project card and the project overview. 2021-07-29 10:29:27 +08:00
tianshujie98
cf4aa6d59e * Finish task #40520. 2021-07-28 09:07:56 +08:00
Yagami
bfe3bcf3dd * Code for task #40447. 2021-07-23 15:10:50 +08:00
zenggang
cf9275cbae * Finisth task #40426 2021-07-22 13:27:43 +08:00
zenggang
51558901a5 * Finish task #40117 2021-07-20 18:30:19 +08:00
holan20180123
fae99a59ba * Adjust edit project. 2021-07-19 10:40:01 +08:00
zenggang
c29583f980 * finish task #40111 2021-07-14 14:44:48 +08:00
tianshujie98
7e13c5544b * Adjust code style. 2021-07-14 10:30:19 +08:00
tianshujie98
132d5484f9 * Adjust code. 2021-07-13 15:17:04 +08:00
wangyidong
9d95d960e5 * finish task #40005. 2021-07-13 09:38:27 +08:00
wangyidong
fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
wangyidong
b49812bfb6 * finish task #39793. 2021-07-05 13:26:30 +08:00
guanxiying
afb01a3a95 * Adjust the code. 2021-06-25 16:41:05 +08:00
wangyidong
1af22a4ae1 * finish task #38717. 2021-06-21 16:09:21 +08:00
Yagami
b916291293 * Fix code error. 2021-06-21 14:15:12 +08:00
wangyidong
4d5bacb823 * adjust for web page. 2021-06-11 16:51:28 +08:00
wangyidong
769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
holan20180123
5389de2709 * Adjust code for review. 2021-06-04 08:51:45 +08:00
holan20180123
cf907e8325 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-01 10:10:10 +08:00
holan20180123
3f446e63a6 * Fix bug 12732. 2021-06-01 10:09:45 +08:00
qiyu-xie
7e8f5657ba * Fix bug#38647. 2021-05-31 16:21:24 +08:00
tianshujie98
ad26f52a97 * Fix opportunity editing issue. 2021-05-31 11:12:46 +08:00
tianshujie98
1d0d901747 * Add empty. 2021-05-31 10:35:02 +08:00
tianshujie98
f48ce1d43b * Add function to get team member pairs of project members. 2021-05-31 10:17:55 +08:00
wangyidong
1cae502aee * adjust for web html. 2021-05-20 16:55:12 +08:00
qiyu-xie
504f44715b * Modify the button to edit project. 2021-05-11 13:03:50 +08:00
wangyidong
8e003ff449 * fix error. 2021-05-10 11:15:31 +08:00
wangyidong
3f75e066e3 * fix bug. 2021-04-30 13:17:43 +08:00
hufangzhou
bbf9941348 * Adjust the code. 2021-04-28 14:29:53 +08:00
hufangzhou
88e140be8f * Update the user view when create project. 2021-04-28 14:27:41 +08:00
hufangzhou
09acfbbc53 * Modify the project doc lib acl when the project acl is program. 2021-04-28 11:00:28 +08:00
Yagami
35e91b8c3b * Fix bug #12338. 2021-04-26 13:37:02 +08:00
tianshujie98
5c188665d7 * Fix menu error. 2021-04-23 10:45:52 +08:00
tianshujie98
64406fe023 * Fix bug #12272. 2021-04-22 11:38:54 +08:00
qiyu-xie
d5dcc7d68f * Modify the language item of the copy execution. 2021-04-19 13:28:13 +08:00
qiyu-xie
b75eef360b * The bind field should be 1 when create independent product. 2021-04-19 10:09:57 +08:00
tianshujie98
4aad17c101 * Finish task #37551. 2021-04-15 16:02:02 +08:00
Yagami
5647cfb066 * Adjust code detail. 2021-04-15 14:34:23 +08:00
holan20180123
1ccb76c487 * Fix product doc lib acl error. 2021-04-13 16:18:46 +08:00
Yagami
8a6ec7e152 * Fix bug. 2021-04-12 15:59:15 +08:00
wangyidong
d6cbac7df4 * fix bug. 2021-04-12 14:47:50 +08:00
Yagami
c97792dd90 * Fix bug #11989. 2021-04-12 13:31:15 +08:00
holan20180123
ba26806e18 * Fix bug #11974. 2021-04-12 09:53:41 +08:00
qiyu-xie
ac02e2ed87 * Finish task #37040. 2021-04-07 15:25:18 +08:00
wangyidong
266ea3e8d2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-02 14:07:24 +08:00