Commit Graph
2167 Commits
Author SHA1 Message Date
tianshujie 8f14e95044 * Fix bug #25268. 2022-07-14 13:07:52 +08:00
孙广明 52c9717727 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4531
2022-07-14 02:06:13 +00:00
tianshujie b5a9fe8c52 * Fix bug #25234,25233. 2022-07-14 09:57:56 +08:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
王怡栋 70bd6eaa5e Merge branch 'sprint/master_zhouxudong_25163' into 'master'
* Fix bug #25163 #25166 #25170.

See merge request easycorp/zentaopms!4513
2022-07-13 05:53:10 +00:00
zhouxudong 729a4872ca * Fix bug #25163 #25166 #25170. 2022-07-13 05:47:57 +00:00
sunjun cf11a3a4fe fixConflict_24687 2022-07-13 05:31:43 +00:00
王怡栋 a769590829 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!4502
2022-07-13 03:29:11 +00:00
tianshujie c52fc59335 * Fix bug #25072. 2022-07-13 11:26:59 +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
孙广明 2557d4ba30 * Code for execution list. 2022-07-12 17:30:14 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +08:00
孙广明 c56ec2cbe4 * Add stage name. 2022-07-12 14:08:35 +08:00
孙广明 4caa38c31e * Code for execution list. 2022-07-12 14:00:25 +08:00
zhouxudong 951d41d721 * Finish task #60393. 2022-07-12 02:54:06 +00:00
孙广明 daf3ef4c99 * Code for execution list. 2022-07-12 00:43:56 +08:00
孙广明 f507af4cd0 * Code for stage list. 2022-07-11 18:19:27 +08:00
guofeilong 7c8366682c * Add function addTR atempt to enclosure ajaxFunc 2022-07-08 09:38:23 +00:00
guofeilong 819323633f * Fix write mistake 2022-07-08 09:21:23 +00:00
guofeilong b018809f53 * add click func to this two button 2022-07-08 09:17:35 +00:00
liumengyi 9921474711 * Fix bug #23123. 2022-07-08 13:43:43 +08:00
孙广明 1afa07c083 * Code for task list. 2022-07-08 13:37:28 +08:00
liumengyi 26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08:00
guofeilong b3508460ef * add table expand stage2 2022-07-08 03:31:43 +00:00
wangzemei 9ea7b2fc4a * use zentao-table 2022-07-07 07:47:25 +00:00
liumengyi e709c4bbda * Finish task #59480, #59481. 2022-07-07 14:12:45 +08:00
guofeilong 28c8b303da * add executionTable stage1 2022-07-07 05:24:57 +00:00
guofeilong 4270492af2 * add table expand 2022-07-07 02:34:24 +00:00
孙广明 613c00bed9 * Code for stage/task. 2022-07-06 13:31:14 +08:00
王怡栋 e3a045ac61 Merge branch 'sprint/master_zhouxudong_59748' into 'master'
Sprint/master zhouxudong 59748

See merge request easycorp/zentaopms!4366
2022-07-06 01:40:46 +00:00
zhouxudong 8110d73bd7 * Finish task #59748. 2022-07-05 06:20:33 +00:00
zhouxudong 994ca59405 * Finish task #59748. 2022-07-05 02:50:25 +00:00
zhouxudong 0b309f63bd * Finish task #59534 #59530 #59529. 2022-07-04 08:54:44 +00:00
liyuchun 9771037534 * Fix bug #24312. 2022-07-01 00:42:44 +00:00
zhouxudong 0a86bc474f * Fix bug #24417. 2022-06-29 07:10:13 +00:00
zhouxudong afb37ddeeb * Fix bug #24398. 2022-06-29 06:15:44 +00:00
zhouxudong e29b10e88d * Fix bug #24398. 2022-06-29 05:54:49 +00:00
zhouxudong 7e600bf701 * Fix bug $24398. 2022-06-28 09:26:52 +00:00
hufangzhou 91bc9e3327 * Finish task #58569. 2022-06-28 13:05:48 +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
hufangzhou eebcfaad58 * Adjust the spacing of dynamic block and dynamic page. 2022-06-24 13:33:11 +08:00
zhouxudong 7fce4137c5 * Fix bug #24176. 2022-06-23 07:46:34 +00:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
hufangzhou ac69cd1afb * Finish task #57883. 2022-06-22 10:39:55 +08:00
sunjun fec9f4f1dd codeReview 2022-06-17 05:05:44 +00:00
sunjun 8b4d326b90 fixissue_planIcon 2022-06-16 07:57:40 +00:00