Commit Graph

763 Commits

Author SHA1 Message Date
mayue
c92e9f119a * Finish task #75649. 2022-11-11 17:02:17 +08:00
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie
280a37559e * Fix bug #29293. 2022-11-07 10:03:47 +08:00
tianshujie
91f6d1b9f0 * Fix bug #29293. 2022-11-07 09:54:41 +08:00
tianshujie
2176378af6 * Fix bug #29339. 2022-11-07 09:11:40 +08:00
liumengyi
0159cabcff * Fix bug #29272. 2022-11-07 09:05:56 +08:00
liuhong
1b7c9a9897 * Fix bug #29290. 2022-11-04 07:32:00 +00:00
mayue
4e87bd0ffa * Fix bug #29238 and finsih feedback#1339. 2022-11-04 09:49:33 +08:00
王怡栋
707df59e48 Merge branch 'master_bug_26228' into 'master'
* Adjust code for bug #26228.

See merge request easycorp/zentaopms!5961
2022-11-01 05:33:20 +00:00
liuhong
fe056715f5 * Adjust code for bug #26228. 2022-10-31 10:03:23 +00:00
Lufei
031838a6ce * Fix loadModel for entry. 2022-10-31 16:36:52 +08:00
liuhong
0e81c1cf78 * Fix bug #26228. 2022-10-30 04:39:47 +00:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie
354e8c129b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-26 08:42:00 +08:00
wangyidong
ef7072c10a * fix bug #28870. 2022-10-24 14:11:29 +08:00
liuhong
482196b246 * Fix bug #24436. 2022-10-21 04:28:26 +00:00
曹延义
6943f825e1 Merge branch 'sprint/247' into sprint/cyy_72375 2022-10-20 08:57:55 +08:00
曹延义
fc99bbfd05 * Finish task #72375. 2022-10-20 08:54:27 +08:00
wangyuting2
d71b81c9cb * Finish task #72774. 2022-10-19 06:07:55 +00:00
tianshujie
8b2477b734 * Finish task #72347. 2022-10-19 13:46:18 +08:00
liuhong
0e77b9f5e9 *Fix bug #28532. 2022-10-17 01:10:49 +00:00
王怡栋
0b569126ea Merge branch 'master_26245' into 'master'
* The execution logic to which the update task belongs when it is newly created.

See merge request easycorp/zentaopms!5680
2022-10-10 03:13:59 +00:00
liuhong
7571484ba7 *Adjust code for bug #26245. 2022-10-10 03:11:30 +00:00
liuhong
1d1ae03b95 * The execution logic to which the update task belongs when it is newly created. 2022-10-09 03:20:04 +00:00
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
曹延义
feb98f882c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_bug 2022-09-29 09:16:40 +08:00
曹延义
480f5db2d0 * Modify multi task estimate order. 2022-09-29 09:08:19 +08:00
曹延义
5a652d9ef6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 15:57:00 +08:00
liuhong
a7980a4852 *Update code logic. 2022-09-27 02:15:22 +00:00
曹延义
0911d16112 * Code for task #70495. 2022-09-27 09:59:14 +08:00
liuhong
3501b84719 *Adjust code. 2022-09-27 00:59:14 +00:00
daitingting
f7d564e837 * Finish task #70200. 2022-09-26 09:38:11 +00:00
wangyidong
6e6ecb4f6a * finish task #70199. 2022-09-26 17:28:15 +08:00
liuhong
fd0b159b62 *Fix bug #26245. 2022-09-26 06:08:46 +00:00
wangyidong
0ba479e9e5 * finish task #70196. 2022-09-26 13:15:48 +08:00
hufangzhou
2b85f8cd1a * Use the php to operate cookie for safe. 2022-09-22 09:41:53 +08:00
hufangzhou
0dad4d834f * Handle feedback #863. 2022-09-21 09:46:38 +08:00
wangyidong
42e85921d6 * code for task #69715. 2022-09-21 09:19:47 +08:00
wangyidong
47a855e35f Merge branch 'sprint/wangyidong_bug' 2022-09-19 13:48:27 +08:00
wangyidong
ed71a58df4 * code for task #69248. 2022-09-19 11:21:43 +08:00
wangyidong
bb9aa91422 * adjust for finish page style. 2022-09-14 17:34:28 +08:00
wangyidong
09694f3751 * adjust for edit effort. 2022-09-13 13:37:13 +08:00
wangyidong
6c04f3fee3 * ajax reload for effort. 2022-09-13 08:41:50 +08:00
wangyidong
0881e39c54 * adjust for multi task. 2022-09-09 16:14:08 +08:00
xieqiyu
ea1b08905c * Fix bug#27124. 2022-09-09 08:19:44 +08:00
xieqiyu
80ff723165 * Code for task#67691. 2022-09-07 16:58:54 +08:00
wangyidong
6972110d54 * adjust for delete estimate. 2022-09-05 20:21:18 +08:00
wangyidong
86ebfc0480 * fix bug #27262. 2022-09-05 11:30:25 +08:00
wangyidong
4635256fb9 * adjust for record estimate for linear task. 2022-09-02 17:51:04 +08:00
wangyidong
c94a577c96 * adjust for task #67404. 2022-09-02 16:20:15 +08:00