Commit Graph
99702 Commits
Author SHA1 Message Date
daitingting 1f76eff0ec * [task#144516,doing,0.1h] Remove whitelist in move template form. 2025-06-09 11:32:56 +00:00
刘刚 41d7c3e865 Merge branch dev/story-75310 of zentao/zentaopms (#9261) 2025-06-09 13:20:31 +08:00
刘刚 aaa0a30df9 Merge branch ztflow-xieqiyu-dev/story-75310#xieqiyu of zentao/zentaopms (#9250) 2025-06-09 10:09:50 +08:00
xieqiyu 420ab56ddd * [task#144511,doing,0.5h] Modify the unit test of upgradeTemplateTypes. 2025-06-09 09:21:49 +08:00
xieqiyu 14c5365c09 * [task#144511,doing,0.5h] Modify the way to get the built-in scope. 2025-06-07 21:39:32 +08:00
刘刚 d8ba0374b4 Merge branch ztflow-daitingting-feature/doctemplate#daitingting of zentao/zentaopms (#9101) 2025-06-04 13:10:53 +08:00
daitingting 4911905edc * [misc] Remove this useless assignment to local variable '$toList'. 2025-06-04 03:51:56 +00:00
daitingting adb812d470 * [misc] Remove this unused "$key" local variable. 2025-06-04 03:27:26 +00:00
daitingting 957d463d88 * [misc] Optimize codes. 2025-06-04 03:22:19 +00:00
daitingting 18d2394019 * [misc] Public must be placed before the static keyword. 2025-06-04 03:02:05 +00:00
daitingting 3998b5bafa * [misc] Get product first. 2025-06-04 02:59:58 +00:00
daitingting f29c18abf5 * [misc] Optimize codes. 2025-06-04 02:56:32 +00:00
daitingting b86703fe6f Merge branch 'release/21.7.2' into feature/doctemplate 2025-06-04 02:08:59 +00:00
刘刚 0cbe7fe9ac Merge branch ztflow-liugang-release/21.7.2#liugang of zentao/zentaopms (#9069) 2025-06-03 09:24:40 +08:00
liugang 2e7d788900 * [refac] refactor the method to get database profiles. 2025-06-03 09:15:12 +08:00
liugang 230bc77313 * [refac] fix calling undefined method. 2025-06-03 09:15:11 +08:00
liugang 8fefa46ce2 * [refac] rename profiling to show_profiles. 2025-06-03 09:15:11 +08:00
liugang 6f2d830ae6 * [refac] rename profile to profiling. 2025-06-03 09:15:11 +08:00
liugang 36b2165522 * [refac] refactor the method to setup database profiling. 2025-06-03 09:15:11 +08:00
刘刚 5dac8b4692 Merge branch ztflow-caoyanyi-release/21.7.2#caoyanyi of zentao/zentaopms (#9066) 2025-06-03 08:50:10 +08:00
caoyanyi 88c3807d5d * [release] update relese info. 2025-06-03 08:40:43 +08:00
刘刚 427b759843 Merge branch dev/bug-62785 of zentao/zentaopms (#9062) 2025-05-30 17:28:51 +08:00
刘刚 a2525e4673 Merge branch ztflow-daitingting-dev/bug-62785#daitingting of zentao/zentaopms (#9060) 2025-05-30 16:49:14 +08:00
daitingting 9effcef36b * [bug#62785,done,1h] Save template when click release button. 2025-05-30 08:05:34 +00:00
刘刚 82e953d076 Merge branch dev/bug-63029 of zentao/zentaopms (#9056) 2025-05-30 16:03:34 +08:00
刘刚 13d0d2490f Merge branch dev/bug-62751 of zentao/zentaopms (#9055) 2025-05-30 16:03:26 +08:00
刘刚 383e145e47 Merge branch ztflow-xieqiyu-dev/bug-63029#xieqiyu of zentao/zentaopms (#9049) 2025-05-30 13:40:34 +08:00
刘刚 0062d99290 Merge branch ztflow-xieqiyu-dev/bug-62751#xieqiyu of zentao/zentaopms (#9048) 2025-05-30 13:40:24 +08:00
xieqiyu 42d98b8aee * [bug#63029] Set caseStage in doc from template. 2025-05-30 11:20:07 +08:00
xieqiyu c6e87a3e1e * [bug#62751] Hidden the button of restore in template view page. 2025-05-30 10:49:55 +08:00
刘刚 1611213a63 Merge branch ztflow-liugang-release/21.7.2#liugang of zentao/zentaopms (#9047) 2025-05-30 10:49:02 +08:00
liugang 564f214f0e - [refac] remove unused code of qrcode. 2025-05-30 10:47:46 +08:00
刘刚 2da5a1ebb1 Merge branch dev/bug-62752 of zentao/zentaopms (#9033) 2025-05-30 08:39:23 +08:00
刘刚 3964e5f94c Merge branch ztflow-xieqiyu-dev/bug-62752#xieqiyu of zentao/zentaopms (#9029) 2025-05-29 16:28:53 +08:00
刘刚 9149905a15 Merge branch ztflow-liugang-release/21.7.2#liugang of zentao/zentaopms (#9031) 2025-05-29 16:25:52 +08:00
liugang 614d18d126 * [refac] refactor method to create temporary table. 2025-05-29 16:21:48 +08:00
刘刚 7f925fba06 Merge branch ztflow-liugang-release/21.7.2#liugang of zentao/zentaopms (#9028) 2025-05-29 16:05:47 +08:00
xieqiyu 7eb14dc5e8 * [bug#62752] Add a line break after the article link. 2025-05-29 16:04:54 +08:00
liugang 9f6819c383 Merge branch 'release/21.7.1' into release/21.7.2 2025-05-29 15:55:10 +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
刘刚 ba0cc4fa99 Merge branch ztflow-liugang-release/21.7.1#liugang of zentao/zentaopms (#9011) 2025-05-29 13:11:39 +08:00
liugang 0c02e543d2 * [refac] refactor the debug method to save time and duration. 2025-05-29 13:07:47 +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
刘刚 ee6f51fef6 Merge branch dev/task-143181-144207-144206-144205-144204 of zentao/zentaopms (#9006) 2025-05-29 10:44:37 +08:00
tianshujie f6e01b542d * [task#73876,done,0.1h] fix the issue when the delay attribute is not exist. 2025-05-29 10:40:58 +08:00
刘刚 13d80790ed Merge branch ztflow-xieqiyu-dev/task-143690#xieqiyu of zentao/zentaopms (#9003) 2025-05-29 10:40:56 +08:00
刘刚 d96da5d840 Merge branch dev/task-143181-144207-144206-144205-144204 of zentao/zentaopms (#9002) 2025-05-29 10:13:14 +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