Commit Graph

960 Commits

Author SHA1 Message Date
zhouxudong
5af55d653b * Finish task #59542 #59541. 2022-07-04 07:46:30 +00:00
zhouxudong
6b960dc038 * Finish task #59542 #59541. 2022-07-04 05:57:34 +00:00
王怡栋
531a112d7d Merge branch 'sprint/208_tianshujie_fixbug' into 'master'
Sprint/208 tianshujie fixbug

See merge request easycorp/zentaopms!4259
2022-06-30 05:17:58 +00:00
李玉春
46a88b04d3 Merge branch 'bug_24222' into 'master'
* Fix bug #24222.

See merge request easycorp/zentaopms!4231
2022-06-30 02:26:33 +00:00
tianshujie
c265149f88 * Fix bug #24586. 2022-06-30 10:19:52 +08:00
孙广明
793a4ec698 * Code for multi task assignedTo. 2022-06-30 09:41:33 +08:00
caoyanyi
ff8bef7fe6 * Fix bug #24222. 2022-06-29 17:09:21 +08:00
孙广明
6c777a0a97 * Finish task #58771. 2022-06-29 13:50:57 +08:00
zenggang
15feb917ce * Finish task#58772,58774,58775 2022-06-28 05:39:31 +00:00
xieqiyu
d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
zhouxin
68b8268391 * Finish task #55258. 2022-06-13 01:25:38 +00:00
wangyidong
11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
liumengyi
5511a51882 * Fix bug #23340. 2022-06-08 10:35:41 +08:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liumengyi
6e4ac95a48 * Fix bug #23340. 2022-06-07 10:35:13 +08:00
wangyidong
fb786e9cf6 * remove useless flow action. 2022-06-02 15:02:38 +08:00
wangyidong
2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
tianshujie
ae096f635c * Fix bug #22979. 2022-05-26 21:32:07 +08:00
tianshujie
53e95069e4 * Fix bug #22979. 2022-05-26 21:08:37 +08:00
tianshujie
8c2654c7d2 * Fix bug #22979. 2022-05-26 13:55:49 +08:00
tianshujie
017019f6af * Fix bug #22952,22979. 2022-05-26 11:35:47 +08:00
李玉春
b41cdeb6f4 Merge branch 'sprint/194_tianshujie_55257' into 'master'
Sprint/194 tianshujie 55257

See merge request easycorp/zentaopms!3594
2022-05-25 08:08:26 +00:00
tianshujie
8e3068d9b5 * Finish task #55257. 2022-05-25 14:26:21 +08:00
tianshujie
e3d1c44eae * Finish task #55257. 2022-05-25 13:45:10 +08:00
mayue
33b78769b4 * Fix bug #22901. 2022-05-25 05:28:36 +00:00
孙华伟
9e9395694d *Fix bug #22375. 2022-05-19 15:27:37 +08:00
liumengyi
2d3f07a300 * Code format fot task #54318. 2022-05-19 10:35:12 +08:00
liumengyi
dee4ff7043 * Finish task #54318. 2022-05-19 08:55:27 +08:00
孙华伟
4bc08301f8 *Fix bug #22375 2022-05-17 10:40:11 +08:00
孙华伟
3ae610d77d Update model.php 2022-05-16 08:27:21 +00:00
孙华伟
94af8b93af *Optimize the code. 2022-05-16 16:26:19 +08:00
孙华伟
ecea8c6147 Update model.php 2022-05-16 08:24:40 +00:00
孙华伟
4c968d5872 *Optimize the code. 2022-05-16 16:21:34 +08:00
孙华伟
39c0ad9c17 *Finish task #54207. 2022-05-16 16:08:30 +08:00
wangyidong
aa0f666d41 * adjust for project flow. 2022-05-12 15:52:24 +08:00
wangyuting2
d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
daitingting
e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting
96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
李玉春
e6c646f6bd Merge branch 'sprint/fixbug_liumengyi_2441' into 'master'
* Fix bug #2441.

See merge request easycorp/zentaopms!3198
2022-04-28 08:26:06 +00:00
liumengyi
2780f01d00 * Fix bug #2441. 2022-04-28 16:21:37 +08:00
mayue
94c3a3a270 * Fix bug #10878. 2022-04-28 07:50:01 +00:00
孙广明
8010daa536 Merge branch 'sprint/master_zhouxudong_15338' into 'master'
* Fix bug #15338.

See merge request easycorp/zentaopms!3140
2022-04-26 09:12:31 +00:00
zhouxudong
9851bc1047 * Fix bug #15338. 2022-04-26 09:10:29 +00:00
zhouxudong
a55f5f9df6 * Fix bug #15338. 2022-04-26 09:03:06 +00:00
zenggang
9e1f09d37a * Fix bug#21982,21983 2022-04-26 03:25:12 +00:00
孙广明
37733991df Merge branch 'fixbug_21140' into 'master'
*Fixbug_21140

See merge request easycorp/zentaopms!3107
2022-04-25 06:42:26 +00:00
sunjun
1cf2e5e541 *Fixbug_21140 2022-04-25 13:10:55 +08:00
wangyidong
0705daa805 * adjust for performance issue. 2022-04-25 08:55:03 +08:00
caoyanyi
b8c0f822d9 * Add response data. 2022-04-22 05:38:48 +00:00