 caoyanyi
|
021dbcc7eb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-12 10:10:59 +08:00 |
|
|
caoyanyi
|
c6cf7c6f35
|
* Code for task #90781.
|
2023-04-12 10:10:29 +08:00 |
|
|
guofeilong
|
15392a7c8e
|
* Adjust code for fix icon-name error .
|
2023-04-12 09:57:00 +08:00 |
|
|
王怡栋
|
78a9facdb3
|
Merge branch 'tsj_task' into 'master'
* Code f or dynamic
See merge request easycorp/zentaopms!7374
|
2023-04-12 01:55:43 +00:00 |
|
|
王怡栋
|
4fe94c261f
|
Merge branch 'cyy_90779' into 'master'
Cyy 90779
See merge request easycorp/zentaopms!7371
|
2023-04-12 01:54:21 +00:00 |
|
|
tianshujie
|
ab05c059eb
|
* Code for task #90780.
|
2023-04-12 09:28:15 +08:00 |
|
|
wangyidong
|
c4998656f4
|
* fix bug #34018.
|
2023-04-12 08:54:03 +08:00 |
|
|
caoyanyi
|
b615fbc681
|
* Code for bug #34038.
|
2023-04-12 08:47:44 +08:00 |
|
|
wangyidong
|
36910d7cb4
|
* fix bug #34030.
|
2023-04-12 08:44:11 +08:00 |
|
|
caoyanyi
|
f194177369
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-11 17:13:05 +08:00 |
|
|
caoyanyi
|
c78ed61098
|
* Modify action btn style.
|
2023-04-11 16:58:00 +08:00 |
|
|
wangyidong
|
599a06266c
|
* code for task #90775.
|
2023-04-11 16:49:51 +08:00 |
|
|
王怡栋
|
432f029a2f
|
Merge branch 'dev/gfl_task' into 'master'
* Code for task #89913 .
See merge request easycorp/zentaopms!7370
|
2023-04-11 08:47:14 +00:00 |
|
|
王怡栋
|
a0868cb0ff
|
Merge branch 'master' into 'tsj_dynamic'
# Conflicts:
# module/doc/model.php
|
2023-04-11 08:46:26 +00:00 |
|
|
王怡栋
|
7ec955380e
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7364
|
2023-04-11 08:45:18 +00:00 |
|
|
wangyidong
|
594364c4e0
|
* code for task #90775.
|
2023-04-11 16:44:09 +08:00 |
|
|
guofeilong
|
661e26fb97
|
* Code for task #89913 .
|
2023-04-11 16:43:22 +08:00 |
|
|
tianshujie
|
81e7153c8e
|
* Code for task #90780.
|
2023-04-11 16:34:29 +08:00 |
|
|
caoyanyi
|
185550fcf4
|
* Code for task #90779.
|
2023-04-11 16:11:55 +08:00 |
|
|
guofeilong
|
3ff45d64ef
|
* Code for add logic to show outlineMenu .
|
2023-04-11 16:09:50 +08:00 |
|
|
tianshujie
|
55a5e45601
|
* Fix bug #34040.
|
2023-04-11 15:44:09 +08:00 |
|
|
tianshujie
|
1f026f246a
|
* Code for task #90780.
|
2023-04-11 15:38:44 +08:00 |
|
|
guofeilong
|
c0be59e7e3
|
* Code for bug print view while bread more than two .
|
2023-04-11 15:10:31 +08:00 |
|
|
wangyidong
|
8f519b0bde
|
* code for task #90783.
|
2023-04-11 15:04:08 +08:00 |
|
|
王怡栋
|
ebe7eb7217
|
Merge branch 'dev/gfl_task#90776' into 'master'
Dev/gfl task#90776
See merge request easycorp/zentaopms!7360
|
2023-04-11 06:44:46 +00:00 |
|
|
wangyidong
|
9bba7c624d
|
* code for task #90783.
|
2023-04-11 14:44:09 +08:00 |
|
|
guofeilong
|
804ebdd5d3
|
* Code for adjust style in tree .
|
2023-04-11 14:39:53 +08:00 |
|
|
guofeilong
|
a8a4faae24
|
* Code for task #90776 .
|
2023-04-11 14:39:53 +08:00 |
|
|
王怡栋
|
b1b4e4cb43
|
Merge branch 'tsj_search' into 'master'
* Code for task #89911.
See merge request easycorp/zentaopms!7358
|
2023-04-11 06:06:54 +00:00 |
|
|
王怡栋
|
857b57b6eb
|
Merge branch 'cyy_task' into 'master'
Cyy task
See merge request easycorp/zentaopms!7355
|
2023-04-11 06:05:51 +00:00 |
|
|
guofeilong
|
f175fa66e1
|
* Adjust code for task #90834 .
|
2023-04-11 14:03:34 +08:00 |
|
|
guofeilong
|
08614f32d1
|
* Code for task #90834 .
|
2023-04-11 13:59:22 +08:00 |
|
|
tianshujie
|
9401d27a5c
|
* Code for task #89911.
|
2023-04-11 13:39:58 +08:00 |
|
|
wangyidong
|
73ed3946e2
|
* code for task #90784.
|
2023-04-11 11:19:22 +08:00 |
|
|
caoyanyi
|
5e5eb3396a
|
* Code for task #90790.
|
2023-04-11 09:59:22 +08:00 |
|
|
caoyanyi
|
64d0ac3c6a
|
* Code for task #89912.
|
2023-04-11 09:54:32 +08:00 |
|
|
wangyidong
|
0a45b89acd
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-11 09:43:39 +08:00 |
|
|
wangyidong
|
f37eea5af8
|
* fix error.
|
2023-04-11 09:43:24 +08:00 |
|
|
guofeilong
|
5763b6314b
|
* Code for add moduleID in func view .
|
2023-04-11 09:26:41 +08:00 |
|
|
王怡栋
|
9f88617730
|
Merge branch 'tsj_fixbug' into 'master'
* Fix bug.
See merge request easycorp/zentaopms!7349
|
2023-04-11 01:19:32 +00:00 |
|
|
王怡栋
|
18dc5f2d59
|
Merge branch 'master' into 'release/zentaopms_18.3'
# Conflicts:
# module/doc/control.php
# module/doc/css/view.css
# module/doc/js/view.js
|
2023-04-11 01:17:43 +00:00 |
|
|
guofeilong
|
9505ba7e47
|
* Adjust code for fix bug .
|
2023-04-11 09:10:35 +08:00 |
|
|
guofeilong
|
298dd970d2
|
* Code for css refactors in tableContents .
|
2023-04-11 09:02:28 +08:00 |
|
|
wangyidong
|
b3d37057b6
|
* code for task #90793.
|
2023-04-11 08:56:03 +08:00 |
|
|
tianshujie
|
1ce64ff3c9
|
* Fix bug #33985.
|
2023-04-11 08:47:05 +08:00 |
|
|
王怡栋
|
bc3daacc3c
|
Merge branch 'tsj_block' into 'master'
* Code for task #90778.
See merge request easycorp/zentaopms!7348
|
2023-04-11 00:36:04 +00:00 |
|
|
王怡栋
|
f1bf266118
|
Merge branch 'sprint/cyy_90971' into 'master'
* Code for task #90971.
See merge request easycorp/zentaopms!7345
|
2023-04-11 00:35:44 +00:00 |
|
|
王怡栋
|
f1bc3b73cc
|
Merge branch 'tsj_doc' into 'master'
* Code for task #90792.
See merge request easycorp/zentaopms!7343
|
2023-04-11 00:35:16 +00:00 |
|
|
wangyidong
|
1a32c02940
|
* fix bug #33914.
|
2023-04-10 17:36:53 +08:00 |
|
|
tianshujie
|
66d0694599
|
* Code for task #90778.
|
2023-04-10 17:15:26 +08:00 |
|