Commit Graph

441 Commits

Author SHA1 Message Date
王怡栋
d71858bc5b Merge branch '15.2' into 15.3 2021-08-17 19:35:15 +08:00
王怡栋
bb8cf72b8b * Merge for fixed code after tag in this release. 2021-08-17 17:27:42 +08:00
zenggang
d909bbcf0f * Finish task #40894 2021-08-06 10:56:20 +08:00
tianshujie98
62cdfe2198 * Fix bug #14049. 2021-08-05 13:25:34 +08:00
hufangzhou
3503223e89 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-08-05 10:54:36 +08:00
hufangzhou
71a16a3093 * Adjust the doc module link in drop menu. 2021-08-05 10:54:31 +08:00
wangyidong
472360028a * adjust for priv lang. 2021-08-05 10:50:11 +08:00
tianshujie98
183bd16df3 * Fix bug #13973. 2021-08-04 16:29:10 +08:00
tianshujie98
d06d09f155 * Modify function comment. 2021-08-03 16:45:48 +08:00
leiyong
5e08cd860e * Fix bug#14026. 2021-08-03 16:12:37 +08:00
qiyu-xie
dcb627fced * Fix issue#361. 2021-08-03 13:52:44 +08:00
qiyu-xie
b009f1df7b * Fix issue#370. 2021-08-03 11:14:37 +08:00
holan20180123
4c621f9f1e * Finish task #40818. 2021-08-03 10:05:13 +08:00
hufangzhou
57bf580fa5 * Finish task #40835. 2021-08-03 09:30:05 +08:00
holan20180123
4e578bf78f * Finish task #40819. 2021-08-03 09:23:24 +08:00
wangyidong
7b0a8a5bb0 * fix bug for loadModel. 2021-08-02 16:59:14 +08:00
wangyidong
bbe793a8aa Merge branch '15.2' 2021-08-02 16:31:42 +08:00
Hao Sun
8de42e5bca * add space between icon and text. 2021-07-30 14:38:39 +08:00
wangyidong
3bfa1df846 * fix bug #13954. 2021-07-30 10:48:14 +08:00
hufangzhou
5ff35b3d94 * Fix bug #13860. 2021-07-30 08:57:18 +08:00
wangyidong
3def2a4713 * adjust update userview for project involved execution. 2021-07-29 16:52:13 +08:00
Yagami
7257441802 * Fix burn data error. 2021-07-29 13:21:47 +08:00
zenggang
12fb7839b7 * Finish task #40461 2021-07-26 16:47:26 +08:00
qiyu-xie
3d1aafd882 * Finish task#40524. 2021-07-23 15:27:38 +08:00
tianshujie98
42829fa597 * Adjust page. 2021-07-23 10:39:56 +08:00
tianshujie98
85d80014dd * Finish task #40510. 2021-07-22 10:48:06 +08:00
tianshujie98
7c0ee909ec * Fix bug #13744. 2021-07-21 11:38:10 +08:00
wangyidong
54ff43eb6f * add changelog and zh-tw lang. 2021-07-20 09:58:58 +08:00
wangyidong
ab108bd178 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-20 09:05:19 +08:00
wangyidong
8ce3d4de2a * fix error. 2021-07-20 09:04:54 +08:00
qiyu-xie
c9ee925c65 * When execution manage products, make the normal product without 'has-branch' class. 2021-07-20 08:24:19 +08:00
zhujinyong
d75f650c7e Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-19 11:59:06 +08:00
zhujinyong
37f44fbbca + Add user and bug api. 2021-07-19 11:58:25 +08:00
hufangzhou
9d181f5493 * Fix bug #13706. 2021-07-19 09:17:05 +08:00
tianshujie98
f21634b963 * Adjust language. 2021-07-16 16:50:03 +08:00
wangyidong
8c43cd0fa6 * adjust for batchedit. 2021-07-16 16:25:02 +08:00
wangyidong
d12f9bd00c * fix bug #13620. 2021-07-16 15:57:41 +08:00
wangyidong
4fe3d248cd * fix bug #13699. 2021-07-16 15:00:36 +08:00
wangyidong
eb93e37b04 * fix error. 2021-07-16 14:41:13 +08:00
wangyidong
4c43ac17b4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:38:17 +08:00
wangyidong
d18d3e3024 * fix error. 2021-07-16 14:37:56 +08:00
qiyu-xie
db3e544504 * Fix bug#13672. 2021-07-16 14:16:59 +08:00
hufangzhou
2c8a1ef5ef Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 13:20:05 +08:00
hufangzhou
382f829564 * Fix issue #169. 2021-07-16 13:20:01 +08:00
qiyu-xie
685b270170 * Finish task#40313. 2021-07-16 11:29:29 +08:00
qiyu-xie
2c27035699 * Adjust code. 2021-07-16 11:22:56 +08:00
holan20180123
25a3320c75 * Finish task #40315. 2021-07-16 10:57:51 +08:00
zhujinyong
e50ecb316a Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 09:44:50 +08:00
zhujinyong
6f04aedcd3 Merge branch 'master' of http://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 09:44:23 +08:00
hufangzhou
8075005620 * Finish task #40314. 2021-07-16 09:41:53 +08:00