Commit Graph
104460 Commits
Author SHA1 Message Date
刘刚 a41a7e46e8 Merge branch dev/bug-64109 of zentao/zentaopms (#10935) 2025-08-14 13:22:32 +08:00
xieqiyu bfa6e06a95 * [bug#64109] Set PO options to users. 2025-08-14 03:39:12 +00:00
刘刚 10de5d2172 Merge branch release/21.7.5 of zentao/zentaopms (#10931) 2025-08-14 08:56:33 +08:00
刘刚 fda74cb7bc Merge branch dev/bug-64713 of zentao/zentaopms (#10928) 2025-08-14 08:55:00 +08:00
sunhao a9a729bff6 * [misc] update zui3 lib. 2025-08-13 17:40:44 +08:00
sunhao 6415cec53e + [misc] add htmldiff lib. 2025-08-13 17:40:44 +08:00
sunhao a8ab72d482 * [misc] fix call undefined method '$.apps.triggerEvent' error. 2025-08-13 17:40:44 +08:00
刘刚 d295906639 Merge branch release/21.7.5 of zentao/zentaopms (#10925) 2025-08-13 15:00:12 +08:00
刘刚 553cc59348 Merge branch dev/bug-64713 of zentao/zentaopms (#10923) 2025-08-13 14:59:51 +08:00
tianshujie c5e93d7263 * [unittest] add step for removeEditing method. 2025-08-13 14:26:40 +08:00
tianshujie 1c195d8d83 * [unittest] add step for getOrderedProjects method. 2025-08-13 14:17:03 +08:00
xieqiyu f0a649e037 * [bug#64713] Add the unit test file of fileModel::buildFileActions. 2025-08-13 05:12:59 +00:00
刘刚 805e5be50f Merge branch release/21.7.5 of zentao/zentaopms (#10921) 2025-08-13 13:12:20 +08:00
刘刚 38c3f600c5 Merge branch release/21.7.5 of zentao/zentaopms (#10920) 2025-08-13 13:12:12 +08:00
刘刚 e8854473cd Merge branch release/21.7.5 of zentao/zentaopms (#10919) 2025-08-13 13:12:03 +08:00
tianshujie aacb447766 * [bug#64581,done,0.1h] format hours. 2025-08-13 11:56:17 +08:00
tianshujie 02d29d23ee * [bug#64581,done,0.25h] format hours. 2025-08-13 11:46:13 +08:00
xieqiyu 8cf0edc3e4 * [bug#64713] No change file title when print file. 2025-08-13 03:45:10 +00:00
sunguangming aaaa026716 * [bug#64480,done,0.2h] fix bug. 2025-08-13 03:43:02 +00:00
wangyidong afa4736d4d * [refac bug #64675] Adjust code for preview office file. 2025-08-13 11:12:17 +08:00
wangyidong 9ca876d026 * [refac bug #64675] Adjust code for preview office file. 2025-08-13 11:11:37 +08:00
wangyidong 2f3151f165 * [refac bug #64675] Fix for preview office file. 2025-08-13 10:59:09 +08:00
wangyidong 2171251241 * [perf story #77162] Add project suspend unit test step. 2025-08-13 10:58:07 +08:00
wangyidong f84406f9ec * [perf story #77161] Adjust personnelModel deleteProductWhitelist unit test. 2025-08-13 10:58:07 +08:00
wangyidong 0d800981ef * [perf story #77161] Adjust projectModel getWorkHour unit test. 2025-08-13 10:58:07 +08:00
李阳 f86f36acf7 Merge branch release/21.7.5 of zentao/zentaopms (#10914) 2025-08-13 09:38:13 +08:00
李阳 dd6c595419 Merge branch release/21.7.5 of zentao/zentaopms (#10916) 2025-08-13 09:37:56 +08:00
yulujie cae742b413 *[task#148341,doing,0.5h,4.5h] Fix bug. 2025-08-13 08:55:15 +08:00
lixiaoyu b273bf0fb5 *[task#147928,doing,0.1h,3h] 2025-08-13 08:51:58 +08:00
刘刚 8b8e78a111 Merge branch dev/bug-64637 of zentao/zentaopms (#10908) 2025-08-12 16:30:44 +08:00
刘刚 d12d47ad10 Merge branch release/21.7.5 of zentao/zentaopms (#10907) 2025-08-12 16:03:22 +08:00
刘刚 2ce607df3e Merge branch dev/bug-64637 of zentao/zentaopms (#10904) 2025-08-12 16:03:06 +08:00
wangyidong fbecd4f18d * [refac bug #64675] Fix for preview office file. 2025-08-12 15:39:33 +08:00
李阳 531d1df6b5 Merge branch release/21.7.5 of zentao/zentaopms (#10906) 2025-08-12 15:38:47 +08:00
lihuifang 655e731ad2 *[task#148340,doing,0.1h,3.8h] Add xpath. 2025-08-12 15:37:09 +08:00
lihuifang 4c12cbadd9 *[task#148340,doing,0.5h,4h] Add function. 2025-08-12 15:37:09 +08:00
lihuifang 2d1cfbdf83 *[task#148340,doing,0.2h,4.3h] Add data and case. 2025-08-12 15:37:09 +08:00
lihuifang 9e81248d04 *[task#148340,doing,0.3h,4.5h] Add data and case. 2025-08-12 15:37:09 +08:00
xieqiyu 34f537437a * [bug#64637] No change assignedTo when edit bug has assignedTo. 2025-08-12 07:34:05 +00:00
刘刚 6248606075 Merge branch release/21.7.5 of zentao/zentaopms (#10901) 2025-08-12 14:19:24 +08:00
刘刚 b160d1960f Merge branch dev/story-76386 of zentao/zentaopms (#10899) 2025-08-12 14:19:00 +08:00
李阳 1cc316b77b Merge branch release/21.7.5 of zentao/zentaopms (#10900) 2025-08-12 09:54:47 +08:00
tianshujie 11cd8d4ade * [task#148026,done,0.1h] add step for getOrderedProducts method. 2025-08-12 09:12:40 +08:00
lihuifang 394ede307d *[task#148340,done,0.1h,4.9h] Modify code. 2025-08-12 09:09:50 +08:00
tianshujie e49a8b2276 * [task#148025,done,0.2h] add steps for getModuleTree method. 2025-08-12 09:07:28 +08:00
tianshujie 17337424d0 * [unittest] fix computeCFD error. 2025-08-12 09:00:13 +08:00
tianshujie c443623da6 * [unittest] fix getDocQuery error. 2025-08-12 08:56:20 +08:00
tianshujie 9d154718b0 * [unittest] fix getByProducts error. 2025-08-12 08:41:46 +08:00
李阳 520f9d2224 Merge branch release/21.7.5 of zentao/zentaopms (#10894) 2025-08-12 08:32:19 +08:00
刘刚 78572da846 Merge branch dev/task-147531 of zentao/zentaopms (#10897) 2025-08-11 14:17:29 +08:00