Commit Graph
21877 Commits
Author SHA1 Message Date
tianshujie98 e92cd6bf2a * Fix bug #3883. 2021-02-02 11:26:54 +08:00
tianshujie98 9a437c2dce Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-02 11:04:34 +08:00
tianshujie98 6941ceb031 * Fix bug #3883. 2021-02-02 11:04:15 +08:00
Catouse e91ba72da3 * fix bottom space of page tab. 2021-02-02 10:46:03 +08:00
Catouse b5963211d9 * bug #3882, fix angle button style in ie11. 2021-02-02 10:28:16 +08:00
hufangzhou 3d833daad2 * Fix bug #3881. 2021-02-02 10:24:16 +08:00
leiyong 73fe761bdf * Adjust common module code. 2021-02-02 10:06:46 +08:00
leiyong 386f7c1006 * Fix bug#3870. 2021-02-02 09:52:23 +08:00
tianshujie98 ffe87450eb * Fix bug #3878. 2021-02-02 09:45:19 +08:00
tianshujie98 f98bce89fb * Fix bug #3875. 2021-02-02 09:08:18 +08:00
qiyu-xie a5ae8af88d * Fix bug#3869. zentaopms_20.0.beta4_20210202 zentaopms_13.0.beta4_20210202 2021-02-02 08:55:00 +08:00
sgm0422 c59bd5168f Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-01 16:45:24 +08:00
sgm0422 c11c68997d * Delete unused file. 2021-02-01 16:45:15 +08:00
leiyong 9434ea0860 * Fix bug. 2021-02-01 16:26:31 +08:00
hufangzhou 940a46576c Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-01 16:23:13 +08:00
hufangzhou 469c97bdbb * Fix bug #3868. 2021-02-01 16:23:10 +08:00
sgm0422 4e4106dbac Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-01 15:57:48 +08:00
sgm0422 750e6ea3fc * Fix upgrade logic. 2021-02-01 15:57:37 +08:00
hufangzhou 3a43cf09a3 * Fix bug #3866. 2021-02-01 15:44:28 +08:00
hufangzhou 9a2c6ebd2e Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-01 15:25:03 +08:00
hufangzhou c9190e160b * Fix bug #3865. 2021-02-01 15:25:00 +08:00
leiyong 73e95c0459 * Fix bug. 2021-02-01 14:34:06 +08:00
leiyong 98b22fb7f2 * Fix bug. 2021-02-01 14:09:58 +08:00
hufangzhou 7e733bfe27 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-01 11:23:22 +08:00
hufangzhou df9e69a6ed * Fix bug #3847. 2021-02-01 11:23:19 +08:00
tianshujie98 0ca1b70e01 * Fix bug #3853. 2021-02-01 11:16:06 +08:00
tianshujie98 a8a7cd6d7d * Fix bug. 2021-02-01 11:02:46 +08:00
tianshujie98 d2df19e920 * Modify language prompt. 2021-02-01 10:57:30 +08:00
sgm0422 1db3486962 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-01 10:47:21 +08:00
sgm0422 b1aa6c4d3e * Fix methodName. 2021-02-01 10:47:09 +08:00
tianshujie98 3f8ddb1c88 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-01 10:41:20 +08:00
tianshujie98 2df27f17e9 * Fix bug #3849. 2021-02-01 10:40:57 +08:00
tianshujie98 f91b227e02 * Fix bug #3849. 2021-02-01 10:32:19 +08:00
holan20180123 e48c66c1d4 * Finish task #9118. 2021-02-01 10:09:25 +08:00
hufangzhou 497dcb9e19 * Adjust the code. 2021-02-01 09:57:28 +08:00
leiyong 3ae818d322 * Adjust lang file. 2021-02-01 09:05:43 +08:00
leiyong 162740eddc * Fix bug. 2021-02-01 08:28:25 +08:00
leiyong 450aa98ce0 * Fix bug. 2021-02-01 08:17:23 +08:00
leiyong 458b1e09b0 * Fix bug. 2021-01-29 18:40:01 +08:00
leiyong 534a48e193 * Fix bug. 2021-01-29 18:37:46 +08:00
leiyong fa8ac71eee * Add version. 2021-01-29 17:10:24 +08:00
hufangzhou 8fe650c9bf * Delete the nonuse code. 2021-01-29 16:52:00 +08:00
hufangzhou 86bf33415e * Adjust the code. 2021-01-29 16:35:38 +08:00
hufangzhou 6f25b82c83 * Fix bug #3845. 2021-01-29 16:23:34 +08:00
holan20180123 d74361b03a * Finish task #9097. 2021-01-29 16:01:03 +08:00
leiyong a55c99931e * Fix bug. 2021-01-29 15:40:01 +08:00
leiyong b3670c56bd * Fix bug. 2021-01-29 15:31:04 +08:00
holan20180123 608b1795f5 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-01-29 15:24:46 +08:00
holan20180123 0611a739fe * Finish task #9118. 2021-01-29 15:24:30 +08:00
leiyong 60cce4dbc8 * Adjust code. 2021-01-29 15:17:15 +08:00