 wangyidong
|
bb5ced8e4d
|
* fix bug #33745.
|
2023-04-12 17:42:49 +08:00 |
|
|
tianshujie
|
4514d136ca
|
* Restore code.
|
2023-04-12 17:12:55 +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 |
|
|
tianshujie
|
f2a92c6d57
|
* Fixed logical determination of document permissions.
|
2023-04-12 16:35:28 +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 |
|
|
tianshujie
|
542f843bd2
|
* Fix bug #34099.
|
2023-04-12 16:08:24 +08:00 |
|
|
tianshujie
|
15e0011047
|
* Fix bug #33641.
|
2023-04-12 15:44:47 +08:00 |
|
|
wangyidong
|
49ce03d757
|
* fix bug #34074.
|
2023-04-12 15:36:01 +08:00 |
|
|
tianshujie
|
8a7d951639
|
Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 15:35:01 +08:00 |
|
|
wangyidong
|
e1295a89e4
|
* fix bug #34088.
|
2023-04-12 15:30:21 +08:00 |
|
|
wangyidong
|
4180510b79
|
* fix bug #33994.
|
2023-04-12 15:20:32 +08:00 |
|
|
wangyidong
|
bc58f409f7
|
* fix bug #34015.
|
2023-04-12 15:20:32 +08:00 |
|
|
tianshujie
|
8548a4bf10
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 15:17:17 +08:00 |
|
|
caoyanyi
|
8e9d75cf47
|
Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 15:14:01 +08:00 |
|
|
caoyanyi
|
f1ad325ba1
|
* Code for bug #90787.
|
2023-04-12 15:13:39 +08:00 |
|
|
tianshujie
|
4ba1446559
|
Merge branch 'tsj_task' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_task
|
2023-04-12 15:09:03 +08:00 |
|
|
tianshujie
|
5444be8677
|
* Code for task #90782.
|
2023-04-12 15:08:32 +08:00 |
|
|
caoyanyi
|
e627f1aadc
|
* Code for bug #34068.
|
2023-04-12 15:07:24 +08:00 |
|
|
tianshujie
|
b22fb42a7a
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug
|
2023-04-12 14:36:01 +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 |
|
|
tianshujie
|
1f56b05cea
|
* Fix bug #34076.
|
2023-04-12 14:13:15 +08:00 |
|
|
tianshujie
|
754928d906
|
* Fix bug #34066.
|
2023-04-12 14:09:41 +08:00 |
|
|
tianshujie
|
f0d405aebf
|
* Fix bug #34076.
|
2023-04-12 14:04:15 +08:00 |
|
|
tianshujie
|
ea8ee0faf5
|
* Fix bug #34076.
|
2023-04-12 13:42:08 +08:00 |
|
|
guofeilong
|
e8d43fe0b0
|
* Code for task #90776 .
|
2023-04-12 13:37:48 +08:00 |
|
|
caoyanyi
|
1b9bbe097d
|
* Code for bug #34060.
|
2023-04-12 11:23:05 +08:00 |
|
|
tianshujie
|
6ef8f58a4f
|
* Fix bug #34066.
|
2023-04-12 11:13:11 +08:00 |
|
|
caoyanyi
|
493e4a8589
|
* Modify no data tips.
|
2023-04-12 11:10:01 +08:00 |
|
|
tianshujie
|
b9fce15bfd
|
* Fixed tree highlighting on the left side of my space.
|
2023-04-12 10:59:09 +08:00 |
|
|
tianshujie
|
b8fc22feee
|
* Fix bug #34066.
|
2023-04-12 10:57:08 +08:00 |
|
|
caoyanyi
|
26b79296d4
|
* Code for bug #34013, task #90781.
|
2023-04-12 10:38:22 +08:00 |
|
|
guofeilong
|
685b9489b2
|
* Adjust code for style in crumbs .
|
2023-04-12 10:34:14 +08:00 |
|
|
caoyanyi
|
bc4de003db
|
* Code for bug #34052.
|
2023-04-12 10:20:11 +08:00 |
|
|
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 |
|