Commit Graph
23458 Commits
Author SHA1 Message Date
wangyidong ddf27f277d * fix bug #10996. 2021-03-31 10:38:52 +08:00
wangyidong e61b1780f6 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 08:58:00 +08:00
wangyidong bba3ca17c9 * fix bug #6347. 2021-03-31 08:57:44 +08:00
tianshujie98 ba7ad3fc70 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-31 08:21:11 +08:00
tianshujie98 e1b120bb0a * Fix bug. 2021-03-31 08:20:50 +08:00
Catouse 512ed4e390 * improve UI of main menu. 2021-03-30 17:45:41 +08:00
Catouse d48d481888 * refactor: adjust alignment. 2021-03-30 17:37:39 +08:00
Catouse b64bd42f8a * refactor: comment. 2021-03-30 17:32:32 +08:00
Catouse 216275f06a * hide #menuMoreList on click items on it. 2021-03-30 17:29:54 +08:00
wangyidong 81d36e38b2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 17:06:54 +08:00
wangyidong 8fead581a7 * revert Makefile and kindeditor. 2021-03-30 17:04:59 +08:00
tianshujie98 eb00b3a8cc Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 16:59:03 +08:00
tianshujie98 2ad6666fa9 * Fix bug #11035. 2021-03-30 16:58:44 +08:00
Catouse d3063479fb * update icon-program. 2021-03-30 16:57:23 +08:00
zhujinyong ff8880541e Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 16:56:42 +08:00
zhujinyong 87cecd7fc5 * Use openApp instead of 'from'. 2021-03-30 16:56:23 +08:00
wangyidong 9a48bd1ce8 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 16:55:30 +08:00
wangyidong 34347209e9 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 16:53:37 +08:00
qiyu-xie 21729df3ce * Fix bug. 2021-03-30 16:52:03 +08:00
wangyidong 5e98a02375 * finish task #36745. 2021-03-30 16:41:22 +08:00
tianshujie98 53ef76a7c7 * Fix an error. 2021-03-30 16:41:15 +08:00
Yagami 7b39ef98ea * Finish task #11393. 2021-03-30 16:34:33 +08:00
zhujinyong ea88a0bf9d * Fix doc view. 2021-03-30 16:34:19 +08:00
qiyu-xie d371f402fc * Finish task#37011. 2021-03-30 16:30:24 +08:00
Yagami 2295ffd01c * Fix block link. 2021-03-30 16:26:13 +08:00
tianshujie98 b291e3138c Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 16:24:58 +08:00
tianshujie98 5f646301eb * Fix bug #11046. 2021-03-30 16:24:35 +08:00
Yagami 7dd002e764 * Hide execution qa priv. 2021-03-30 16:14:44 +08:00
Yagami c5031c8216 * Fix code. 2021-03-30 16:13:13 +08:00
leiyong 6fe0d38959 * Adjust code. 2021-03-30 11:06:09 +03:00
zhujinyong 04b84b54c9 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 16:03:52 +08:00
zhujinyong e55a7c8a4a * Fix copy bug. 2021-03-30 16:03:11 +08:00
holan20180123 5a66f76019 * Adjust long time project. 2021-03-30 15:46:07 +08:00
qiyu-xie 795b2aa045 * Fix bug. 2021-03-30 15:44:39 +08:00
holan20180123 ac77035240 * Finish task #37098. 2021-03-30 15:40:11 +08:00
holan20180123 2c1d41da05 * Finish task #37096. 2021-03-30 15:36:25 +08:00
tianshujie98 82142502e6 * Fix a bug. 2021-03-30 15:35:24 +08:00
tianshujie98 975090d0e5 * Fix bug #11051. 2021-03-30 15:22:04 +08:00
zhujinyong 93c412a48a Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 15:21:13 +08:00
zhujinyong b53cae0ce6 * Fix bug: copy bug from project and execution. 2021-03-30 15:20:35 +08:00
qiyu-xie 7613b58cd2 * Fix bug#11149. 2021-03-30 15:18:26 +08:00
tianshujie98 a034f1fb4c * Fix bug #11065. 2021-03-30 15:09:19 +08:00
holan20180123 203ac45623 Merge branch '15.0.beta3' of http://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-03-30 15:09:01 +08:00
holan20180123 eb73c2f8fc * Finish task #37098. 2021-03-30 15:08:47 +08:00
leiyong 467bfd85b8 * Adjust code. 2021-03-30 10:02:44 +03:00
tianshujie98 54f66b88e7 * Fix bug #11093. 2021-03-30 14:56:13 +08:00
holan20180123 424a1cf2f0 * Finish task #37126. 2021-03-30 14:52:13 +08:00
qiyu-xie 2f92f44ba0 * Fix bug. 2021-03-30 14:46:55 +08:00
Catouse 8b17c0adda * fix auto jump for apps not work as expect. 2021-03-30 14:42:42 +08:00
Yagami 118e255325 * Fix bug drop menu link. 2021-03-30 14:41:45 +08:00