Commit Graph
1057 Commits
Author SHA1 Message Date
王怡栋 ff55e9ca2e Merge branch 'master_liuhong_63772' into 'master'
* Code for task#63772. Fix bug of plan empty when at the page of project bug...

See merge request easycorp/zentaopms!4854
2022-08-09 05:33:04 +00:00
xieqiyu 8a159ba714 * Code for task#63772. Fix bug of plan empty when at the page of project bug and execution bug in all product. 2022-08-09 09:39:58 +08:00
lanzongjun 0e75eed65c fix cp project 2022-08-08 18:57:16 +08:00
lanzongjun 5481c3b2b9 fix cp project 2022-08-08 18:47:18 +08:00
liuhong 3f62f19b7f *Fix bug #25973 2022-08-05 06:17:05 +00:00
王怡栋 a1fc10a300 Merge branch 'sprint/222' into 'master'
Sprint/222

See merge request easycorp/zentaopms!4784
2022-08-04 03:03:16 +00:00
zhouxudong 461e3275db * Finish task #62850. 2022-08-04 01:32:48 +00:00
zhouxudong 9f26275965 * Finish task #62850. 2022-08-04 01:27:07 +00:00
zhouxudong 545f58f944 * Finish task #62850. 2022-08-03 09:25:08 +00:00
zenggang 8f6ca19bf7 * Finish task#62937,62950 2022-08-02 08:19:56 +00:00
sunguangming 019bf42e4d * Fix bug #25814. 2022-07-28 13:10:11 +08:00
lanzongjun 007462353c * fix bug #25750 2022-07-28 10:21:16 +08:00
tianshujie 270618a38c * Fix bug #25733. 2022-07-27 13:29:19 +08:00
lanzongjun e6eff527d2 move code 2022-07-26 14:56:50 +08:00
tianshujie 21f33a3ee9 * Finish task #61967. 2022-07-25 15:35:47 +08:00
tianshujie 96c71eb326 * Finish task #61967. 2022-07-25 13:36:14 +08:00
tianshujie 68da0b31d2 * Modify the return link for the delete project method. 2022-07-21 11:35:11 +08:00
tianshujie 1f00ba8c03 * Modify the return link for the delete project method. 2022-07-21 09:51:50 +08:00
lanzongjun e5c2184bab tmp 2022-07-20 18:06:34 +08:00
lanzongjun 658eedc2d5 tmp 2022-07-20 15:30:47 +08:00
lanzongjun 3c24e61b69 tmp 2022-07-19 17:24:52 +08:00
孙广明 d5c7586a47 * Fix menu bug. 2022-07-15 10:33:58 +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
zhouxudong 729a4872ca * Fix bug #25163 #25166 #25170. 2022-07-13 05:47:57 +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
孙广明 bd9700212c * Finish task #59706. 2022-07-12 22:48:07 +08:00
孙广明 8dc58ed292 * Code for project-task url. 2022-07-12 15:47:29 +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
liumengyi b8642a3350 * Finish task #60395. 2022-07-11 14:49:36 +08:00
liumengyi 26b430660a * Fix bug #23123. 2022-07-08 13:29:56 +08: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
孙广明 613c00bed9 * Code for stage/task. 2022-07-06 13:31:14 +08:00
liyuchun 9771037534 * Fix bug #24312. 2022-07-01 00:42:44 +00:00
孙广明 3cac1a020c * Refactor action getDynamic. 2022-06-28 15:02:19 +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 26f37ec09c * Finish task #58560. 2022-06-27 15:38:33 +08:00
zhouxudong 446ec44f29 * Finish task #58576 #58577. 2022-06-27 07:36:13 +00:00
tianshujie a974f333d2 * Modify Edit logic for switching program. 2022-06-17 11:46:43 +08:00
tianshujie a2421b85bb * Modify Edit logic for switching program. 2022-06-17 11:37:40 +08:00
王怡栋 8eb32c3062 Merge branch 'sprint/master_tanghucheng' into 'master'
* Fix bug #23832.

See merge request easycorp/zentaopms!3979
2022-06-16 08:59:06 +00:00
wangyidong 048c5e362e * adjust for project batchedit menu. 2022-06-16 15:51:06 +08:00
tanghucheng ab9657abf9 * Fix bug #23832. 2022-06-16 13:49:10 +08:00
孙广明 6656dd71a5 Merge branch 'sprint_204_57093' into 'master'
Sprint 204 57093

See merge request easycorp/zentaopms!3919
2022-06-15 03:09:10 +00:00