Commit Graph

636 Commits

Author SHA1 Message Date
caoyanyi
658b918897 * Modify api view page style. 2023-04-19 16:16:30 +08:00
tianshujie
32cf3c4d20 * Fix bug #34337. 2023-04-19 10:19:42 +08:00
tianshujie
987e940fe1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-04-18 15:56:52 +08:00
tianshujie
59e850ed48 * Fix bug #34312. 2023-04-18 15:54:23 +08:00
tianshujie
9a439c9cd5 * Fix bug #34312. 2023-04-18 15:36:16 +08:00
wangyidong
39138ca85b * fix bug. 2023-04-18 15:23:36 +08:00
tianshujie
775088ac63 * Fix bug #34276. 2023-04-18 11:05:14 +08:00
tianshujie
b4dc730385 * Fix bug #34284. 2023-04-18 10:56:15 +08:00
tianshujie
32161d8d66 * Code for task #91391. 2023-04-18 10:23:03 +08:00
tianshujie
f4cda4d780 * Code for task #91378. 2023-04-17 10:57:00 +08:00
caoyanyi
bc6888da5e * Add edited by me doc list. 2023-04-14 14:36:10 +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
tianshujie
f954e7935c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_issue 2023-04-14 13:31:12 +08:00
tianshujie
99c8caffaf * Fix bug #34184. 2023-04-14 11:30:25 +08:00
tianshujie
90ad82c742 * Fix bug #34176. 2023-04-14 10:08:55 +08:00
wangyidong
3ee191bd66 * remove save path when create doc. 2023-04-14 09:49:57 +08:00
wangyidong
c5681e0433 * code for issue #767. 2023-04-14 09:10:00 +08:00
tianshujie
155f9cf5d3 * Resolve issue #777. 2023-04-14 08:57:18 +08:00
guofeilong
8ab8e71215 - Delete code for crumbs in docDetail . 2023-04-14 08:38:27 +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
tianshujie
e5bcb8b2f9 * The ID of the last accessed object is retained. 2023-04-13 16:58:25 +08:00
tianshujie
d2782dc46a * Resolve issue #775. 2023-04-13 16:37:20 +08:00
tianshujie
e279e91070 * Resolve issue #775. 2023-04-13 16:22:45 +08:00
wangyidong
548a0c453c * fix bug #33700. 2023-04-13 13:03:42 +08:00
guofeilong
640e0f6642 * Adjust code for css bug in crumbs . 2023-04-13 11:08:39 +08:00
wangyidong
c6512b3b8d * fix bug #33722. 2023-04-13 08:41:27 +08:00
wangyidong
7cbeeb33c3 * fix bug #33745. 2023-04-12 17:46:35 +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
15e0011047 * Fix bug #33641. 2023-04-12 15:44:47 +08:00
wangyidong
e1295a89e4 * fix bug #34088. 2023-04-12 15:30:21 +08:00
caoyanyi
1b9bbe097d * Code for bug #34060. 2023-04-12 11:23:05 +08:00
caoyanyi
493e4a8589 * Modify no data tips. 2023-04-12 11:10:01 +08:00
王怡栋
a0868cb0ff Merge branch 'master' into 'tsj_dynamic'
# Conflicts:
#   module/doc/model.php
2023-04-11 08:46:26 +00:00
tianshujie
81e7153c8e * Code for task #90780. 2023-04-11 16:34:29 +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
wangyidong
8f519b0bde * code for task #90783. 2023-04-11 15:04:08 +08:00
wangyidong
9bba7c624d * code for task #90783. 2023-04-11 14:44:09 +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
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
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
王怡栋
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