Commit Graph

1619 Commits

Author SHA1 Message Date
孙广明
305a4074e4 * Rename var. 2022-05-07 13:50:02 +08:00
hufangzhou
90265f93d8 * Add the new version. 2022-05-06 13:48:21 +08:00
mayue
0552260277 * Fix bug #22148. 2022-05-05 05:43:52 +00:00
王怡栋
35c6389735 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #22019

See merge request easycorp/zentaopms!3195
2022-04-28 08:51:30 +00:00
lanzongjun
3bdab60664 * fix bug #22019 2022-04-28 15:48:24 +08:00
wangyidong
4e24558f9f * code for bug #15815. 2022-04-28 11:54:46 +08:00
wangyidong
fbd33f5262 * code bug #15815. 2022-04-28 11:54:46 +08:00
hufangzhou
bad39397ce * Fix bug #15582. 2022-04-28 10:56:13 +08:00
朱金勇
90a29b0743 Merge branch 'sprint/fixbug_hufangzhou_15599' into 'master'
* Fix bug #15599.

See merge request easycorp/zentaopms!3164
2022-04-27 08:20:44 +00:00
hufangzhou
8907f7c898 * Fix bug #15599. 2022-04-27 15:53:18 +08:00
hufangzhou
1235dd8101 * Fix bug #22039. 2022-04-27 15:24:30 +08:00
hufangzhou
0424801e4e * Fix bug #15654. 2022-04-27 10:48:28 +08:00
zenggang
9e1f09d37a * Fix bug#21982,21983 2022-04-26 03:25:12 +00:00
王怡栋
f93e474e26 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18934#21853

See merge request easycorp/zentaopms!3063
2022-04-21 08:24:08 +00:00
Zongjun Lan
7e63a02e20 * fix bug #18934 2022-04-21 16:09:34 +08:00
tanghucheng
700c706916 * Fix bug #18266. 2022-04-21 05:33:41 +00:00
hufangzhou
d4f1453db1 * Fix bug #19984. 2022-04-21 09:26:15 +08:00
王怡栋
667439ab4c Merge branch 'sprint/fixbug_hufangzhou_21829' into 'master'
* Fix bug #21829.

See merge request easycorp/zentaopms!2995
2022-04-19 00:43:36 +00:00
hufangzhou
bc381ede7d * Fix bug #21833. 2022-04-18 16:45:12 +08:00
hufangzhou
bdc7323b19 * Fix bug #21829. 2022-04-18 16:32:30 +08:00
hufangzhou
cc140db6a1 * Fix bug #11808. 2022-04-18 14:08:31 +08:00
hufangzhou
18293e3e0d * Fix bug #15656. 2022-04-13 11:19:20 +08:00
王怡栋
a8a174a455 Merge branch 'sprint/fixbug_hufangzhou_17974' into 'master'
* Fix bug #17974 for objectlibs method.

See merge request easycorp/zentaopms!2889
2022-04-12 08:55:02 +00:00
songchenxuan
95e6a143a8 * Move doc lang. 2022-04-12 15:37:55 +08:00
hufangzhou
07a887f62c * Fix bug #17974 for objectlibs method. 2022-04-12 15:10:20 +08:00
王怡栋
c6f7312b2e Merge branch 'sprint/fixbug_hufangzhou_14551' into 'master'
* Fix bug #14551.

See merge request easycorp/zentaopms!2878
2022-04-12 06:02:27 +00:00
hufangzhou
d3fe628bcd * Fix bug #14551. 2022-04-12 10:37:41 +08:00
hufangzhou
96eae06795 * Fix bug #15641. 2022-04-12 10:11:20 +08:00
李玉春
8fd308411b Merge branch 'devops25_52046' into 'master'
Fix bug #21103,21176

See merge request easycorp/zentaopms!2796
2022-04-08 00:22:17 +00:00
王怡栋
4b8ed58692 Merge branch 'sprint/fixbug_hufangzhou_doclibaction' into 'master'
* Fix the bug of doc lib related actions don't show.

See merge request easycorp/zentaopms!2755
2022-04-07 08:21:03 +00:00
Zongjun Lan
931c3ccc38 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-07 16:17:21 +08:00
王怡栋
b79106bc87 Merge branch 'sprint/fixbug_hufangzhou_16198' into 'master'
* Fix bug #16198.

See merge request easycorp/zentaopms!2772
2022-04-07 08:14:44 +00:00
hufangzhou
32da4b3b25 * Fix bug #16204. 2022-04-07 15:54:06 +08:00
zenggang
6deba0c240 * Fix bug #21103,21176 2022-04-07 07:44:39 +00:00
hufangzhou
3791f6520c * Fix bug #16198. 2022-04-06 16:27:42 +08:00
Zongjun Lan
f22d8882eb * fix bug #21489 2022-04-06 11:26:29 +08:00
hufangzhou
87a515c803 * Fix the bug of doc lib related actions don't show. 2022-04-06 09:53:13 +08:00
王怡栋
665bfee637 Merge branch 'sprint/fixbug_hufangzhou_17362' into 'master'
* Fix bug #17362.

See merge request easycorp/zentaopms!2740
2022-04-02 08:05:56 +00:00
hufangzhou
4eeaa81691 * Rename the method name. 2022-04-02 16:05:19 +08:00
hufangzhou
8cd3b4eb9f * Packaging method. 2022-04-02 15:58:22 +08:00
王怡栋
adb3a7ea72 Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/project/model.php
2022-04-02 07:33:24 +00:00
hufangzhou
c155d3aa96 * Fix bug #17362. 2022-04-02 15:05:39 +08:00
hufangzhou
9ff0537cda * Fix bug #17362. 2022-04-02 14:57:33 +08:00
tanghucheng
1d168b0468 * Fix bug #21408,21406,20199. 2022-04-02 14:06:41 +08:00
hufangzhou
0608a7dadb * Fix bug #21304. 2022-04-02 10:55:16 +08:00
tianshujie
bb6581b99a * Fix bug #18273. 2022-04-02 10:14:26 +08:00
hufangzhou
cd6b98f084 * Fix bug of child stage. 2022-03-31 14:12:12 +08:00
zhouxin
082e7cd081 Delete a blank line. 2022-03-30 09:17:23 +00:00
zhouxin
b29d13ddd7 * Fix bug #16317. 2022-03-30 09:01:55 +00:00
hufangzhou
df4c62e876 * Fix bug #18696. 2022-03-29 13:47:11 +08:00