Commit Graph

250 Commits

Author SHA1 Message Date
holan20180123
cf1eb77f7a * Finish task #37532. 2021-04-15 09:30:18 +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
qiyu-xie
76034151b0 * Delete execution drop menu icon. 2021-04-13 09:46:06 +08:00
wangyidong
6d15bc4ed0 * finish task #37408. 2021-04-13 09:16:32 +08:00
qiyu-xie
bcc8fc401f * Finish task#37387. 2021-04-12 16:05:29 +08:00
wangyidong
d75672885d Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-12 10:31:20 +08:00
wangyidong
403b4b3760 * finish task #37271. 2021-04-12 10:31:00 +08:00
leiyong
d0e21dee63 * Fix bug. 2021-04-09 13:16:24 +03:00
leiyong
dc0b429db4 * Fix bug. 2021-04-09 11:47:15 +03:00
Yagami
f5dde0e5df * Fix bug. 2021-04-09 16:46:30 +08:00
wangyidong
fdfd2c324a Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 16:38:13 +08:00
wangyidong
6d145002a1 * adjust for lang. 2021-04-09 16:37:57 +08:00
tianshujie98
edd4825045 * Fix bug #11934. 2021-04-09 16:34:26 +08:00
Yagami
d4400dd1cc * Fix execution all view style. 2021-04-09 16:00:34 +08:00
Yagami
62bc93ee58 * Fix bug. 2021-04-09 14:52:03 +08:00
tianshujie98
d40db92dbe * Fix bug #11893. 2021-04-09 13:41:00 +08:00
Yagami
c7c113de3f * Merge code. 2021-04-09 11:03:49 +08:00
wangyidong
bee071938e Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 10:30:04 +08:00
wangyidong
b90487fb74 * finish task #37280. 2021-04-09 10:29:45 +08:00
leiyong
3c72f70d36 * Finish task#37284. 2021-04-09 05:16:19 +03:00
hufangzhou
43515c3c47 * Fix an error. 2021-04-09 08:30:52 +08:00
Yagami
8a9ef397f4 * Fix burn error. 2021-04-08 16:11:18 +08:00
Yagami
28486fac4e * Fix execution icon. 2021-04-08 15:54:10 +08:00
Yagami
6c23c0a1bc * Fix bug #11920. 2021-04-08 15:29:58 +08:00
hufangzhou
666748f707 * Fix bug #11162. 2021-04-08 15:20:32 +08:00
Yagami
b9736fc551 * Code for task #37122. 2021-04-08 15:02:34 +08:00
Yagami
2aa8faf599 * Remove iframe. 2021-04-07 15:30:10 +08:00
Yagami
82df33e205 * Fix bug. 2021-04-07 14:12:17 +08:00
hufangzhou
a09d9f3cf3 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-06 15:58:51 +08:00
hufangzhou
6b7f84c9ac * Fix bug #11162, #11261. 2021-04-06 15:58:48 +08:00
Yagami
eaa478eaa4 * Fix bug. 2021-04-06 14:43:07 +08:00
holan20180123
8f5471ebe6 * Fix bug #11006,#11058. 2021-04-06 11:19:09 +08:00
sgm0422
7391916108 * Add en lang. 2021-04-02 21:01:35 +08:00
leiyong
8169f83607 * Fix bug. 2021-04-02 11:14:25 +03:00
leiyong
c71f232391 * Fix bug. 2021-04-02 10:32:17 +03: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
1df0e580c4 * Fix bug #11765. 2021-04-02 13:13:49 +08:00
leiyong
fbbb3b65ad * Fix bug#11056. 2021-04-02 04:56:53 +03:00
hufangzhou
75415b2956 * Fix an error. 2021-04-02 09:26:47 +08:00
leiyong
e97e88f0c5 * Adjust language items. 2021-04-01 12:52:15 +03:00
Yagami
00e1922daa * Fix error. 2021-04-01 16:06:08 +08:00
hufangzhou
68688736b5 * Fix bug #11742. 2021-04-01 15:56:30 +08:00
leiyong
abd8af87a6 * Fix bug. 2021-04-01 09:57:12 +03:00
tianshujie98
c720a37e55 * Fix bug. 2021-04-01 14:13:11 +08:00