Commit Graph
99524 Commits
Author SHA1 Message Date
刘刚 3964e5f94c Merge branch ztflow-xieqiyu-dev/bug-62752#xieqiyu of zentao/zentaopms (#9029) 2025-05-29 16:28:53 +08:00
xieqiyu 7eb14dc5e8 * [bug#62752] Add a line break after the article link. 2025-05-29 16:04:54 +08:00
刘刚 5c3bab6e4f Merge branch dev/task-143688 of zentao/zentaopms (#9014) 2025-05-29 13:26:09 +08:00
刘刚 9c9c7a5f04 Merge branch ztflow-xieqiyu-dev/task-143688#xieqiyu of zentao/zentaopms (#9009) 2025-05-29 13:11:57 +08:00
xieqiyu b27ef4ec97 * [task#143688,doing,1h] Hidden the menu of doc template in admin. 2025-05-29 11:03:30 +08:00
刘刚 96cab03877 Merge branch dev/task-143690 of zentao/zentaopms (#9007) 2025-05-29 10:44:45 +08:00
刘刚 13d80790ed Merge branch ztflow-xieqiyu-dev/task-143690#xieqiyu of zentao/zentaopms (#9003) 2025-05-29 10:40:56 +08:00
xieqiyu eebff824f4 * [task#143690,doing,0.5h] Process the doc template of PP when upgrade. 2025-05-29 10:10:41 +08:00
刘刚 f061288455 Merge branch dev/task-143975 of zentao/zentaopms (#8999) 2025-05-29 09:55:03 +08:00
刘刚 4cce585bca Merge branch ztflow-xieqiyu-dev/task-143975#xieqiyu of zentao/zentaopms (#8998) 2025-05-29 09:51:38 +08:00
xieqiyu e406b8d6f9 * [task#143975,doing,0.1h] Moidfy the problem of code review. 2025-05-29 09:41:26 +08:00
xieqiyu 54bc02c482 * [task#143975,doing,2h] Copy template before processing template data. 2025-05-29 09:08:17 +08:00
刘刚 6abc9703cf Merge branch dev/task-143871 of zentao/zentaopms (#8992) 2025-05-28 17:31:28 +08:00
刘刚 34fcfe015c Merge branch ztflow-daitingting-dev/task-143871#daitingting of zentao/zentaopms (#8989) 2025-05-28 17:20:54 +08:00
daitingting 3d07125426 * [task#143871,done,2h] Set gantt block when create document by template. 2025-05-28 09:13:26 +00:00
刘刚 7e96b73ba9 Merge branch dev/task-143872-143873 of zentao/zentaopms (#8942) 2025-05-27 17:27:11 +08:00
刘刚 fc07e9dd24 Merge branch ztflow-daitingting-dev/task-143872-143873#daitingting of zentao/zentaopms (#8940) 2025-05-27 17:20:05 +08:00
daitingting 2b8e228f83 * [task#143873,done,3h] Display gantt chart in document. 2025-05-27 09:06:04 +00:00
daitingting fde1afa600 * [task#143873,doing,2h] Insert gantt chart in document. 2025-05-27 09:04:09 +00:00
daitingting 5b9d63618c * [task#143872,doing,1h] Add gantt in zentao list. 2025-05-27 09:01:29 +00:00
刘刚 6f784c4973 Merge branch dev/bug-62864 of zentao/zentaopms (#8912) 2025-05-27 11:25:16 +08:00
刘刚 c3d4b905f3 Merge branch ztflow-daitingting-dev/bug-62864#daitingting of zentao/zentaopms (#8910) 2025-05-27 11:24:13 +08:00
daitingting 2a1568f585 * [bug#62864,done,1h] Adjust code order. 2025-05-27 03:02:34 +00:00
刘刚 d7a90f7a9f Merge branch dev/story-74960 of zentao/zentaopms (#8887) 2025-05-26 14:43:51 +08:00
刘刚 a018c1fdc6 Merge branch ztflow-xieqiyu-dev/story-74960#xieqiyu of zentao/zentaopms (#8885) 2025-05-26 14:16:18 +08:00
xieqiyu 1296026079 * [task#144016,doing,2h] Resotre type and scope when restore doc template. 2025-05-26 13:58:53 +08:00
刘刚 ff33b5fbf2 Merge branch ztflow-xieqiyu-feature/doctemplate#xieqiyu of zentao/zentaopms (#8877) 2025-05-26 09:07:05 +08:00
xieqiyu 24d4d9c82c Merge branch 'release/21.7.1' into feature/doctemplate 2025-05-26 08:46:50 +08:00
刘刚 e971d43e2f Merge branch dev/bug-62821 of zentao/zentaopms (#8872) 2025-05-26 08:36:43 +08:00
wangyidong 51fe5aa1d3 * [refac bug #62821] Use post parent task data first. 2025-05-23 17:34:49 +08:00
刘刚 5c33adba66 Merge branch ztflow-liyang-release/21.7.1#liyang of zentao/zentaopms (#8871) 2025-05-23 17:16:06 +08:00
liyang 36a9acf539 * [task#143866] adjust node error. 2025-05-23 17:12:42 +08:00
wangyidong e663174ecf * [refac bug #62819] Fix for task storyVersion for batch edit task. 2025-05-23 17:12:05 +08:00
wangyidong fd5276c5d4 * [refac bug #62789] Disabled attribute when edit ipd stage. 2025-05-23 16:51:55 +08:00
wangyidong d300064cd8 * [refac bug #62767] Fix workflow action and field name for execution. 2025-05-23 16:51:55 +08:00
wangyidong 996c39f3d7 * [refac bug #62796] Adjust for oceanbase. 2025-05-23 16:51:55 +08:00
wangyidong 873e2ed0a5 * [refac bug #62741] Adjust for child task estStarted and deadline value when parent is empty. 2025-05-23 16:51:55 +08:00
wangyidong 2ac5053bf0 * [refac bug #62230] Adjust disableModel var. 2025-05-23 16:51:55 +08:00
wangyidong b383e57ac9 * [refac bug #62250] Use zfile removeDir method to replace rmdir function. 2025-05-23 16:51:55 +08:00
sunguangming 3a73632684 * [bug#62829,done,0.2h] fix bug. 2025-05-23 16:51:35 +08:00
sunhao d0d8b8cd49 * [misc] update zui3 lib. 2025-05-23 16:51:26 +08:00
caoyanyi 9602f34cad * [misc] adjust sonar project search error. 2025-05-23 16:51:14 +08:00
sunhao f28b62f19e * [misc] remove edit btn from preview page when user no priv to edit current doc. 2025-05-23 16:35:14 +08:00
daitingting 2de0c1e285 * [task#143958,done,1h] Adjust the template type that needs to be upgraded. 2025-05-23 16:26:46 +08:00
xieqiyu a3b6edeaca * [task#143975,doing,0.5h] Add the test file of copytemplate2or. 2025-05-23 16:26:10 +08:00
xieqiyu 155c9f7dc2 * [task#143975,doing,2h] Copy template to OR. 2025-05-23 16:26:10 +08:00
sunhao 5830cdaf67 * [ui] hide file edit btn in doc view mode. 2025-05-23 15:36:23 +08:00
sunguangming 63a940b478 * [bug#62339,done,0.2h] fix bug. 2025-05-23 15:36:09 +08:00
caoyanyi c375f65ece * [ticket#2108] adjust sonar issue page url error. 2025-05-23 15:35:52 +08:00
tianshujie 2f77bec6c3 * [bug#62817,done,0.5h] fix the loss of linked objects when batch edit bugs. 2025-05-23 15:35:40 +08:00