Commit Graph

23902 Commits

Author SHA1 Message Date
Yagami
54d29dcafe * Add upgrade logic. 2021-04-09 13:41:06 +08:00
qiyu-xie
fc8e2f35ed * Fix bug#11829. 2021-04-09 13:10:58 +08:00
wangyidong
1c3e2539a2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 12:12:12 +08:00
wangyidong
44a6ed5a8c * fix for bug #11891. 2021-04-09 12:11:48 +08:00
qiyu-xie
bb810a8ec2 * Fix an error. 2021-04-09 11:28:20 +08:00
qiyu-xie
aa5ecd7221 * Fix bug#11832. 2021-04-09 11:26:35 +08:00
wangyidong
6d33b31d01 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 11:06:44 +08:00
tianshujie98
bf1db9630f Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 11:06:27 +08:00
tianshujie98
f06e34b0fa * Fix bug #11913. 2021-04-09 11:06:10 +08:00
wangyidong
c03a9024a4 * finish task #37314. 2021-04-09 11:05:23 +08:00
Yagami
c7c113de3f * Merge code. 2021-04-09 11:03:49 +08:00
leiyong
14dd2012cc * Finish task#37299. 2021-04-09 06:01:18 +03:00
hufangzhou
d6d855b9dc Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-09 10:59:34 +08:00
hufangzhou
8e1ec6dd34 * Fix a bug. 2021-04-09 10:59:30 +08:00
tianshujie98
4504bfef23 * Fix bug #11912. 2021-04-09 10:53:40 +08:00
qiyu-xie
01de23b3b4 * Fix bug#11832. 2021-04-09 10:34:19 +08:00
tianshujie98
506eaa5fdd * Fix bug #11867. 2021-04-09 10:30:21 +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
6f40a35d3d * Finish task#37284. 2021-04-09 05:27:04 +03:00
leiyong
3c72f70d36 * Finish task#37284. 2021-04-09 05:16:19 +03:00
qiyu-xie
49dd13be63 * Fix bug#11935. 2021-04-09 09:28:41 +08:00
hufangzhou
43515c3c47 * Fix an error. 2021-04-09 08:30:52 +08:00
hufangzhou
021249b734 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-08 17:27:04 +08:00
hufangzhou
43583934fc * Fix bug #11451. 2021-04-08 17:26:59 +08:00
wangyidong
85bc4283cb * adjust for menu. 2021-04-08 17:12:50 +08:00
Yagami
52511f5e7a * Fix todo calendar hight light. zentaopms_15.0.rc1_20210408 2021-04-08 17:11:31 +08:00
qiyu-xie
d79dc47720 * Fix bug #11834. 2021-04-08 17:09:42 +08:00
leiyong
df928c0223 * Adjust file filter.class.php. 2021-04-08 12:09:21 +03:00
hufangzhou
9e954a629e Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-08 17:08:41 +08:00
hufangzhou
0a110fdc41 * Fix bug #11834, #11835. 2021-04-08 17:08:37 +08:00
tianshujie98
8a14ccf864 * Fix bug #11914. 2021-04-08 16:19:08 +08:00
leiyong
b02d3d47e3 * Fix bug#11896. 2021-04-08 11:12:54 +03:00
Yagami
8a9ef397f4 * Fix burn error. 2021-04-08 16:11:18 +08:00
leiyong
058be5afda * Fix bug#11896. 2021-04-08 11:06:49 +03:00
Yagami
0608b51fd7 * Fix my-task view. 2021-04-08 15:58:59 +08:00
Yagami
28486fac4e * Fix execution icon. 2021-04-08 15:54:10 +08:00
leiyong
2017cb2c80 * Fix bug#11896. 2021-04-08 10:51:43 +03:00
Yagami
703ed680db * Fix lang file. 2021-04-08 15:42:43 +08:00
Yagami
6c23c0a1bc * Fix bug #11920. 2021-04-08 15:29:58 +08:00
tianshujie98
9b05e05bb5 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-08 15:24:45 +08:00
tianshujie98
ee800c9b72 * Fix bug #11864. 2021-04-08 15:24:14 +08:00
hufangzhou
666748f707 * Fix bug #11162. 2021-04-08 15:20:32 +08:00
hufangzhou
27931276a2 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-08 15:19:30 +08:00
hufangzhou
e5dd0e98fc * Finish task #37288. 2021-04-08 15:19:25 +08:00
Yagami
ba89a45150 * Fix icon. 2021-04-08 15:13:52 +08:00
tianshujie98
1bdc854229 * Fix edit doc error. 2021-04-08 15:08:25 +08:00
Yagami
b9736fc551 * Code for task #37122. 2021-04-08 15:02:34 +08:00
Yagami
ca96ce81e0 * Fix icon size. 2021-04-08 13:52:27 +08:00
hufangzhou
14d2e1b8aa Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-04-08 13:51:25 +08:00