Commit Graph
102215 Commits
Author SHA1 Message Date
刘刚 992d3ea52d Merge branch dev/task-145693 of zentao/zentaopms (#9841) 2025-06-24 15:40:18 +08:00
刘刚 9ef36c45b4 Merge branch dev/bug-63604 of zentao/zentaopms (#9834) 2025-06-24 15:35:05 +08:00
刘刚 e7b254045d Merge branch release/21.7.2 of zentao/zentaopms (#9833) 2025-06-24 15:34:54 +08:00
刘刚 0223cb9ae3 Merge branch dev/task-145693 of zentao/zentaopms (#9840) 2025-06-24 15:34:12 +08:00
daitingting 0ba76a9193 * [task#145693,done,1h] Get old scopes by id. 2025-06-24 15:27:39 +08:00
sunhao 81423d1a85 * [misc] enhance loadTarget method, support for setting target with selector. 2025-06-24 14:22:31 +08:00
刘刚 f19225eefb Merge branch dev/bug-63604 of zentao/zentaopms (#9829) 2025-06-24 14:20:34 +08:00
刘刚 8a33a05e7c Merge branch dev/bug-63562 of zentao/zentaopms (#9830) 2025-06-24 14:20:21 +08:00
刘刚 0a251f1433 Merge branch dev/bug-62997 of zentao/zentaopms (#9828) 2025-06-24 14:20:12 +08:00
wangyidong bc661c9a61 * [refac bug #63604] Add setobjectlink model method test. 2025-06-24 13:56:20 +08:00
刘刚 9a0ecc076b Merge branch dev/bug-63562 of zentao/zentaopms (#9827) 2025-06-24 13:44:07 +08:00
刘刚 ce6b111cdc Merge branch release/21.7.2 of zentao/zentaopms (#9826) 2025-06-24 13:43:56 +08:00
刘刚 b30641f878 Merge branch dev/bug-62997 of zentao/zentaopms (#9825) 2025-06-24 13:43:38 +08:00
刘刚 3ef79f46df Merge branch dev/bug-63604 of zentao/zentaopms (#9824) 2025-06-24 13:43:22 +08:00
wangyuting cb65f7c414 * [bug#63562,done,1h,0h] Remove project template begin and end field. 2025-06-24 13:22:23 +08:00
xieqiyu ed66eef466 * [bug#62997] Get zentao list when export doc from template. 2025-06-24 05:18:50 +00:00
sunhao 6cdc389544 * [misc] add more option to search toggle for setting search form options. 2025-06-24 13:17:57 +08:00
sunhao 129b2df2be * [misc] update zui3 lib. 2025-06-24 13:17:30 +08:00
wangyidong d9d90a721e * [refac bug #63604,63601] Adjust for set action link. 2025-06-24 12:13:08 +08:00
刘刚 32c883bbc5 Merge branch dev/bug-63598 of zentao/zentaopms (#9821) 2025-06-24 10:54:58 +08:00
李阳 6c77a3e53f Merge branch release/21.7.2 of zentao/zentaopms (#9820) 2025-06-24 10:53:36 +08:00
wangyidong 56965af026 * [unit] Adjust for not create login action for test. 2025-06-24 10:52:03 +08:00
刘刚 c376f78052 Merge branch dev/bug-63598 of zentao/zentaopms (#9817) 2025-06-24 10:46:44 +08:00
李阳 12ce41bf86 * [unittest] fix action table data. 2025-06-24 10:42:28 +08:00
wangyidong 624873ee8c * [refac bug #63598] revert to not implements SessionHandlerInterface. 2025-06-24 10:17:02 +08:00
刘刚 e27b648178 Merge branch dev/community-lang of zentao/zentaopms (#9815) 2025-06-24 10:07:22 +08:00
刘刚 deddfe6962 Merge branch dev/community-lang of zentao/zentaopms (#9813) 2025-06-24 09:54:29 +08:00
刘刚 5f77fbb414 Merge branch release/21.7.2 of zentao/zentaopms (#9814) 2025-06-24 09:45:28 +08:00
liyang fc730fa936 * [unittest] fix action table data. 2025-06-24 09:39:06 +08:00
zhangjialiang 499d4639a9 Merge branch 'dev/community-lang' of https://gitfox.zcorp.cc/git/zentao/zentaopms into dev/community-lang 2025-06-24 08:55:38 +08:00
朱金勇 572801d909 Merge branch dev/community-lang of zentao/zentaopms (#9809) 2025-06-24 08:55:18 +08:00
zhangjialiang 4a8eae592c * Restore adjust admin register to community. 2025-06-24 08:47:47 +08:00
xieqiyu 339c7a4b87 * [bug#63436] Return error when module is empty in edit doc template. 2025-06-24 08:47:47 +08:00
zhangjialiang 9141ad90bb * Restore adjust admin register to community. 2025-06-24 08:47:47 +08:00
wangyidong 01cbb7a215 * [perf story #75382] Adjust ztSessionHandler class. 2025-06-24 08:47:47 +08:00
daitingting 305aae7540 * [task#145383,done,2h] Check execution priviledge for task list in document block. 2025-06-24 08:47:47 +08:00
liumengyi a4165e1b90 * [bug#63588,done,0.1h] set default branch. 2025-06-24 08:47:47 +08:00
liumengyi f93dd77df8 * [bug#63589,done,0.1h] process testtask's status. 2025-06-24 08:47:47 +08:00
xieqiyu 528f14cc1f * [bug#63421] Replace upgrade to index for the url when upgrade doc template. 2025-06-24 08:47:47 +08:00
刘刚 6bc547fd95 Merge branch dev/bug-63436 of zentao/zentaopms (#9810) 2025-06-24 08:36:59 +08:00
zhangjialiang 1edd975576 Merge branch 'dev/bug-community' into dev/community-lang 2025-06-23 18:23:35 +08:00
zhangjialiang 263c6cc6b2 Merge branch 'release/21.7.2' into dev/community-lang 2025-06-23 18:22:55 +08:00
zhangjialiang 76e6b08a85 * Fix revise the English translation. 2025-06-23 18:20:13 +08:00
zhangjialiang edc2b4e969 * Fix revise the English translation. 2025-06-23 18:20:13 +08:00
刘刚 6f0bb68166 Merge branch dev/bug-63436 of zentao/zentaopms (#9806) 2025-06-23 18:17:52 +08:00
刘刚 6b1dc17be1 Merge branch release/21.7.2 of zentao/zentaopms (#9805) 2025-06-23 18:17:41 +08:00
刘刚 09bf0708f3 Merge branch dev/task-145383 of zentao/zentaopms (#9804) 2025-06-23 18:17:24 +08:00
刘刚 f661e6bfde Merge branch dev/bug-63588 of zentao/zentaopms (#9802) 2025-06-23 18:17:10 +08:00
刘刚 0abfb0f660 Merge branch dev/bug-63589 of zentao/zentaopms (#9801) 2025-06-23 18:17:01 +08:00
刘刚 36c3e2be72 Merge branch dev/bug-63421 of zentao/zentaopms (#9800) 2025-06-23 18:16:53 +08:00