 刘刚
|
0e587e25ea
|
Merge branch dev/bug-63710 of zentao/zentaopms (#9942)
|
2025-06-26 10:45:03 +08:00 |
|
|
xieqiyu
|
a9fbb58cbe
|
* [bug#63710] Add the data of built-in when enter template home.
|
2025-06-26 02:17:41 +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 |
|
|
刘刚
|
64e5847417
|
Merge branch dev/task-145754 of zentao/zentaopms (#9918)
|
2025-06-25 15:52:05 +08:00 |
|
|
sunguangming
|
cb1c5187a2
|
* [bug#63538,done,0.2h] fix bug.
|
2025-06-25 07:40:39 +00:00 |
|
|
xieqiyu
|
c636093315
|
* [bug#61859] Return when in modal.
|
2025-06-25 07:28:20 +00:00 |
|
|
wangyuting
|
c7a19a031d
|
* [task#145754,done,0.5h,0h] Optimize label style.
|
2025-06-25 14:50:44 +08:00 |
|
|
刘刚
|
0b7b0b360c
|
Merge branch release/21.7.2 of zentao/zentaopms (#9917)
|
2025-06-25 14:48:17 +08:00 |
|
|
刘刚
|
e93b7aa598
|
Merge branch release/21.7.2 of zentao/zentaopms (#9916)
|
2025-06-25 14:48:09 +08:00 |
|
|
刘刚
|
c961735ef4
|
Merge branch dev/bug-63693 of zentao/zentaopms (#9915)
|
2025-06-25 14:47:55 +08:00 |
|
|
wangyuting
|
cb730cf424
|
* [bug#63565,done,0.2h,0h] Remove testtask scene pri and assignedTo field.
|
2025-06-25 14:31:47 +08:00 |
|
|
刘刚
|
fee6c87914
|
Merge branch dev/bug-63665 of zentao/zentaopms (#9913)
|
2025-06-25 14:29:15 +08:00 |
|
|
刘刚
|
59ec23b626
|
Merge branch dev/bug-63515 of zentao/zentaopms (#9912)
|
2025-06-25 14:28:16 +08:00 |
|
|
sunguangming
|
4794533f4a
|
Merge branch 'dev/bug-63590' into release/21.7.2
|
2025-06-25 06:25:09 +00:00 |
|
|
刘刚
|
1bd45c5a41
|
Merge branch dev/bug-63693 of zentao/zentaopms (#9911)
|
2025-06-25 14:23:54 +08:00 |
|
|
刘刚
|
502e9745ac
|
Merge branch release/21.7.2 of zentao/zentaopms (#9910)
|
2025-06-25 14:21:48 +08:00 |
|
|
刘刚
|
9152c29640
|
Merge branch dev/bug-63665 of zentao/zentaopms (#9909)
|
2025-06-25 14:21:10 +08:00 |
|
|
刘刚
|
2ff7fe8ed6
|
Merge branch dev/bug-63515 of zentao/zentaopms (#9906)
|
2025-06-25 14:21:00 +08:00 |
|
|
刘刚
|
915dab55cf
|
Merge branch dev/bug-63552 of zentao/zentaopms (#9908)
|
2025-06-25 14:20:49 +08:00 |
|
|
xieqiyu
|
98bca67b6d
|
* [bug#63693] Fix the bug of add block to a regular type template.
|
2025-06-25 06:16:36 +00:00 |
|
|
sunguangming
|
c2fd3e94b4
|
* [misc] modify mysql to dm.
|
2025-06-25 06:11:45 +00:00 |
|
|
李阳
|
b2b2736c7c
|
Merge branch release/21.7.2 of zentao/zentaopms (#9868)
|
2025-06-25 13:58:16 +08:00 |
|
|
xieqiyu
|
3b9944bcf0
|
* [bug#63665] Get other module when upgrade template has no module.
|
2025-06-25 05:57:38 +00:00 |
|
|
刘刚
|
c70fe40c8e
|
Merge branch dev/bug-63552 of zentao/zentaopms (#9901)
|
2025-06-25 13:47:56 +08:00 |
|
|
sunguangming
|
e8c75950cc
|
* [misc] code for comment.
|
2025-06-25 05:37:24 +00:00 |
|
|
xieqiyu
|
dac116188c
|
* [bug#63515] Set type to markdown when upgrad the markdown template.
|
2025-06-25 05:29:00 +00:00 |
|
|
刘刚
|
865de21010
|
Merge branch dev/bug-63400 of zentao/zentaopms (#9905)
|
2025-06-25 13:21:16 +08:00 |
|
|
刘刚
|
e9c13639b9
|
Merge branch dev/bug-63400 of zentao/zentaopms (#9904)
|
2025-06-25 13:15:01 +08:00 |
|
|
刘刚
|
063fde5431
|
Merge branch dev/bug-63620 of zentao/zentaopms (#9900)
|
2025-06-25 13:13:05 +08:00 |
|
|
tianshujie
|
35ad524b49
|
* [bug#63400,done,0.4h] adjust project code style.
|
2025-06-25 11:52:58 +08:00 |
|