 wangyidong
|
bb5ced8e4d
|
* fix bug #33745.
|
2023-04-12 17:42:49 +08:00 |
|
|
wangyidong
|
bf4c487742
|
* fix bug.
|
2023-04-12 17:00:48 +08:00 |
|
|
tianshujie
|
171cbf6150
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 16:47:46 +08:00 |
|
|
wangyidong
|
a3715fa226
|
* fix bug.
|
2023-04-12 16:20:53 +08:00 |
|
|
tianshujie
|
6fe26dbc28
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 16:13:22 +08:00 |
|
|
wangyidong
|
49ce03d757
|
* fix bug #34074.
|
2023-04-12 15:36:01 +08:00 |
|
|
wangyidong
|
4180510b79
|
* fix bug #33994.
|
2023-04-12 15:20:32 +08:00 |
|
|
caoyanyi
|
f1ad325ba1
|
* Code for bug #90787.
|
2023-04-12 15:13:39 +08:00 |
|
|
caoyanyi
|
75ac945109
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into cyy_90779
|
2023-04-12 14:31:56 +08:00 |
|
|
guofeilong
|
e8d43fe0b0
|
* Code for task #90776 .
|
2023-04-12 13:37:48 +08:00 |
|
|
caoyanyi
|
bc4de003db
|
* Code for bug #34052.
|
2023-04-12 10:20:11 +08:00 |
|
|
guofeilong
|
15392a7c8e
|
* Adjust code for fix icon-name error .
|
2023-04-12 09:57:00 +08:00 |
|
|
王怡栋
|
4fe94c261f
|
Merge branch 'cyy_90779' into 'master'
Cyy 90779
See merge request easycorp/zentaopms!7371
|
2023-04-12 01:54:21 +00: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
|
594364c4e0
|
* code for task #90775.
|
2023-04-11 16:44:09 +08:00 |
|
|
guofeilong
|
3ff45d64ef
|
* Code for add logic to show outlineMenu .
|
2023-04-11 16:09:50 +08:00 |
|
|
guofeilong
|
c0be59e7e3
|
* Code for bug print view while bread more than two .
|
2023-04-11 15:10:31 +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 |
|
|
王怡栋
|
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 |
|
|
wangyidong
|
b3d37057b6
|
* code for task #90793.
|
2023-04-11 08:56:03 +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 |
|
|
tianshujie
|
66d0694599
|
* Code for task #90778.
|
2023-04-10 17:15:26 +08:00 |
|
|
guofeilong
|
1d11fbc5b8
|
* Code for view.html.php refactors .
|
2023-04-10 17:14:30 +08:00 |
|
|
guofeilong
|
c94b6099d9
|
* Adjust code for add two create btn .
|
2023-04-10 17:02:45 +08:00 |
|
|
guofeilong
|
8b327f0f20
|
* Code for print dropdown left in View.html.php .
|
2023-04-10 16:21:27 +08:00 |
|
|
caoyanyi
|
e164c7be4d
|
* Code for task #90971.
|
2023-04-10 16:13:54 +08:00 |
|
|
wangyidong
|
18a60f895c
|
* code for task #89909.
|
2023-04-10 16:06:01 +08:00 |
|
|
tianshujie
|
5fa1c2a7be
|
* Fix bug #33973.
|
2023-04-10 15:23:54 +08:00 |
|
|
tianshujie
|
a3fdbebef5
|
* Fix bug #33970.
|
2023-04-10 15:17:14 +08:00 |
|
|
tianshujie
|
b6458e2de7
|
* Code for task #89911.
|
2023-04-10 14:16:34 +08:00 |
|
|
guofeilong
|
b71539aadc
|
* Code for fix scroll Func while init tree .
|
2023-04-10 13:21:07 +08:00 |
|
|
wangyidong
|
36f455e28b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-10 13:20:45 +08:00 |
|
|
wangyidong
|
511ceb9022
|
* code for task #89909.
|
2023-04-10 12:32:13 +08:00 |
|
|
王怡栋
|
607f1262c4
|
Merge branch 'tsj_doc' into 'master'
* Code for task #89910.
See merge request easycorp/zentaopms!7341
|
2023-04-10 03:29:59 +00:00 |
|