Commit Graph
100 Commits
Author SHA1 Message Date
tianshujie 95419d98d9 * Fix bug #34718. 2023-04-25 11:21:47 +08:00
tianshujie 5de561dc41 * Fix bug #34760. 2023-04-24 20:31:52 +08:00
tianshujie 99956b799d Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 20:05:19 +08:00
tianshujie da3ce6e392 * Fix bug #34762. 2023-04-24 20:05:06 +08:00
tianshujie df9d4cc61e Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 19:44:54 +08:00
tianshujie 0ac0f009ec * Fix bug #34642. 2023-04-24 19:44:41 +08:00
tianshujie 9ed9817f98 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 19:32:00 +08:00
tianshujie bb97a080a4 * Fix bug #34731. 2023-04-24 19:31:43 +08:00
tianshujie 78ef7e88c4 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 19:19:36 +08:00
tianshujie ec88bdf34a * Error modifying jump link. 2023-04-24 19:19:17 +08:00
tianshujie 0c22ac5614 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 18:37:45 +08:00
tianshujie bf7cdc1ee1 * Fix bug #34725. 2023-04-24 18:37:32 +08:00
tianshujie f979e6f672 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 18:18:04 +08:00
tianshujie c2c7cf380a * Fix bug #34722. 2023-04-24 18:17:49 +08:00
tianshujie 26b8880ba5 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 16:35:51 +08:00
tianshujie cc256db992 * Fix bug #34710. 2023-04-24 16:35:36 +08:00
tianshujie 9b0ed2a7bf Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 16:07:35 +08:00
tianshujie 000c800196 * Fix bug #34702. 2023-04-24 16:07:21 +08:00
tianshujie 5cb292635a * Fix bug #34691. 2023-04-24 15:51:40 +08:00
tianshujie f69507ab2e * Fix bug #34684. 2023-04-24 14:42:45 +08:00
tianshujie e1cff545d6 * Fix bug #34676. 2023-04-24 14:31:31 +08:00
tianshujie 831932222b * Fix bug #34676. 2023-04-24 14:24:59 +08:00
tianshujie cea07f16b6 * Fix bug #34671. 2023-04-24 13:48:24 +08:00
tianshujie 1a5321ee1a Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into 18.4 2023-04-24 11:27:38 +08:00
tianshujie 03d8023952 * Fix bug #34654. 2023-04-24 11:27:26 +08:00
tianshujie 4f7be5c494 * Modifying SQL errors. 2023-04-24 09:09:37 +08:00
tianshujie 690b95977e * Fix SQL error. 2023-04-23 13:06:00 +08:00
tianshujie 965b868fdb * Fix bug #34604. 2023-04-23 10:58:58 +08:00
tianshujie f18cde5955 * Fix bug #34601. 2023-04-23 10:58:23 +08:00
tianshujie ebdd8e410d * Change the action button color. 2023-04-21 10:47:46 +08:00
tianshujie d27d489adc * Fix the style problem of creating the document library. 2023-04-21 09:05:50 +08:00
tianshujie e2c553cf02 * Modify the Create Document button. 2023-04-21 09:00:22 +08:00
tianshujie 8f15eb15e6 * Fixed the interface details page skip problem. 2023-04-21 08:55:51 +08:00
tianshujie 32686d7132 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-20 15:29:33 +08:00
tianshujie 205327d891 * Fixed dynamic error reporting. 2023-04-20 15:28:45 +08:00
tianshujie a139d7f622 * Modified quick page document navigation. 2023-04-20 15:02:53 +08:00
tianshujie cf7cf423a3 * Limit header length. 2023-04-20 13:19:54 +08:00
tianshujie 2059a74de0 * Fix bug #34461. 2023-04-20 11:32:34 +08:00
tianshujie 1a90f75ffe Merge branch 'cyy_api' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_api 2023-04-20 11:26:08 +08:00
tianshujie 9cfaf694ec * Replace favorites button. 2023-04-20 11:25:46 +08:00
tianshujie 557061330d * Change the color of the document name in the document list. 2023-04-20 10:41:26 +08:00
tianshujie 3b777c1517 * Modify the document statistics block style. 2023-04-20 10:13:22 +08:00
tianshujie 397a50c798 * Fixed search button language item issue. 2023-04-20 09:45:48 +08:00
tianshujie 0f2a2b7bc3 * Fixed the interface details style problem. 2023-04-19 17:14:32 +08:00
tianshujie 44794fcd43 * Change button color. 2023-04-19 16:49:29 +08:00
tianshujie 18cba3006d * Modified create Project library page style. 2023-04-19 15:34:59 +08:00
tianshujie eb31e77d09 * Change the width of the create page control. 2023-04-19 14:32:44 +08:00
tianshujie 08b771ac3a * Fixed my spatial directory tree highlighting problem. 2023-04-19 14:18:27 +08:00
tianshujie 07ed9034a8 * Fixed a problem with the left module tree style. 2023-04-19 14:18:08 +08:00
tianshujie 43fa259a14 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 13:13:35 +08:00
tianshujie 4146e5551a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 11:21:38 +08:00
tianshujie da8f3ade7f * Fix bug #34350. 2023-04-19 10:39:19 +08:00
tianshujie c17bf269f6 * Fix bug #34338. 2023-04-19 10:31:22 +08:00
tianshujie 32cf3c4d20 * Fix bug #34337. 2023-04-19 10:19:42 +08:00
tianshujie 51cc9adb8f * Fix bug #34341. 2023-04-19 09:49:49 +08:00
tianshujie dd8fa67a12 * Fix bug #34359. 2023-04-19 09:10:42 +08:00
tianshujie 06c8d50719 * Modify the editor style. 2023-04-19 09:09:26 +08:00
tianshujie c2d8da46ee Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-19 09:07:21 +08:00
tianshujie 3062276963 * Check whether the field already exists. 2023-04-19 09:05:13 +08:00
tianshujie f7d94114cb * Fixed a scrollbar style problem. 2023-04-18 16:27:13 +08:00
tianshujie 987e940fe1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 15:56:52 +08:00
tianshujie 59e850ed48 * Fix bug #34312. 2023-04-18 15:54:23 +08:00
tianshujie 9a439c9cd5 * Fix bug #34312. 2023-04-18 15:36:16 +08:00
tianshujie f91245b985 * Fix bug #34315. 2023-04-18 15:14:45 +08:00
tianshujie 1fe920f873 * Compatible with Quick Edition project dropdown issues. 2023-04-18 15:04:09 +08:00
tianshujie ab04e42c0b * Fix bug #34316. 2023-04-18 14:44:27 +08:00
tianshujie f9f3549e9d Merge branch 'tsj_fixbug' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 14:18:27 +08:00
tianshujie 87f226f407 * Modify the document block style. 2023-04-18 14:18:14 +08:00
tianshujie 338599b562 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 14:16:36 +08:00
tianshujie 61ff47b68a * Code for task #91378. 2023-04-18 13:53:11 +08:00
tianshujie 0f49022d88 * Fix bug #34260. 2023-04-18 13:49:55 +08:00
tianshujie d165ce39b9 * Code for task #91378. 2023-04-18 13:40:47 +08:00
tianshujie 775088ac63 * Fix bug #34276. 2023-04-18 11:05:14 +08:00
tianshujie b4dc730385 * Fix bug #34284. 2023-04-18 10:56:15 +08:00
tianshujie 9df90e87a5 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort 2023-04-18 10:44:37 +08:00
tianshujie 4a46d918b1 * Code for task #91391. 2023-04-18 10:43:03 +08:00
tianshujie 7605903fe9 * Fix bug #34274. 2023-04-18 10:29:48 +08:00
tianshujie 32161d8d66 * Code for task #91391. 2023-04-18 10:23:03 +08:00
tianshujie b4c325c56e * Code for task #91378. 2023-04-18 09:13:45 +08:00
tianshujie 59afadec4a * Code for task #91389,91390. 2023-04-18 09:03:43 +08:00
tianshujie 4c595d88d7 * Delete useless variables. 2023-04-18 08:37:10 +08:00
tianshujie 4a980b4d7c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort 2023-04-18 08:34:41 +08:00
tianshujie 04a8604aa6 * Fix bug #34295. 2023-04-18 08:22:38 +08:00
tianshujie 12e04794a0 * Fix bug #34298. 2023-04-17 17:28:46 +08:00
tianshujie 84712f0f51 * Fix bug #34297. 2023-04-17 17:26:07 +08:00
tianshujie fb521320e0 * Code for task #91391. 2023-04-17 17:21:06 +08:00
tianshujie 7a8d7ace0b * Code for task #91391. 2023-04-17 16:41:36 +08:00
tianshujie c689f25199 * Code for task #91391. 2023-04-17 14:07:09 +08:00
tianshujie 8fc7ca7525 * Code for task #91391. 2023-04-17 13:56:21 +08:00
tianshujie 21f7143919 * Code for task #91391. 2023-04-17 11:12:09 +08:00
tianshujie f4cda4d780 * Code for task #91378. 2023-04-17 10:57:00 +08:00
tianshujie 8fbab2b84f * Modify upgrade program. 2023-04-14 17:31:02 +08:00
tianshujie 23171d926d * Fix field problems. 2023-04-14 17:09:27 +08:00
tianshujie d0f0d5bbbe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_block 2023-04-14 16:14:59 +08:00
tianshujie beffe82709 * Code for task #43816. 2023-04-14 16:11:06 +08:00
tianshujie 2c1fb2826b * Code for story #43815. 2023-04-14 15:31:41 +08:00
tianshujie 9cb069b33a * Optimized Level 2.5 dropdown interaction. 2023-04-14 13:47:27 +08:00
tianshujie f954e7935c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_issue 2023-04-14 13:31:12 +08:00
tianshujie 99c8caffaf * Fix bug #34184. 2023-04-14 11:30:25 +08:00
tianshujie 2088b588b1 * Modify the interaction of the Create document button. 2023-04-14 11:17:56 +08:00