Commit Graph
102393 Commits
Author SHA1 Message Date
刘刚 0cbc62c60e Merge branch dev/bug-63734 of zentao/zentaopms (#9966) 2025-06-26 13:52:42 +08:00
刘刚 fa6391b38d Merge branch dev/bug-63730 of zentao/zentaopms (#9965) 2025-06-26 13:49:27 +08:00
刘刚 12919f5ca0 Merge branch dev/bug-63734 of zentao/zentaopms (#9960) 2025-06-26 13:47:32 +08:00
刘刚 17cf395366 Merge branch dev/bug-63662 of zentao/zentaopms (#9959) 2025-06-26 13:47:23 +08:00
刘刚 b0e11a4bd2 Merge branch dev/bug-63730 of zentao/zentaopms (#9957) 2025-06-26 13:46:47 +08:00
刘刚 e9ceafbbd1 Merge branch dev/bug-63682 of zentao/zentaopms (#9954) 2025-06-26 13:28:38 +08:00
刘刚 13bd3dbb2b Merge branch dev/bug-63729 of zentao/zentaopms (#9953) 2025-06-26 13:28:29 +08:00
刘刚 1250845155 Merge branch dev/bug-63654 of zentao/zentaopms (#9962) 2025-06-26 13:28:16 +08:00
xieqiyu b4798310b8 * [bug#63734] Filter the template in doc list. 2025-06-26 03:52:08 +00:00
刘刚 1e84ac8bc2 Merge branch dev/bug-63682 of zentao/zentaopms (#9952) 2025-06-26 11:33:05 +08:00
sunguangming 2a77cb13dc * [bug#63730,done,0.2h] fix bug. 2025-06-26 03:22:39 +00:00
刘刚 9c85fde1d6 Merge branch release/21.7.2 of zentao/zentaopms (#9951) 2025-06-26 11:20:43 +08:00
刘刚 88832067c4 Merge branch dev/bug-63662 of zentao/zentaopms (#9950) 2025-06-26 11:20:29 +08:00
刘刚 1ef12c0d26 Merge branch dev/bug-63654 of zentao/zentaopms (#9948) 2025-06-26 11:20:13 +08:00
刘刚 804d30cafa Merge branch dev/bug-63668 of zentao/zentaopms (#9947) 2025-06-26 11:19:57 +08:00
刘刚 53b4b1b57b Merge branch dev/bug-63710 of zentao/zentaopms (#9946) 2025-06-26 11:19:51 +08:00
sunguangming 4b69feb71b * [sql] add datasource sql. 2025-06-26 03:17:27 +00:00
wangyuting 4481a3d423 * [bug#63682,done,0.2h,0h] Fix assignedTo params is string error. 2025-06-26 11:15:07 +08:00
daitingting a3d7747bb2 * [bug#63662,done,1h] Remove data write back code. 2025-06-26 11:04:07 +08:00
xieqiyu b27297b0d3 * [bug#63654] Set value when col is status type and text type. 2025-06-26 03:02:36 +00:00
刘刚 29446edfda Merge branch dev/bug-63729 of zentao/zentaopms (#9944) 2025-06-26 10:46:37 +08:00
刘刚 d32fc5b3b2 Merge branch dev/bug-63668 of zentao/zentaopms (#9943) 2025-06-26 10:45:14 +08:00
刘刚 0e587e25ea Merge branch dev/bug-63710 of zentao/zentaopms (#9942) 2025-06-26 10:45:03 +08:00
刘刚 f8f589c136 Merge branch dev/bug-63656 of zentao/zentaopms (#9939) 2025-06-26 10:44:36 +08:00
刘刚 bc5af10711 Merge branch release/21.7.2 of zentao/zentaopms (#9937) 2025-06-26 10:44:04 +08:00
wangyuting 96d0a274ec * [bug#63729,done,1h,0h] Fix mysql8.0 search groups error. 2025-06-26 10:39:05 +08:00
xieqiyu 2d486fcfff * [bug#63668] Locate zentaolist page in export doc word. 2025-06-26 02:37:29 +00:00
xieqiyu a9fbb58cbe * [bug#63710] Add the data of built-in when enter template home. 2025-06-26 02:17:41 +00:00
sunguangming 3a57be749a * [misc] modify sql bug. 2025-06-26 01:52:38 +00:00
刘刚 3181fea8b9 Merge branch dev/bug-63624 of zentao/zentaopms (#9936) 2025-06-26 09:09:34 +08:00
刘刚 8b639569b5 Merge branch release/21.7.2 of zentao/zentaopms (#9934) 2025-06-26 09:07:04 +08:00
刘刚 a962578196 Merge branch dev/bug-63705 of zentao/zentaopms (#9933) 2025-06-26 09:06:53 +08:00
刘刚 f3e2fc8e49 Merge branch dev/bug-63624 of zentao/zentaopms (#9932) 2025-06-26 09:06:45 +08:00
刘刚 94f059fdac Merge branch release/21.7.2 of zentao/zentaopms (#9935) 2025-06-26 09:05:27 +08:00
tianshujie 70ddccaf22 * [unittest] fix getfileicon error. 2025-06-26 09:01:05 +08:00
wangyidong 2249078e92 * [refac bug #63624] Adjust unit test. 2025-06-26 08:44:12 +08:00
sunhao 64bfc2c117 * [misc] update zui3 lib. 2025-06-25 22:33:26 +08:00
wangyidong b666a6cde0 * [refac bug #63624] Adjust for hasPreOrNext method. 2025-06-25 17:35:27 +08:00
刘刚 0ccee8ff84 Merge branch dev/bug-63538 of zentao/zentaopms (#9929) 2025-06-25 17:17:03 +08:00
刘刚 5f4a39f1da Merge branch dev/bug-63620 of zentao/zentaopms (#9928) 2025-06-25 16:54:36 +08:00
刘刚 1da28f58b5 Merge branch dev/bug-63705 of zentao/zentaopms (#9927) 2025-06-25 16:54:25 +08:00
刘刚 f6326d0f7f Merge branch dev/bug-63538 of zentao/zentaopms (#9926) 2025-06-25 16:54:15 +08:00
刘刚 60812c87eb Merge branch dev/task-145754 of zentao/zentaopms (#9925) 2025-06-25 16:54:06 +08:00
刘刚 617fa8ffcb Merge branch dev/bug-63538 of zentao/zentaopms (#9923) 2025-06-25 16:53:30 +08:00
刘刚 7510ea87ef Merge branch dev/bug-61859 of zentao/zentaopms (#9922) 2025-06-25 16:53:18 +08:00
sunguangming 7e780aebbb * [bug#63540,done,0.2h] fix bug. 2025-06-25 08:33:25 +00:00
wangyidong f7fb754184 * [refac bug #63705] Adjust call session_set_save_handler method. 2025-06-25 16:20:25 +08:00
sunguangming 299b442ba2 * [bug#63630,done,0.2h] fix bug. 2025-06-25 08:03:41 +00:00
刘刚 d84d8f1dc2 Merge branch dev/bug-63538 of zentao/zentaopms (#9921) 2025-06-25 15:54:01 +08:00
刘刚 5616804712 Merge branch dev/bug-61859 of zentao/zentaopms (#9920) 2025-06-25 15:53:52 +08:00