Commit Graph

545 Commits

Author SHA1 Message Date
xieqiyu
679f2641aa * Fallback code for bug#29896. 2022-11-16 17:19:43 +08:00
xieqiyu
2a7493ac78 * Fix bug#29896. 2022-11-16 15:48:18 +08:00
daitingting
8e872c71e3 * Fix bug #29623. 2022-11-15 06:49:19 +00:00
tianshujie
0544c75976 * Modify the project list name display question. 2022-11-11 09:20:55 +08:00
daitingting
cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
daitingting
8ad4ae27ef * Doing task #73985. 2022-11-01 08:41:11 +00:00
daitingting
219f7d6a24 * Optimize codes. 2022-11-01 06:19:45 +00:00
daitingting
dc4940c39d * Fix bug #28966. 2022-10-28 08:11:24 +00:00
wangyidong
d1f11b72d8 * fix bug #29065. 2022-10-28 14:08:53 +08:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyidong
ce74f027b4 * adjust for show all projects. 2022-10-27 08:27:52 +08:00
daitingting
fd288a6a3c * Finish task #71566,#71567,#72987. 2022-10-25 08:20:29 +00:00
wangyidong
585b12838e * code for task #73472. 2022-10-25 14:04:12 +08:00
wangyidong
1a9aca53c0 * code for task #73471. 2022-10-25 11:30:40 +08:00
Yagami
b4bdcd0ca3 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-10-19 15:36:28 +08:00
Yagami
187d3b8ca4 * Finish task #72674. 2022-10-19 15:36:15 +08:00
daitingting
6948b02a8c * Finish task #71568. 2022-10-19 03:01:18 +00:00
曹延义
5306bb29f9 * Modify page style. 2022-10-09 16:36:57 +08:00
曹延义
bfa7cdbdd7 * Optimize page style. 2022-09-30 13:59:18 +08: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
tanghucheng
83dbebc5b8 * Task#70759 Add relation productID for copyProject. 2022-09-28 11:16:33 +08:00
wangyuting2
80fe821de6 * Finish task #70571. 2022-09-27 01:33:34 +00:00
wangyidong
0ba479e9e5 * finish task #70196. 2022-09-26 13:15:48 +08:00
tianshujie
e553730c29 * Finish task #70202. 2022-09-23 16:33:56 +08:00
曹延义
7488846987 * Modify budget calc. 2022-09-23 13:01:45 +08:00
lanzongjun
ac75c1ee07 * fix bug #27795 2022-09-23 09:20:14 +08:00
dingyongliang
6f8533ae78 * task #70026, replace more icon. 2022-09-22 06:17:09 +00:00
wangyuting2
12c566a9ab * Optimize code. 2022-09-19 05:42:06 +00:00
wangyidong
ed71a58df4 * code for task #69248. 2022-09-19 11:21:43 +08:00
wangyidong
6b541a7c60 Merge branch 'sprint/zentaopms240_lanzongjun' into sprint/zentaopms240 2022-09-16 16:26:29 +08:00
lanzongjun
f8691316b0 * task #69250#69251 2022-09-16 15:31:44 +08:00
wangyidong
63e5df239e * code for task #69248. 2022-09-16 15:18:41 +08:00
lanzongjun
49faebaad7 * task #69250#69251 2022-09-16 14:58:39 +08:00
liugang
e885261255 * Don't display the shadow products when create a project, see task #68999. 2022-09-14 14:52:45 +08:00
tianshujie
29bd1d6588 * Update test case of program module. 2022-09-14 10:37:05 +08:00
tianshujie
73f3a6d80a * Finish task #68925. 2022-09-13 16:53:52 +08:00
李玉春
0bc581b21c Merge branch 'sprint/235' into 'master'
Sprint/235

See merge request easycorp/zentaopms!5216
2022-08-31 08:19:32 +00:00
zenggang
6c48f5ec97 * Finish task#67260 2022-08-30 06:39:36 +00:00
孙广明
1e1ddeb0b0 Merge branch 'sprint/235_tianshujie_26758' into 'sprint/235'
* Fix bug #26758,  #25942., #23957.

See merge request easycorp/zentaopms!5176
2022-08-29 06:53:31 +00:00
tianshujie
a072b794e5 * Fix bug #26936. 2022-08-29 14:51:21 +08:00
tianshujie
0d4b77197f * Fix bug #26936. 2022-08-29 14:49:33 +08:00
liumengyi
7e60d43f6e * Finish task #66938. 2022-08-29 10:45:50 +08:00
liumengyi
fac28b389a * Fix bug #26724. 2022-08-26 16:12:07 +08:00
tanghucheng
24dab5df38 * Fix bug #26906. 2022-08-26 11:30:14 +08:00
王怡栋
a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
liuruogu
5f57574e75 * Finish task #63387. 2022-08-04 00:40:25 +00:00
zhouxudong
2358f42e39 * Finish task #62836 ~ #62849. 2022-08-01 08:13:05 +00:00
zenggang
dfae2ec61f * Fix bug#23205 2022-07-28 06:55:51 +00:00
xieqiyu
0ec68feb10 * Fix bug#25004. 2022-07-27 21:38:28 +08:00