 刘刚
|
3d6fc5eab5
|
Merge branch dev/bug-63516 of zentao/zentaopms (#9735)
|
2025-06-20 15:03:17 +08:00 |
|
|
daitingting
|
06e7f5ce45
|
* [bug#63516,done,1h] Do not limit module if type is not allstory, unclosed or bymodule.
|
2025-06-20 13:56:19 +08:00 |
|
|
刘刚
|
13aaab672c
|
Merge branch dev/bug-63465 of zentao/zentaopms (#9730)
|
2025-06-20 13:14:49 +08:00 |
|
|
李阳
|
7df1cf15af
|
[ci] update ci json.
|
2025-06-20 12:12:03 +08:00 |
|
|
朱金勇
|
0912c50db9
|
Merge branch dev/story-75371 of zentao/zentaopms (#9726)
|
2025-06-20 10:52:42 +08:00 |
|
|
朱金勇
|
5b1fd5d85e
|
Merge branch release/21.7.2 of zentao/zentaopms (#9718)
|
2025-06-20 10:45:19 +08:00 |
|
|
朱金勇
|
f31c1b6ea2
|
Merge branch dev/story-75371 of zentao/zentaopms (#9722)
|
2025-06-20 10:44:41 +08:00 |
|
|
zhangjialiang
|
98ae397691
|
* [story#75371,doing,0.1h] Format coed.
|
2025-06-20 10:41:03 +08:00 |
|
|
zhangjialiang
|
03139b7c71
|
* [story#75371,doing,0.1h] Format coed, modify button variable name.
|
2025-06-20 10:34:08 +08:00 |
|
|
zhangjialiang
|
8bda02bedc
|
* [story#75371,doing,0.5h] Add skip button, information not filled in for judgment.
|
2025-06-20 10:30:27 +08:00 |
|
|
李阳
|
63acccc018
|
Merge branch release/21.7.2 of zentao/zentaopms (#9717)
|
2025-06-20 09:24:52 +08:00 |
|
|
liyang
|
7407554383
|
* [bug#63145] fix bug for monaco editor select.
|
2025-06-20 09:19:17 +08:00 |
|
|
huairong
|
74cc892f0c
|
+ [task#144954,done,0.1h] Add comment of ui test file.
|
2025-06-20 09:18:59 +08:00 |
|
|
朱金勇
|
2ee6a72737
|
Merge branch release/21.7.2 of zentao/zentaopms (#9716)
|
2025-06-20 09:16:14 +08:00 |
|
|
xieqiyu
|
a0a2399721
|
Merge branch 'dev/task-145582' into release/21.7.2
|
2025-06-20 01:04:20 +00:00 |
|
|
朱金勇
|
865266b3dc
|
Merge branch release/21.7.2 of zentao/zentaopms (#9714)
|
2025-06-20 09:03:51 +08:00 |
|
|
朱金勇
|
f61f187fe3
|
Merge branch dev/bug-63465 of zentao/zentaopms (#9712)
|
2025-06-20 09:03:19 +08:00 |
|
|
sunguangming
|
2fde867631
|
* [misc] fix sql.
|
2025-06-20 01:02:08 +00:00 |
|
|
朱金勇
|
6ba19fd86c
|
Merge branch dev/task-145582 of zentao/zentaopms (#9710)
|
2025-06-20 09:02:02 +08:00 |
|
|
李阳
|
63424ff105
|
Merge branch dev/story-75371 of zentao/zentaopms (#9713)
|
2025-06-20 08:43:55 +08:00 |
|
|
sunguangming
|
601fa053f5
|
* [bug#63465,doing,0.5h] fix bug.
|
2025-06-20 00:40:37 +00:00 |
|
|
朱金勇
|
135f083580
|
Merge branch dev/story-75371 of zentao/zentaopms (#9709)
|
2025-06-19 18:05:08 +08:00 |
|
|
xieqiyu
|
e9820f982e
|
* [task#145582,doing,0.1h] Delete the unused unit test of upgradeModel::addBuiltInDocTemplate.
|
2025-06-19 09:50:56 +00:00 |
|
|
zhangjialiang
|
7294b87840
|
* [story#75371,doing,0.5h] Modify the image name and size.
|
2025-06-19 17:50:11 +08:00 |
|
|
xieqiyu
|
e7dce2228f
|
* [task#145582,doing,0.1h] Delete the record of action when add built in doc template.
|
2025-06-19 09:45:22 +00:00 |
|
|
xieqiyu
|
63a27a2a50
|
* [task#145582,doing,0.2h] Delete the language of confirm delete review template.
|
2025-06-19 09:45:22 +00:00 |
|
|
xieqiyu
|
6507d9ba19
|
* [task#145582,doing,0.1h] Delete the code of save project review doc template.
|
2025-06-19 09:45:22 +00:00 |
|
|
xieqiyu
|
6681951e6d
|
* [task#145582,doing,0.5h] Query all not built-in doc template.
|
2025-06-19 09:45:22 +00:00 |
|
|
xieqiyu
|
415591ea5a
|
* [task#145582,doing,0.5h] Delete the function of upgrade and change the function of doc.
|
2025-06-19 09:45:22 +00:00 |
|
|
xieqiyu
|
f632cdd374
|
* [task#145582,doing,0.1h] Add the field of builtIn for doc template.
|
2025-06-19 09:45:22 +00:00 |
|
|
刘刚
|
ff165af252
|
Merge branch release/21.7.2 of zentao/zentaopms (#9707)
|
2025-06-19 17:12:07 +08:00 |
|
|
liugang
|
70d0fcb029
|
- [misc] remove unused code and file of the ubb library.
|
2025-06-19 16:37:36 +08:00 |
|
|
刘刚
|
ea1da391e5
|
Merge branch dev/task-145552-145553-145554 of zentao/zentaopms (#9705)
|
2025-06-19 16:31:18 +08:00 |
|
|
刘刚
|
c2a99975a5
|
Merge branch dev/task-145582 of zentao/zentaopms (#9704)
|
2025-06-19 16:22:24 +08:00 |
|
|
朱金勇
|
23bb64a3ad
|
Merge branch dev/task-145552-145553-145554 of zentao/zentaopms (#9699)
|
2025-06-19 16:17:47 +08:00 |
|
|
刘刚
|
92c636e332
|
Merge branch dev/bug-63477 of zentao/zentaopms (#9698)
|
2025-06-19 16:16:49 +08:00 |
|
|
daitingting
|
451268fe7e
|
* [task#145582,doing,0.5h] Remove zentao menu limited.
|
2025-06-19 16:16:12 +08:00 |
|
|
朱金勇
|
56969b6238
|
Merge branch release/21.7.2 of zentao/zentaopms (#9682)
|
2025-06-19 16:13:15 +08:00 |
|
|
liyang
|
c07fc59cce
|
+ [task#145554] adjust unittest.
|
2025-06-19 16:11:36 +08:00 |
|
|
朱金勇
|
74cb279849
|
Merge branch dev/bug-63477 of zentao/zentaopms (#9689)
|
2025-06-19 16:10:47 +08:00 |
|
|
朱金勇
|
64b1c2a164
|
Merge branch dev/task-145551 of zentao/zentaopms (#9697)
|
2025-06-19 16:10:09 +08:00 |
|
|
liyang
|
08f6c76cc7
|
+ [task#145554] adjust unittest.
|
2025-06-19 16:09:13 +08:00 |
|
|
刘刚
|
dde593d54d
|
Merge branch dev/task-145417 of zentao/zentaopms (#9693)
|
2025-06-19 16:08:26 +08:00 |
|
|
朱金勇
|
e87354ad63
|
Merge branch dev/bug-63444 of zentao/zentaopms (#9696)
|
2025-06-19 16:08:23 +08:00 |
|
|
liyang
|
e3952ee8cb
|
+ [task#145554] adjust unittest.
|
2025-06-19 16:06:57 +08:00 |
|
|
刘刚
|
bf21885871
|
Merge branch dev/task-145551 of zentao/zentaopms (#9683)
|
2025-06-19 16:06:20 +08:00 |
|
|
朱金勇
|
533f3aed81
|
Merge branch dev/bug-63412 of zentao/zentaopms (#9694)
|
2025-06-19 16:06:08 +08:00 |
|
|
刘刚
|
485f4195de
|
Merge branch dev/bug-63444 of zentao/zentaopms (#9680)
|
2025-06-19 16:05:31 +08:00 |
|
|
朱金勇
|
ca3dfdd1e1
|
Merge branch dev/bug-63474 of zentao/zentaopms (#9692)
|
2025-06-19 16:04:54 +08:00 |
|
|
liyang
|
5ab2f88751
|
+ [task#145554] adjust unittest.
|
2025-06-19 16:04:37 +08:00 |
|