 tianshujie
|
f954e7935c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_issue
|
2023-04-14 13:31:12 +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 |
|
|
tianshujie
|
2088b588b1
|
* Modify the interaction of the Create document button.
|
2023-04-14 11:17:56 +08:00 |
|
|
guofeilong
|
c8b6a19080
|
* Adjust code for bug #34164 .
|
2023-04-14 10:39:33 +08:00 |
|
|
王怡栋
|
f58a67cfc3
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
Dev/gfl zentaopms 305
See merge request easycorp/zentaopms!7415
|
2023-04-14 02:29:23 +00:00 |
|
|
wangyidong
|
bcd61687c6
|
* fix bug for style.
|
2023-04-14 10:25:56 +08:00 |
|
|
guofeilong
|
4602f6ff08
|
* Adjust code for bug #31459.
|
2023-04-14 10:23:06 +08:00 |
|
|
guofeilong
|
c82c461261
|
* Adjust code for class h-full-adjust .
|
2023-04-14 10:23:06 +08:00 |
|
|
caoyanyi
|
eae7f23245
|
* Fix bug #34156.
|
2023-04-14 10:18:06 +08:00 |
|
|
王怡栋
|
739a26440c
|
Merge branch 'dev/gfl_zentaopms_305' into 'master'
* Adjust code for css in docDetail .
See merge request easycorp/zentaopms!7407
|
2023-04-14 02:07:49 +00:00 |
|
|
wangyidong
|
3ee191bd66
|
* remove save path when create doc.
|
2023-04-14 09:49:57 +08:00 |
|
|
caoyanyi
|
50b734184f
|
* Fix bug #34165.
|
2023-04-14 09:39:29 +08:00 |
|
|
guofeilong
|
486b9f466e
|
* Adjust code for css in docDetail .
|
2023-04-14 09:06:52 +08:00 |
|
|
guofeilong
|
b7893e356d
|
- Delete js and view code for crumbs in docDetail .
|
2023-04-14 08:40:47 +08:00 |
|
|
tianshujie
|
c24463a36b
|
* Resolve issue #778.
|
2023-04-13 17:30:49 +08:00 |
|
|
王怡栋
|
e6be417612
|
Merge branch 'master' into 'tsj_task'
# Conflicts:
# module/doc/view/lefttree.html.php
|
2023-04-13 09:03:14 +00:00 |
|
|
wangyidong
|
ad6e538eca
|
* code for issue #772.
|
2023-04-13 16:17:21 +08:00 |
|
|
wangyidong
|
8a69021d9b
|
* code for issue #776.
|
2023-04-13 16:00:40 +08:00 |
|
|
tianshujie
|
0c935c7eea
|
* Modify jump link.
|
2023-04-13 15:45:51 +08:00 |
|
|
guofeilong
|
052751d7ad
|
* Code for task #90777 .
|
2023-04-13 13:27:03 +08:00 |
|
|
guofeilong
|
b73c301143
|
* Code for task 90776 .
|
2023-04-13 13:27:03 +08:00 |
|
|
guofeilong
|
53da287c46
|
* Code for task #90971.
|
2023-04-13 11:08:39 +08:00 |
|
|
guofeilong
|
03bf3e54e6
|
* Code for adjust width .
|
2023-04-13 11:08:39 +08:00 |
|
|
wangyidong
|
a3715fa226
|
* fix bug.
|
2023-04-12 16:20:53 +08:00 |
|
|
guofeilong
|
e8d43fe0b0
|
* Code for task #90776 .
|
2023-04-12 13:37:48 +08:00 |
|
|
guofeilong
|
685b9489b2
|
* Adjust code for style in crumbs .
|
2023-04-12 10:34:14 +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 |
|
|
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 |
|
|
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 |
|
|
guofeilong
|
a8a4faae24
|
* Code for task #90776 .
|
2023-04-11 14:39:53 +08: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
|
08614f32d1
|
* Code for task #90834 .
|
2023-04-11 13: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 |
|
|
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 |
|
|
王怡栋
|
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 |
|
|
tianshujie
|
66d0694599
|
* Code for task #90778.
|
2023-04-10 17:15:26 +08:00 |
|
|
guofeilong
|
ab58e9c244
|
* Code for css refactors in view .
|
2023-04-10 16:31:04 +08:00 |
|
|
caoyanyi
|
e164c7be4d
|
* Code for task #90971.
|
2023-04-10 16:13:54 +08:00 |
|
|
tianshujie
|
a3fdbebef5
|
* Fix bug #33970.
|
2023-04-10 15:17:14 +08:00 |
|
|
guofeilong
|
c5dbf389bf
|
* Code for css refactors in view .
|
2023-04-10 15:01:50 +08:00 |
|
|
guofeilong
|
a01b8c2078
|
* Code for add func to click in closeBtn .
|
2023-04-10 13:35:46 +08:00 |
|
|
tianshujie
|
a669f56285
|
* Code for task #89910.
|
2023-04-10 11:24:09 +08:00 |
|
|
guofeilong
|
f6114edda0
|
* Adjut code for js in doc .
|
2023-04-07 16:27:32 +08:00 |
|
|
guofeilong
|
37a6ad5a0b
|
* Add mr to swapper dom in tableContent .
|
2023-04-07 15:54:57 +08:00 |
|