Commit Graph
4320 Commits
Author SHA1 Message Date
mayue b4dff9c119 * Fix bug #24930. 2022-07-14 10:33:56 +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
tianshujie ace5265a11 * Fix bug #25206. 2022-07-14 09:36:42 +08:00
zhouxudong ce70c10870 * Code optimization. 2022-07-13 09:20:34 +00:00
孙广明 b9a6b4a2cc * Code for execution list order. 2022-07-13 14:45:04 +08: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
孙广明 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
孙广明 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
王怡栋 53a977af20 Merge branch 'sprint/215_liumengyi_fixbug' into 'master'
* Finish task #60491.

See merge request easycorp/zentaopms!4475
2022-07-12 07:45:36 +00: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
孙广明 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
王怡栋 4c3d59333a Merge branch 'sprint/215_liumengyi_60395' into 'master'
* Finish task #60395.

See merge request easycorp/zentaopms!4450
2022-07-11 07:56:19 +00:00
王怡栋 e9809af13a Merge branch 'master' into 'sprint/212_hufangzhou_59535'
# Conflicts:
#   www/js/my.full.js
2022-07-11 07:10:23 +00:00
hufangzhou 3f2b98e71c * Move the functions to my.full.js file. 2022-07-11 15:03:40 +08:00
hufangzhou 21dbff52ca * Rename method names. 2022-07-11 14:57:43 +08:00
liumengyi b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
hufangzhou 2993ba53f8 * Finish task #59535. 2022-07-11 14:41:09 +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 ef6ffd019b * Fix bug of task #59480, #59481. 2022-07-07 15:46:36 +08:00
liumengyi ecdd330102 * Fix bug of task #59480,#59481. 2022-07-07 14:41:10 +08: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
孙广明 6fe5ef5a23 Merge branch 'sprint_59473' into 'master'
Sprint 59473

See merge request easycorp/zentaopms!4362
2022-07-06 01:13:32 +00:00
sunjun e5ed8133b1 sprint_59473 2022-07-06 01:06:35 +00:00