Commit Graph
3129 Commits
Author SHA1 Message Date
孙广明 aba0de11ac Merge branch 'sprint/hufangzhou_executionUnit' into 'master'
* Add execution module unit testcase.

See merge request easycorp/zentaopms!7067
2023-02-27 00:34:11 +00:00
Yagami a7db149f73 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-02-24 16:32:12 +08:00
Yagami 9eaf0920e8 * Remove unused code. 2023-02-24 16:31:32 +08:00
hufangzhou 340ae715e6 * Add execution module unit testcase. 2023-02-24 08:27:55 +00:00
孙广明 2fdd4f704a Merge branch 'sprint/lmy_task' into 'master'
* Finish task #85455, #85456.

See merge request easycorp/zentaopms!7066
2023-02-24 07:20:22 +00:00
Yagami b151d1fb32 * Finish task #85459. 2023-02-24 14:50:37 +08:00
liumengyi f45c4ccdd4 * Finish task #85455, #85456. 2023-02-24 06:24:16 +00:00
tianshujie 70f07dde4a * Remove other navigation for iterations under the Fusion Falls project. 2023-02-24 11:32:51 +08:00
孙广明 fccd283453 Merge branch 'sprint/292_liumengyi_32202' into 'master'
* Fix bug #32202,#32281, and finish task #42089.

See merge request easycorp/zentaopms!7051
2023-02-24 03:22:19 +00:00
孙广明 986e4d1e36 Merge branch 'sprint/292_liumengyi_85434' into 'master'
* Finish task #85434.

See merge request easycorp/zentaopms!7052
2023-02-24 03:22:13 +00:00
孙广明 e624b8c1e2 Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Add sql for process, and modify method to management method, fix bug #32421,#32424.

See merge request easycorp/zentaopms!7061
2023-02-24 03:21:47 +00:00
zhujinyong 94831920f5 * Fix bug: duplicate definition. 2023-02-24 10:56:52 +08:00
liumengyi ae5ad1bba8 * Fix bug #32421. 2023-02-24 02:31:15 +00:00
zhujinyong d0ab2da0d1 * Fix bug #32403. 2023-02-24 10:25:57 +08:00
liumengyi f2d6a76c93 * Modify method to management method. 2023-02-24 02:07:22 +00:00
王怡栋 9e73c11871 Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #27133.

See merge request easycorp/zentaopms!7060
2023-02-24 00:52:49 +00:00
wangyuting2 7de68720de * Fix bug #27133. 2023-02-24 08:47:54 +08:00
tianshujie a5d903b856 * Fix bug #32208. 2023-02-23 16:04:12 +08:00
liumengyi d52c3bd4d3 * Fix bug #32281. 2023-02-23 07:30:39 +00:00
tianshujie b350a3aff4 * Fix bug #32412. 2023-02-23 14:52:18 +08:00
liumengyi a876a53bf2 * Finish task #42089. 2023-02-23 06:04:12 +00:00
caoyanyi 8a0e17506f * Modify closed block style for execution drop down menu. 2023-02-23 12:12:56 +08:00
孙广明 61bc2f5a3a Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug #32183, #32400..

See merge request easycorp/zentaopms!7049
2023-02-23 04:02:22 +00:00
孙广明 d4ef7e25fd Merge branch 'sprint/hufangzhou_bug' into 'master'
* Fix the bug of has product waterfall project.

See merge request easycorp/zentaopms!7046
2023-02-23 04:01:41 +00:00
孙广明 4a60b5e049 Merge branch 'sprint/hufangzhou_fixcode' into 'master'
* Remove the uninitialized value.

See merge request easycorp/zentaopms!7045
2023-02-23 04:01:21 +00:00
Yagami 09c6c38389 * Fix bug #32383. 2023-02-23 11:03:34 +08:00
liumengyi c7be7a041e * Fix bug #32400. 2023-02-23 02:53:21 +00:00
liumengyi 9283507b20 * Finish task #85434. 2023-02-23 02:11:30 +00:00
hufangzhou 42ffe61dc4 * Fix the bug of has product waterfall project. 2023-02-23 01:55:24 +00:00
hufangzhou 166e496346 * Fix the issue 'Refactor this file to either declare symbols or cause side effects, but not both.'. 2023-02-23 01:13:42 +00:00
hufangzhou c2a9a39b10 * Remove the uninitialized value. 2023-02-23 01:01:22 +00:00
hufangzhou cd44e32af6 * Resolve issue #755. 2023-02-23 00:19:44 +00:00
孙广明 0b0d592647 Merge branch 'wxp_bug32388' into 'master'
* Fix bug #32388.

See merge request easycorp/zentaopms!7039
2023-02-22 09:07:13 +00:00
hufangzhou 553d78a8b3 * Fix bug #32372, #32373. 2023-02-22 09:05:53 +00:00
wangxuepeng 7ce34db406 * Fix bug #32388. 2023-02-22 08:56:08 +00:00
wangxuepeng d20c27d18d * Fix bug #32375. 2023-02-22 08:24:23 +00:00
wangxuepeng f710936784 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into wxp_bug32375 2023-02-22 08:20:10 +00:00
wangxuepeng 16109dc94b * Fix bug #32375. 2023-02-22 08:17:21 +00:00
孙广明 25fa088422 Merge branch 'sprint/292_liumengyi_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7033
2023-02-22 07:55:34 +00:00
liumengyi 5ed6406041 * Fix issue #754, #751, and adjust width of create project guide. 2023-02-22 07:50:21 +00:00
tianshujie 2668c3040e * Refactor. 2023-02-22 15:36:15 +08:00
tianshujie af76befb02 * Resolve issue #756. 2023-02-22 15:15:34 +08:00
zhujinyong e9ef9029b6 * Code for task #84594. 2023-02-22 11:39:36 +08:00
tianshujie deae64dcd1 * Add a prompt for the execution type. 2023-02-22 10:38:25 +08:00
tianshujie 9e7fe8f35d * Code for finish task #85414. 2023-02-22 10:22:29 +08:00
tianshujie 200e97d5b8 * Code for finish task #85414. 2023-02-22 09:55:00 +08:00
hufangzhou 02b8e6f723 * Finish task #85037. 2023-02-21 08:46:43 +00:00
孙广明 a789a412cb 更新module/execution/js/common.js 2023-02-21 07:23:03 +00:00
hufangzhou 10e9d3a6a8 * Fix bug for create execution. 2023-02-21 07:14:49 +00:00
孙广明 e05d8b2eff Merge branch 'sprint/hufangzhou_task_85050' into 'master'
* Finish task #85050.

See merge request easycorp/zentaopms!7012
2023-02-21 05:54:46 +00:00