Commit Graph
1243 Commits
Author SHA1 Message Date
孙广明 815c633bc7 * Code for my-index speed. 2022-07-22 10:26:59 +08:00
王怡栋 dcd013186a Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4620
2022-07-21 05:08:47 +00:00
tianshujie 68da0b31d2 * Modify the return link for the delete project method. 2022-07-21 11:35:11 +08:00
孙广明 f4c75cd9af * Code for my-block. 2022-07-21 11:28:40 +08:00
王怡栋 08bc30c893 Merge branch 'sprint/217_tianshujie_fixbug' into 'master'
Sprint/217 tianshujie fixbug

See merge request easycorp/zentaopms!4616
2022-07-20 09:29:29 +00:00
tianshujie e547bc05a8 * A project cannot be saved successfully for a long time during batch editing. 2022-07-20 17:02:14 +08:00
zenggang 5def4aef24 * Finish task#61182,61168 2022-07-20 08:28:33 +00:00
tianshujie 72ac19d156 * Finish task #61177. 2022-07-20 09:42:37 +08:00
tianshujie f0dec448ce * Finish task #61177. 2022-07-20 08:36:04 +08:00
liumengyi 67772332b5 * Fix bug #24929. 2022-07-15 14:16:27 +08:00
mayue b4dff9c119 * Fix bug #24930. 2022-07-14 10:33:56 +08:00
孙广明 3e03fa9082 Merge branch 'sprint/216_mayue_bug#24930' into 'master'
* Fix bug #24930.

See merge request easycorp/zentaopms!4494
2022-07-13 02:16:46 +00:00
mayue e3abe64edc * Fix bug #24930. 2022-07-13 10:03:51 +08:00
孙广明 f506169428 * Only query active task in execution list. 2022-07-13 08:54:39 +08:00
孙广明 105ac0b70f Merge branch 'stagetasktree' 2022-07-13 08:48:30 +08:00
孙广明 5264032497 * Finish executio task tree. 2022-07-13 08:48:00 +08:00
孙广明 bd9700212c * Finish task #59706. 2022-07-12 22:48:07 +08:00
liumengyi b4ab8b5b39 * Finish task #60491. 2022-07-12 15:31:11 +08:00
liumengyi ba36ed56b5 * Fix bug #60491. 2022-07-12 14:42:55 +08:00
孙广明 4caa38c31e * Code for execution list. 2022-07-12 14:00:25 +08:00
孙广明 daf3ef4c99 * Code for execution list. 2022-07-12 00:43:56 +08:00
孙广明 1afa07c083 * Code for task list. 2022-07-08 13:37:28 +08:00
孙广明 613c00bed9 * Code for stage/task. 2022-07-06 13:31:14 +08:00
sunjun e5ed8133b1 sprint_59473 2022-07-06 01:06:35 +00:00
liyuchun 9771037534 * Fix bug #24312. 2022-07-01 00:42:44 +00:00
liumengyi 3d92afa1ae * Fix bug. 2022-06-30 11:20:41 +08:00
王怡栋 e00896f727 Merge branch 'sprint/master_zhouxudong_24417' into 'master'
Sprint/master zhouxudong 24417

See merge request easycorp/zentaopms!4237
2022-06-30 01:28:55 +00:00
zhouxudong 577ba86380 * Fix bug #24417. 2022-06-30 01:21:54 +00:00
zhouxudong 298493d3a1 * Fix bug #24417. 2022-06-30 00:57:18 +00:00
zhouxudong 461235a048 * Fix bug #24417. 2022-06-29 09:00:33 +00:00
tianshujie 105ab0aeeb * Fix bug #24365. 2022-06-29 13:39:26 +08:00
王怡栋 4d95909d6e Merge branch 'sprint/208_liumengyi_58558' into 'master'
* Finish task #58558, #58559.

See merge request easycorp/zentaopms!4186
2022-06-28 06:22:42 +00:00
liumengyi 2379f0e4a4 * Finish task #58558, #58559. 2022-06-28 13:22:23 +08:00
王怡栋 1c45032e88 Merge branch 'sprint/208_tianshujie_58560' into 'master'
* Finish task #58560.

See merge request easycorp/zentaopms!4174
2022-06-28 03:28:15 +00:00
tianshujie 3a380aee1d * Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560.* Finish task #58560. 2022-06-28 11:23:20 +08:00
zhouxudong eaa39c7f0f * Finish task #58576 #58577. 2022-06-27 09:14:37 +00:00
zhouxudong 446ec44f29 * Finish task #58576 #58577. 2022-06-27 07:36:13 +00:00
孙广明 5f26b603e7 * Code for bug #24007. 2022-06-21 15:22:12 +08:00
tianshujie 65c9254f7c * Resolve issue #677. 2022-06-16 11:22:15 +08:00
mayue ee058f67f1 * Finish task #57393. 2022-06-15 15:09:05 +08:00
tianshujie a6b47e84a9 * Finish task #57098. 2022-06-14 09:55:56 +08:00
mayue e11b76d819 * Ajust mutual test issue. 2022-06-10 10:23:27 +08:00
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
xieqiyu 36e609f808 * Fix bug#23116. 2022-06-06 16:52:30 +08:00
孙广明 716c7ca6e6 Merge branch 'fixbug_sunjun_23182' into 'master'
fixbug_sunjun_23182

See merge request easycorp/zentaopms!3703
2022-06-02 06:17:56 +00:00
sunjun 5b35fab5f6 fixbug_sunjun_23182 2022-06-02 01:43:24 +00:00
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
zhouxudong 5c3ac663e6 * Fix bug #23129 #23126 #23108. 2022-06-01 06:30:45 +00:00
唐胡成 0b68898f0a Update model.php 2022-06-01 00:43:27 +00:00