Commit Graph

85 Commits

Author SHA1 Message Date
tianshujie98
4aad17c101 * Finish task #37551. 2021-04-15 16:02:02 +08:00
leiyong
18840c71a4 * Adjust code. 2021-04-14 02:01:46 +00:00
tianshujie98
37791e8bfe Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-14 09:53:12 +08:00
tianshujie98
ba56961f03 * Fix bug #11544. 2021-04-14 09:52:47 +08:00
Yagami
16d12813c4 * Remove comment for execution setMenu. 2021-04-14 09:48:03 +08:00
leiyong
86d44e25a6 * Fix bug. 2021-04-13 16:00:45 +00:00
tianshujie98
edd4825045 * Fix bug #11934. 2021-04-09 16:34:26 +08:00
holan20180123
8f5471ebe6 * Fix bug #11006,#11058. 2021-04-06 11:19:09 +08:00
tianshujie98
2c3f528673 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-02 13:49:47 +08:00
tianshujie98
b1d9b5d1d4 * Solve the problem of adding projects to the classic version. 2021-04-02 13:43:14 +08:00
leiyong
fdeab69b16 * Fix bug. 2021-04-02 08:14:56 +03:00
hufangzhou
75415b2956 * Fix an error. 2021-04-02 09:26:47 +08:00
Yagami
00e1922daa * Fix error. 2021-04-01 16:06:08 +08:00
leiyong
261e7ddbdc * Fix bug. 2021-04-01 08:26:55 +03:00
hufangzhou
abb944c6b7 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 09:58:10 +08:00
hufangzhou
a321030c63 * Fix bug #11674. 2021-03-31 09:58:06 +08:00
Yagami
1e840b3266 * Fix bug #11469. 2021-03-31 09:12:44 +08:00
holan20180123
2c1d41da05 * Finish task #37096. 2021-03-30 15:36:25 +08:00
hufangzhou
7e0f3aaf69 * Adjust the nav highlight. 2021-03-30 10:12:40 +08:00
hufangzhou
95c604cef6 * Fix bug #11540. 2021-03-30 09:31:32 +08:00
tianshujie98
c32e8928c5 * Fix bug #11626. 2021-03-29 11:00:03 +08:00
wangyidong
f8c36d5a0c * fix bug for switch project in story-view page. 2021-03-25 17:49:59 +08:00
holan20180123
5b0010f846 * Adjust session and project lang. 2021-03-25 09:30:02 +08:00
zhujinyong
3063a692c3 * Fix stakeholder bug. 2021-03-25 00:36:28 +08:00
zhujinyong
5af5c9a92c Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-23 14:22:16 +08:00
zhujinyong
543078c4ee * Fix linkstory bug. 2021-03-23 14:21:53 +08:00
Yagami
50fe4e5033 * Finish add left top btn task. 2021-03-23 11:45:15 +08:00
leiyong
e8ca3c6798 * Finish task#36886. 2021-03-23 09:49:02 +08:00
Yagami
faec7af4d6 * Merge code. 2021-03-22 13:01:20 +08:00
zhujinyong
82428349ad * Rename session->PRJ to session->project. 2021-03-22 12:03:10 +08:00
zhujinyong
28017454fa Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-22 11:47:44 +08:00
zhujinyong
c7313cefd6 * Fix setMenu of execution. 2021-03-22 11:44:09 +08:00
wangyidong
a81bfd3978 * fix bug. 2021-03-22 11:22:34 +08:00
wangyidong
a558122672 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-22 11:07:35 +08:00
wangyidong
9531c783de * finish task #36749. 2021-03-22 11:04:27 +08:00
qiyu-xie
5f67f9db7f * Modify the drop-down list. 2021-03-22 10:25:43 +08:00
zhujinyong
a6eff425ca * Adjust menu logic. 2021-03-21 12:15:55 +08:00
Yagami
2f5eb04e08 * Merge code. 2021-03-19 15:14:14 +08:00
tianshujie98
d5665b54f7 * Reduction. 2021-03-19 14:51:01 +08:00
hufangzhou
1e1493d710 * Fix bug #11397. 2021-03-19 13:24:08 +08:00
tianshujie98
7bb301a8b2 * Fix menu bug. 2021-03-19 12:14:10 +08:00
wangyidong
9a5f56ff47 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-18 16:12:43 +08:00
tianshujie98
f5f19c135a * Fix bug. 2021-03-18 15:29:11 +08:00
Yagami
1d09fea4a4 * Fix bugs. 2021-03-18 14:48:05 +08:00
tianshujie98
82c6e01251 * Finish task #36765. 2021-03-17 14:01:40 +08:00
leiyong
fb943e01bd * Adjust code. 2021-03-17 11:39:10 +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
Catouse
70ae2251b0 * task #36769, change UI of buttons in header. 2021-03-17 10:53:40 +08:00
wangyidong
e43b1fd89e * fix bug. 2021-03-17 09:21:26 +08:00