Commit Graph
21915 Commits
Author SHA1 Message Date
leiyong 4ce72a430b * Fix bug. 2021-02-05 15:36:11 +08:00
leiyong 21dd44fc92 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-05 15:35:55 +08:00
holan20180123 ba3337c6a0 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-05 14:15:37 +08:00
holan20180123 8c50f17c84 * Fix bug #10950. 2021-02-05 14:15:10 +08:00
leiyong 21d9cd791d * Fix bug. 2021-02-05 13:10:40 +08:00
hufangzhou cf31720440 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-05 11:48:04 +08:00
hufangzhou 0a0babaf9b * Adjust the code. 2021-02-05 11:48:01 +08:00
leiyong ab1a5067e0 * Fix bug. 2021-02-04 16:25:02 +08:00
holan20180123 2401cc2b84 * Fix bug #3934. 2021-02-04 15:39:43 +08:00
leiyong 68214fb34f * Fix bug. 2021-02-04 14:05:38 +08:00
holan20180123 059cdf430a Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-04 13:40:43 +08:00
holan20180123 91048305df * Fix bug #3932. 2021-02-04 13:40:25 +08:00
hufangzhou ab98818b58 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-04 13:37:59 +08:00
hufangzhou 2828fd499b * Fix bug #3930. 2021-02-04 13:37:55 +08:00
tianshujie98 8583a43dbf * Fix bug. 2021-02-04 13:33:14 +08:00
tianshujie98 63e432e7ff * Fix bug. 2021-02-04 11:51:44 +08:00
hufangzhou da4c024c48 * Fix a bug. 2021-02-04 10:47:44 +08:00
leiyong 1625738053 * Fix bug. 2021-02-04 10:32:34 +08:00
holan20180123 27aeb9c488 * Fix bug #3894. 2021-02-03 15:51:07 +08:00
tianshujie98 1a8f14a0db * Fix bug #3910, 3916. 2021-02-03 15:48:05 +08:00
holan20180123 2816753e1b Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-03 14:45:48 +08:00
holan20180123 b0a831946c * Fin bug #3917. 2021-02-03 14:45:32 +08:00
Catouse 34abe8eaeb * add icon-devops. 2021-02-03 14:14:50 +08:00
leiyong 0d51f3cb7e * Fix bug. 2021-02-03 10:47:32 +08:00
hufangzhou 64bf0d2ba5 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-03 10:12:42 +08:00
hufangzhou 837ee705b0 * Fix a bug. 2021-02-03 10:12:37 +08:00
holan20180123 6c487c43c2 * Fix bug #3901. 2021-02-03 09:04:58 +08:00
holan20180123 f16b800104 * Fix bug #3899. 2021-02-02 17:00:24 +08:00
qiyu-xie 47b686c49d * Fix bug#3900. 2021-02-02 16:37:10 +08:00
hufangzhou d41832edc0 * Fix bug #3893. 2021-02-02 14:58:27 +08:00
hufangzhou a09d58c766 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-02 14:25:43 +08:00
hufangzhou 4540c9a10f * Fix bug #3892. 2021-02-02 14:25:40 +08:00
Catouse 404e764653 * refactor. 2021-02-02 13:31:22 +08:00
leiyong 6cc5d25da9 * Fix bug#3880. 2021-02-02 13:10:08 +08:00
Catouse e8b2b40d37 * fix input height in todo/create form. 2021-02-02 11:41:10 +08:00
tianshujie98 054104e3c3 Merge branch 'master' of https://git.zcorp.cc/zentaopms 2021-02-02 11:27:18 +08:00
tianshujie98 e92cd6bf2a * Fix bug #3883. 2021-02-02 11:26:54 +08:00
Catouse 4f9de3c10c * remove footer. 2021-02-02 11:20:46 +08:00
Catouse a7356a4998 * support for calling $.tabs.close() without params. 2021-02-02 11:16:18 +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