 liumengyi
|
64a0db7ff0
|
Merge branch 'zentaopms_304' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 11:06:16 +08:00 |
|
|
liumengyi
|
17ee6ad3f4
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 11:06:01 +08:00 |
|
|
hufangzhou
|
00ab038bbf
|
* Code for task #91375.
|
2023-04-18 11:05:43 +08:00 |
|
|
liugang
|
44387b7b97
|
* Remove unused files extened in the report extension.
|
2023-04-18 03:00:10 +00:00 |
|
|
王怡栋
|
05217c63e9
|
Merge branch 'tsj_sort' into 'master'
Tsj sort
See merge request easycorp/zentaopms!7448
|
2023-04-18 02:44:57 +00:00 |
|
|
tianshujie
|
9df90e87a5
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort
|
2023-04-18 10:44:37 +08:00 |
|
|
tianshujie
|
4a46d918b1
|
* Code for task #91391.
|
2023-04-18 10:43:03 +08:00 |
|
|
王怡栋
|
af4d04889c
|
Merge branch 'fixbug/liumengyi_34022' into 'master'
* Fix bug #34022, #34028.
See merge request easycorp/zentaopms!7446
|
2023-04-18 02:41:41 +00:00 |
|
|
王怡栋
|
29f2ba65e3
|
Merge branch 'cyy_fixbug' into 'master'
* Fix bug #34293,34299.
See merge request easycorp/zentaopms!7444
|
2023-04-18 02:41:20 +00:00 |
|
|
王怡栋
|
46aea7bf9e
|
Merge branch 'dev/gfl_zentaopms_307' into 'master'
* Code for task #91379 .
See merge request easycorp/zentaopms!7449
|
2023-04-18 02:41:01 +00:00 |
|
|
guofeilong
|
367be9d52a
|
* Code for task #91379 .
|
2023-04-18 10:36:34 +08:00 |
|
|
tianshujie
|
7605903fe9
|
* Fix bug #34274.
|
2023-04-18 10:29:48 +08:00 |
|
|
tianshujie
|
32161d8d66
|
* Code for task #91391.
|
2023-04-18 10:23:03 +08:00 |
|
|
孙广明
|
c23bec23fd
|
Merge branch 'pipeline_jenkins_ly' into 'master'
* Fix xuanxuan notice in Jenkinsfile.
See merge request easycorp/zentaopms!7434
|
2023-04-18 02:16:40 +00:00 |
|
|
caoyanyi
|
8e69054983
|
* Fix bug #32491, Adjust to no increase in traffic within 3 seconds.
|
2023-04-18 10:15:07 +08:00 |
|
|
孙广明
|
e4be890795
|
Merge branch 'sprint/scx_modidypng' into 'master'
* Modify png and modify dimension name.
See merge request easycorp/zentaopms!7447
|
2023-04-18 02:09:38 +00:00 |
|
|
宋辰轩
|
55a2bcf29d
|
* Modify png and modify dimension name.
|
2023-04-18 10:07:10 +08:00 |
|
|
liumengyi
|
13ce2a32b3
|
* Fix bug #34022, #34028.
|
2023-04-18 10:04:09 +08:00 |
|
|
刘刚
|
f92b0f94f1
|
Merge branch 'goview' into 'master'
* Updata go-view dist.
See merge request easycorp/zentaopms!7445
|
2023-04-18 01:49:46 +00:00 |
|
|
caoyanyi
|
99ed7687cb
|
* Fix bug #34292.
|
2023-04-18 09:48:51 +08:00 |
|
|
liumengyi
|
629cbc486b
|
* Finish task #91598.
|
2023-04-18 09:40:56 +08:00 |
|
|
qixinzhi
|
e496b92a37
|
* Updata go-view dist.
|
2023-04-18 01:34:26 +00:00 |
|
|
hufangzhou
|
fbf57b06f3
|
* Finish task #91372.
|
2023-04-18 09:34:05 +08:00 |
|
|
liumengyi
|
03ebaf7784
|
* Finish task #91275.
|
2023-04-18 09:25:32 +08:00 |
|
|
wangyidong
|
0ef2c25165
|
* fix bug.
|
2023-04-18 09:16:34 +08:00 |
|
|
朱金勇
|
a5771fa2d8
|
* Fix bug#34247.
|
2023-04-18 01:14:19 +00:00 |
|
|
tianshujie
|
b4c325c56e
|
* Code for task #91378.
|
2023-04-18 09:13:45 +08:00 |
|
|
caoyanyi
|
07a5cb6f94
|
* Fix bug #34293,34299.
|
2023-04-18 09:07:50 +08:00 |
|
|
tianshujie
|
59afadec4a
|
* Code for task #91389,91390.
|
2023-04-18 09:03:43 +08:00 |
|
|
liumengyi
|
bed6c1405d
|
* Fix bug of manage workflow browse privs by package.
|
2023-04-18 09:00:32 +08:00 |
|
|
hufangzhou
|
ede5d6a45c
|
* Remove the has existed priv.
|
2023-04-18 08:59:00 +08:00 |
|
|
朱金勇
|
28852fb5fe
|
* Fix bug: order error.
|
2023-04-18 00:53:06 +00:00 |
|
|
liumengyi
|
d971d4b4b7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 08:38:14 +08:00 |
|
|
tianshujie
|
4c595d88d7
|
* Delete useless variables.
|
2023-04-18 08:37:10 +08:00 |
|
|
tianshujie
|
4a980b4d7c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_sort
|
2023-04-18 08:34:41 +08:00 |
|
|
wangyidong
|
b97eb01ace
|
Merge branch 'tsj_fixbug'
|
2023-04-18 08:26:25 +08:00 |
|
|
王怡栋
|
d78cb60d48
|
Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
# module/doc/model.php
# module/group/lang/resource.php
|
2023-04-18 00:25:53 +00:00 |
|
|
王怡栋
|
7399979c28
|
Merge branch 'sprint/scx_bug34275' into 'master'
* Fix bug #34275.
See merge request easycorp/zentaopms!7442
|
2023-04-18 00:24:26 +00:00 |
|
|
tianshujie
|
04a8604aa6
|
* Fix bug #34295.
|
2023-04-18 08:22:38 +08:00 |
|
|
liumengyi
|
ae8f5f3ac5
|
* Finish task #91374, and fix bug of manage workflow privs by package.
|
2023-04-17 17:45:29 +08:00 |
|
|
朱金勇
|
ee571497bb
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2023-04-17 09:39:57 +00:00 |
|
|
wangyidong
|
fed027e5a7
|
* fix bug.
|
2023-04-17 17:39:42 +08:00 |
|
|
朱金勇
|
79fc91885c
|
* Hide backup menu if using dmdb.
|
2023-04-17 09:39:28 +00:00 |
|
|
liugang
|
01e3f26c57
|
* Use export instead of exportChart.
|
2023-04-17 09:29:31 +00:00 |
|
|
tianshujie
|
12e04794a0
|
* Fix bug #34298.
|
2023-04-17 17:28:46 +08:00 |
|
|
tianshujie
|
84712f0f51
|
* Fix bug #34297.
|
2023-04-17 17:26:07 +08:00 |
|
|
tianshujie
|
fb521320e0
|
* Code for task #91391.
|
2023-04-17 17:21:06 +08:00 |
|
|
宋辰轩
|
b1eea9afa7
|
* Fix bug #34275.
|
2023-04-17 17:15:07 +08:00 |
|
|
wangyidong
|
5399ec46be
|
* code for task #91381.
|
2023-04-17 17:14:56 +08:00 |
|
|
朱金勇
|
4f90963c0f
|
* Fix typo.
|
2023-04-17 09:04:04 +00:00 |
|