 王怡栋
|
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 |
|
|
王怡栋
|
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
|
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
|
b6458e2de7
|
* Code for task #89911.
|
2023-04-10 14:16:34 +08:00 |
|
|
wangyidong
|
36f455e28b
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-10 13:20:45 +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 |
|
|
王怡栋
|
df4ef423cc
|
Merge branch 'sprint/cyy_89912' into 'master'
* Code for task #89912.
See merge request easycorp/zentaopms!7340
|
2023-04-10 03:29:09 +00:00 |
|
|
tianshujie
|
a669f56285
|
* Code for task #89910.
|
2023-04-10 11:24:09 +08:00 |
|
|
wangyidong
|
ced89c0a0d
|
* code for task #89909.
|
2023-04-10 11:05:21 +08:00 |
|
|
wangyidong
|
dc53b8f931
|
* fix bug #33910.
|
2023-04-10 11:05:21 +08:00 |
|
|
caoyanyi
|
9f99ad89e2
|
* Code for task #89912.
|
2023-04-10 10:00:08 +08:00 |
|
|
tianshujie
|
1fc100acc0
|
* Compatible Swift Edition create documentation.
|
2023-04-10 08:54:55 +08:00 |
|
|
wangyidong
|
37f33ac3b8
|
* fix bug #33910.
|
2023-04-07 16:23:34 +08:00 |
|
|
caoyanyi
|
13a7efb50c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-07 11:22:34 +08:00 |
|
|
wangyidong
|
38898d1a13
|
* code for task #89914.
|
2023-04-07 10:53:53 +08:00 |
|
|
tianshujie
|
90caff0be0
|
* Remove Kanban when creating the execution document library.
|
2023-04-07 09:55:44 +08:00 |
|
|
caoyanyi
|
ea55ca8c33
|
* Add api priv and switch api doc release locate.
|
2023-04-07 09:30:02 +08:00 |
|
|
tianshujie
|
bb84c7a731
|
* Change the name of my spatial function.
|
2023-04-06 16:57:14 +08:00 |
|
|
tianshujie
|
8be6397778
|
* Fixed an issue where the document was not clickable.
|
2023-04-06 15:32:45 +08:00 |
|
|
tianshujie
|
0e813c1ea3
|
* Refactoring list page.
|
2023-04-06 13:07:36 +08:00 |
|
|
caoyanyi
|
30a90eb1f9
|
* Modify language.
|
2023-04-06 10:48:54 +08:00 |
|
|
caoyanyi
|
8ff704aaea
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into mine_doc
|
2023-04-06 10:43:39 +08:00 |
|
|
caoyanyi
|
5fdaaf5778
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into mine_doc
|
2023-04-06 10:40:20 +08:00 |
|
|
wangyidong
|
a5421e4940
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-06 10:30:52 +08:00 |
|
|
wangyidong
|
56791f12ef
|
* code for task #89916.
|
2023-04-06 10:29:23 +08:00 |
|
|
tianshujie
|
1e77c10378
|
* Code for task #89915.
|
2023-04-05 15:54:25 +08:00 |
|
|
tianshujie
|
6682974d6d
|
Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-04 17:30:04 +08:00 |
|
|
tianshujie
|
b87a68b349
|
* Code for task #89906.
|
2023-04-04 17:29:13 +08:00 |
|
|
caoyanyi
|
43c80f5268
|
* Modify tree style.
|
2023-04-04 16:58:29 +08:00 |
|