 朱金勇
|
bf65000aff
|
* Fix bug#34232.
|
2023-04-16 14:09:36 +00:00 |
|
|
朱金勇
|
7969effc29
|
* Fix bug#34139, 34238, 34075.
|
2023-04-16 13:54:16 +00:00 |
|
|
朱金勇
|
e074e17dc8
|
* Fix bugs of dmdb.
|
2023-04-16 11:53:19 +00:00 |
|
|
王怡栋
|
d776871aca
|
Merge branch 'tsj_block' into 'master'
Tsj block
See merge request easycorp/zentaopms!7428
|
2023-04-14 09:31:50 +00:00 |
|
|
tianshujie
|
8fbab2b84f
|
* Modify upgrade program.
|
2023-04-14 17:31:02 +08:00 |
|
|
王怡栋
|
9a79eb42e4
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Adjust code for css in tree-item .
See merge request easycorp/zentaopms!7426
|
2023-04-14 09:21:53 +00:00 |
|
|
王怡栋
|
317a7ee205
|
Merge branch 'sprint/scx_task91131' into 'master'
* Finish task #91131.
See merge request easycorp/zentaopms!7427
|
2023-04-14 09:21:39 +00:00 |
|
|
tianshujie
|
23171d926d
|
* Fix field problems.
|
2023-04-14 17:09:27 +08:00 |
|
|
宋辰轩
|
5424de798c
|
* Finish task #91131.
|
2023-04-14 16:55:50 +08:00 |
|
|
guofeilong
|
3f3799eae8
|
* Adjust code for css in tree-item .
|
2023-04-14 16:50:34 +08:00 |
|
|
王怡栋
|
537833366d
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Adjust code for css in right menu .
See merge request easycorp/zentaopms!7425
|
2023-04-14 08:48:15 +00:00 |
|
|
guofeilong
|
2f169c2d7a
|
* Adjust code for css in right menu .
|
2023-04-14 16:24:56 +08:00 |
|
|
liugang
|
5a83cd5ebc
|
* Remove unused files.
|
2023-04-14 08:21:45 +00:00 |
|
|
王怡栋
|
85aeb533b4
|
Merge branch 'cyy_fixbug' into 'master'
* Add collections for doc view.
See merge request easycorp/zentaopms!7424
|
2023-04-14 08:19:12 +00:00 |
|
|
caoyanyi
|
bb20772786
|
* Modify data field.
|
2023-04-14 16:17:32 +08:00 |
|
|
caoyanyi
|
159f604619
|
* Remove unused code.
|
2023-04-14 16:16:24 +08:00 |
|
|
tianshujie
|
d0f0d5bbbe
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_block
|
2023-04-14 16:14:59 +08:00 |
|
|
caoyanyi
|
6c6461336f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-14 16:14:55 +08:00 |
|
|
wangyidong
|
e5ff2093cb
|
* code for change collector field to collects.
|
2023-04-14 16:14:42 +08:00 |
|
|
caoyanyi
|
ab6f0c3259
|
* Add collections for doc view.
|
2023-04-14 16:13:52 +08:00 |
|
|
王怡栋
|
ecd6e5a511
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Adjust code for bug #34193.
See merge request easycorp/zentaopms!7423
|
2023-04-14 08:12:51 +00:00 |
|
|
tianshujie
|
beffe82709
|
* Code for task #43816.
|
2023-04-14 16:11:06 +08:00 |
|
|
guofeilong
|
3c4e36b4d9
|
* Adjust code for bug #34195 .
|
2023-04-14 16:10:24 +08:00 |
|
|
guofeilong
|
e7e52ca98e
|
* Adjust code for bug #34193.
|
2023-04-14 16:01:45 +08:00 |
|
|
wangyidong
|
6f2d0db971
|
* fix for convert collector in upgrade.
|
2023-04-14 15:57:23 +08:00 |
|
|
王怡栋
|
368fbe6f57
|
Merge branch 'cyy_fixbug' into 'master'
* Add edited by me doc list.
See merge request easycorp/zentaopms!7421
|
2023-04-14 07:49:35 +00:00 |
|
|
王怡栋
|
2ba0b5cef3
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
Dev/gfl zentaopms 305
See merge request easycorp/zentaopms!7422
|
2023-04-14 07:48:44 +00:00 |
|
|
guofeilong
|
0dee3ed3e6
|
* Code for bug #34192 .
|
2023-04-14 15:47:40 +08:00 |
|
|
tianshujie
|
2c1fb2826b
|
* Code for story #43815.
|
2023-04-14 15:31:41 +08:00 |
|
|
guofeilong
|
e0bad0e4b2
|
* Code for bug #34193 .
|
2023-04-14 15:31:21 +08:00 |
|
|
guofeilong
|
8062513f54
|
* Adjust code for lefttree refactors .
|
2023-04-14 15:13:24 +08:00 |
|
|
caoyanyi
|
202c682cc5
|
* Add views num to doc view.
|
2023-04-14 15:10:27 +08:00 |
|
|
guofeilong
|
487214058b
|
* Adjust code for icon replace img .
|
2023-04-14 15:07:34 +08:00 |
|
|
wangyidong
|
53983dffef
|
* fix bug #32976.
|
2023-04-14 14:37:20 +08:00 |
|
|
caoyanyi
|
bc6888da5e
|
* Add edited by me doc list.
|
2023-04-14 14:36:10 +08:00 |
|
|
王怡栋
|
db3e7c2b70
|
Merge branch 'dev/gfl_addIcon' into 'master'
* ZUI: update icon files .
See merge request easycorp/zentaopms!7420
|
2023-04-14 06:31:00 +00:00 |
|
|
王怡栋
|
600b9c4949
|
Merge branch 'cyy_fixbug' into 'master'
Cyy fixbug
See merge request easycorp/zentaopms!7410
|
2023-04-14 06:30:31 +00:00 |
|
|
wangyidong
|
f7a5d31793
|
Merge branch 'tsj_issue'
|
2023-04-14 14:29:47 +08:00 |
|
|
王怡栋
|
d4eee84a04
|
Merge branch 'master' into 'tsj_issue'
# Conflicts:
# module/doc/css/common.css
|
2023-04-14 06:29:28 +00:00 |
|
|
王怡栋
|
65e15bbf25
|
Merge branch 'tsj_task' into 'master'
Tsj task
See merge request easycorp/zentaopms!7419
|
2023-04-14 06:27:52 +00:00 |
|
|
guofeilong
|
6787833a70
|
* ZUI: update icon files .
|
2023-04-14 14:25:02 +08:00 |
|
|
朱金勇
|
9e4ba356c6
|
* Fix install for dmdb.
|
2023-04-14 05:48:49 +00:00 |
|
|
tianshujie
|
9cb069b33a
|
* Optimized Level 2.5 dropdown interaction.
|
2023-04-14 13:47:27 +08:00 |
|
|
tianshujie
|
f954e7935c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_issue
|
2023-04-14 13:31:12 +08:00 |
|
|
刘刚
|
e4801f1e73
|
Merge branch 'daitingting_adaptation_parameters' into 'master'
* Add parameters.
See merge request easycorp/zentaopms!7418
|
2023-04-14 05:26:38 +00:00 |
|
|
liugang
|
700c80534a
|
+ Init navGroup of report module.
|
2023-04-14 05:22:52 +00:00 |
|
|
daitingting
|
a47cb05c8e
|
* Add parameters.
|
2023-04-14 13:15:54 +08:00 |
|
|
caoyanyi
|
896f117c66
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_fixbug
|
2023-04-14 13:13:48 +08:00 |
|
|
朱金勇
|
e6b2ea4a04
|
Merge branch 'zenops_69'
|
2023-04-14 04:41:28 +00:00 |
|
|
tianshujie
|
99c8caffaf
|
* Fix bug #34184.
|
2023-04-14 11:30:25 +08:00 |
|