Commit Graph
100 Commits
Author SHA1 Message Date
tianshujie98 289adb62c8 * Fix bug #13581. 2021-07-14 11:22:56 +08:00
tianshujie98 d279fa648a * Fix bug #13612. 2021-07-14 10:41:08 +08:00
tianshujie98 5ae0d22992 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-14 10:30:58 +08:00
tianshujie98 7e13c5544b * Adjust code style. 2021-07-14 10:30:19 +08:00
tianshujie98 e23de07bee Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-13 15:17:16 +08:00
tianshujie98 132d5484f9 * Adjust code. 2021-07-13 15:17:04 +08:00
tianshujie98 8c6f5898ea * Fix an error. 2021-07-13 15:00:40 +08:00
tianshujie98 690980d60a * Fix an error. 2021-07-13 14:41:02 +08:00
tianshujie98 e2f6101340 * Add start and end date judgment. 2021-07-13 14:00:34 +08:00
tianshujie98 1926cb7ad9 * Fix bug #13579. 2021-07-13 13:41:57 +08:00
tianshujie98 6977cf91ed * Add select all. 2021-07-13 13:38:14 +08:00
tianshujie98 309f6047ee * Fix logic problems. 2021-07-13 10:11:34 +08:00
tianshujie98 106ffc839e * Finish task #40011. 2021-07-12 16:34:59 +08:00
tianshujie98 867452258d * Fix bug. 2021-07-12 15:40:29 +08:00
tianshujie98 bad9c9e042 * Finish task #40016,40017. 2021-07-12 14:52:46 +08:00
tianshujie98 55130c2ee9 * Finish task #40003. 2021-07-10 10:12:49 +08:00
tianshujie98 5e1e83721a * Add language item. 2021-07-10 00:40:33 +08:00
tianshujie98 b31e7af388 * Fix bug. 2021-07-09 15:11:37 +08:00
tianshujie98 92467420b5 * Fix bug. 2021-07-09 15:03:57 +08:00
tianshujie98 7ca5a95ea4 * Fix an error. 2021-07-08 14:47:12 +08:00
tianshujie98 4c3af55bbb * Add the language item of the project. 2021-07-08 14:31:03 +08:00
tianshujie98 cb4fd5ffb1 * Fix bug. 2021-07-07 13:42:12 +08:00
tianshujie98 d38280e257 * Fix bug #13518. 2021-07-07 10:47:45 +08:00
tianshujie98 3369449307 * Fix bug #13519. 2021-07-07 10:39:00 +08:00
tianshujie98 3e5e6cf6e2 * Fix bug #13508. 2021-07-06 14:23:27 +08:00
tianshujie98 90056bbe7c * Fix bug #13495. 2021-07-06 10:16:30 +08:00
tianshujie98 085811d8d4 * Fix bug #13495. 2021-07-06 09:25:38 +08:00
tianshujie98 480c6e4afc * Adjust code. 2021-07-06 08:19:15 +08:00
tianshujie98 c4191da835 * Fix bug #13485. 2021-07-06 08:11:11 +08:00
tianshujie98 53f21df6d2 * Fix bug #13250. 2021-07-05 15:29:09 +08:00
tianshujie98 51ff47c095 * Fix bug #13057. 2021-07-05 14:52:33 +08:00
tianshujie98 ecb988b495 * Fix bug #13360. 2021-07-05 14:32:31 +08:00
tianshujie98 98f7e592ad * Fix bug #13443. 2021-07-05 13:39:04 +08:00
tianshujie98 07c4cf8887 * Adjust code. 2021-07-02 13:52:33 +08:00
tianshujie98 c5e4c1d1c9 * Finish task #39840. 2021-07-02 08:54:26 +08:00
tianshujie98 b96490b491 * Finish task #39870. 2021-07-01 17:22:00 +08:00
tianshujie98 d3571635f8 * Adjust code. 2021-07-01 10:21:29 +08:00
tianshujie98 ecb973f9d9 * Adjust code. 2021-06-30 17:13:39 +08:00
tianshujie98 a1cda98a92 * Adjust code. 2021-06-30 16:31:36 +08:00
tianshujie98 432c4564be * Adjust code. 2021-06-30 16:27:44 +08:00
tianshujie98 54ead1734e * Adjust code. 2021-06-30 16:07:41 +08:00
tianshujie98 1cf38e09f1 * Adjust code. 2021-06-30 14:55:37 +08:00
tianshujie98 360d5ab644 * Fix bug. 2021-06-30 14:47:45 +08:00
tianshujie98 48a545ea4d * Adjust code. 2021-06-30 14:07:47 +08:00
tianshujie98 fed23d507d * Adjust code. 2021-06-30 11:02:08 +08:00
tianshujie98 9f967a7635 * Adjust code. 2021-06-30 10:58:21 +08:00
tianshujie98 7653154b20 * Adjust code. 2021-06-30 10:28:51 +08:00
tianshujie98 584823089c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-29 16:45:14 +08:00
tianshujie98 49d1c35356 * Adjust code. 2021-06-29 16:44:54 +08:00
tianshujie98 e9cbc7b383 * Adjust code. 2021-06-29 15:08:33 +08:00
tianshujie98 facb35a4e5 * Adjust code. 2021-06-29 09:23:37 +08:00
tianshujie98 71e268a06b * Adjust code. 2021-06-28 16:24:01 +08:00
tianshujie98 2f3033138f * Adjust code. 2021-06-28 13:09:58 +08:00
tianshujie98 626f7346fa * Adjust code. 2021-06-28 13:03:16 +08:00
tianshujie98 e3087ad9fb Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-24 15:03:50 +08:00
tianshujie98 e6b9ec682f * Fix bug. 2021-06-24 15:03:35 +08:00
tianshujie98 16b137a9a0 * Add method of caselib module. 2021-06-24 09:07:48 +08:00
tianshujie98 ff5efc984f * Fix bug of doc module. 2021-06-22 09:22:12 +08:00
tianshujie98 166decfa53 * Fix bug of doc module. 2021-06-22 09:18:53 +08:00
tianshujie98 14b887c714 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-21 14:49:32 +08:00
tianshujie98 1d6ffcd6b4 * Fix bug #13170. 2021-06-21 14:49:16 +08:00
tianshujie98 2323481feb * Fix bug #13263. 2021-06-21 14:32:44 +08:00
tianshujie98 61b2439593 * Fix bug 13268. 2021-06-21 14:30:54 +08:00
tianshujie98 ab450196b2 * Fix bug #13268. 2021-06-21 13:58:50 +08:00
tianshujie98 4369c928d8 * Fix the problem of batch creation todo. 2021-06-21 13:17:24 +08:00
tianshujie98 c38c99e0a8 * Fix bug. 2021-06-18 16:17:04 +08:00
tianshujie98 8004b37132 * Fix bug #13257. 2021-06-18 15:51:25 +08:00
tianshujie98 4c792a2318 * Fix bug. 2021-06-18 14:41:03 +08:00
tianshujie98 637a3c29e4 * Fix bug. 2021-06-18 14:16:02 +08:00
tianshujie98 00985acb35 * Fix bug 13246. 2021-06-18 13:36:50 +08:00
tianshujie98 be0f4320e6 * Fix bug #13248. 2021-06-18 11:25:28 +08:00
tianshujie98 57d390129c Fix an error. 2021-06-18 09:54:11 +08:00
tianshujie98 abe711e334 * Finish task #39450. 2021-06-18 09:10:40 +08:00
tianshujie98 53cf8a8b2a * Finish task #39451. 2021-06-18 09:05:37 +08:00
tianshujie98 52246b07cc * Adjust code. 2021-06-17 14:26:12 +08:00
tianshujie98 afa6c54f93 * Adjust code. 2021-06-16 17:14:31 +08:00
tianshujie98 420a526d54 * Adjust code. 2021-06-16 14:08:34 +08:00
tianshujie98 08d176663e * Fix dynamic issues. 2021-06-16 13:45:40 +08:00
tianshujie98 941525e672 * Adjust the jump app. 2021-06-16 13:31:34 +08:00
tianshujie98 2ab2964fe5 * Fix work and contribute navigation permission check issues. 2021-06-16 11:12:30 +08:00
tianshujie98 5a6630e11e * Adjust code. 2021-06-15 17:12:40 +08:00
tianshujie98 c22b78a555 * Fix the problem of pending block. 2021-06-15 16:38:50 +08:00
tianshujie98 4de6fa1c01 * Ajust page. 2021-06-15 11:03:20 +08:00
tianshujie98 48ddd1957b * Adjust code. 2021-06-12 21:32:31 +08:00
tianshujie98 16b3845b2e * Add meeting to pending block. 2021-06-12 21:06:57 +08:00
tianshujie98 d179eec394 * Add meeting to pending. 2021-06-12 18:56:39 +08:00
tianshujie98 f7e9df2037 * Add session. 2021-06-10 15:22:36 +08:00
tianshujie98 aed100aaf0 * Adjust code. 2021-06-10 10:01:41 +08:00
tianshujie98 5e313ffdf3 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-06-09 13:12:31 +08:00
tianshujie98 36691f54c0 * Finish task #39086. 2021-06-09 13:12:17 +08:00
tianshujie98 fe58d5f20e * Fix bug #13082. 2021-06-05 21:09:16 +08:00
tianshujie98 f3921abf0a * Finish task #38922. 2021-06-04 22:41:29 +08:00
tianshujie98 0eb60e6129 * Finish task #38921. 2021-06-04 21:55:57 +08:00
tianshujie98 3dbe2cde46 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 17:30:43 +08:00
tianshujie98 80b876383c * Finish task #38920. 2021-06-04 17:30:09 +08:00
tianshujie98 e4f221bf59 * Finish task #38917. 2021-06-04 16:41:38 +08:00
tianshujie98 ca9a6ba037 * Modify language items. 2021-06-04 16:21:19 +08:00
tianshujie98 d83d07dd68 Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3 2021-06-04 16:13:21 +08:00
tianshujie98 64ac581298 * Modify language items. 2021-06-04 16:12:59 +08:00
tianshujie98 3d91cef47c * Finish task #38919. 2021-06-04 15:47:43 +08:00