Commit Graph
19380 Commits
Author SHA1 Message Date
zhujinyong 437bc83592 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 11:39:56 +08:00
zhujinyong 9f512843af + Add setAppObjectID of program. 2021-03-17 11:39:32 +08:00
leiyong fb943e01bd * Adjust code. 2021-03-17 11:39:10 +08:00
hufangzhou c9dd75ef87 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 11:38:48 +08:00
hufangzhou 7ceee5250a * Adjust the requirement story review icon. 2021-03-17 11:38:45 +08:00
zhujinyong a2cbb0e242 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 11:34:25 +08:00
zhujinyong adeec9e34a * Format code style. 2021-03-17 11:33:57 +08:00
tianshujie98 17536329c2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 11:33:46 +08:00
tianshujie98 bcc2cd9a26 * Fix bug. 2021-03-17 11:33:38 +08:00
tianshujie98 a81650c22d * Fix bug. 2021-03-17 11:33:04 +08:00
Yagami a42e28c6ee * Add group. 2021-03-17 11:31:03 +08:00
qiyu-xie d165d02b31 * Delete the list settings of execution. 2021-03-17 11:30:00 +08:00
hufangzhou c014e6812b Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 11:24:39 +08:00
hufangzhou 608b0b3151 * Adjust the story review icon. 2021-03-17 11:24:35 +08:00
leiyong 2149d5c39d * Finish task#36762. 2021-03-17 11:24:18 +08:00
hufangzhou 5efb02cb36 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 11:20:50 +08:00
hufangzhou 632742ad95 * Finish task #36743. 2021-03-17 11:20:40 +08:00
Yagami 7097394787 * Remove product browse btn in qa. 2021-03-17 11:17:19 +08:00
Yagami 02c3db0e1c * Merge code. 2021-03-17 11:08:43 +08:00
zhujinyong 6c5d084938 - Remove function: getMainAction. 2021-03-17 10:57:37 +08:00
Yagami 31b15cbedc * Fix story css. 2021-03-17 10:55:23 +08:00
Catouse 70ae2251b0 * task #36769, change UI of buttons in header. 2021-03-17 10:53:40 +08:00
zhujinyong 30fb46eea3 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 10:43:28 +08:00
zhujinyong d9a9083670 - Remove viewMenu of product. 2021-03-17 10:43:10 +08:00
hufangzhou ffd05e0123 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 10:34:37 +08:00
hufangzhou efbbf0a695 * Finish task #36747. 2021-03-17 10:34:29 +08:00
zhujinyong a16583ed97 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 10:33:21 +08:00
zhujinyong c370c3ba54 - Remove viewMenu of product. 2021-03-17 10:31:26 +08:00
tianshujie98 013f00cd14 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 10:24:37 +08:00
tianshujie98 da81be9508 * Adjust product ranking. 2021-03-17 10:23:04 +08:00
Yagami d58408ffbe * Merge code. 2021-03-17 10:20:01 +08:00
zhujinyong 28df323cc3 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 10:10:50 +08:00
zhujinyong 409a8384dc - remove viewMenu. 2021-03-17 10:10:33 +08:00
leiyong 9df4cc58b9 * Adjust index module. 2021-03-17 10:09:28 +08:00
qiyu-xie 383a47f254 * Navigation error. 2021-03-17 10:08:27 +08:00
qiyu-xie b958c45ed2 * Removed the execution sort. 2021-03-17 09:54:29 +08:00
zhujinyong 0816362706 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-17 09:39:54 +08:00
zhujinyong a9015ba45d * Adjust main menu. 2021-03-17 09:35:51 +08:00
hufangzhou 04e0105468 * Fix a bug. 2021-03-16 17:35:01 +08:00
hufangzhou a97ecda5b7 * Fix a bug 2021-03-16 17:23:24 +08:00
hufangzhou b9f6742547 * Fix a bug. 2021-03-16 17:22:03 +08:00
hufangzhou 7395de3a92 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-16 16:54:22 +08:00
hufangzhou cd589f789b * Fix a bug. 2021-03-16 16:54:18 +08:00
qiyu-xie 3ba8f84053 * Click the execution list to enter task. 2021-03-16 16:35:24 +08:00
Yagami 86416b127d * Code for task #36769. 2021-03-16 16:35:09 +08:00
wangyidong 99711f8a6d Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-16 16:19:03 +08:00
wangyidong 5b731bfc89 * code for task #36745. 2021-03-16 16:15:38 +08:00
qiyu-xie bc2a53eae4 * Finish task#36746. 2021-03-16 16:14:41 +08:00
holan20180123 b9e5131414 * Finish task #36764,#36755. 2021-03-16 16:13:24 +08:00
holan20180123 73f3049815 * Finish task #36755. 2021-03-16 16:04:16 +08:00