Commit Graph
1591 Commits
Author SHA1 Message Date
李玉春 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
王怡栋 76688d1718 Merge branch 'sprint/fixbug_hufangzhou_17995' into 'master'
* Fix bug #17995.

See merge request easycorp/zentaopms!2573
2022-03-28 05:03:35 +00:00
hufangzhou 504d19ee92 * Fix bug #17995. 2022-03-28 11:09:12 +08:00
hufangzhou 3a38d4787d * Fix bug #17974. 2022-03-28 10:19:44 +08:00
hufangzhou f75e310eb9 * Fix bug #16183. 2022-03-24 14:29:35 +08:00
zenggang 1357480ac6 * Finish task#51109,51108,51128 2022-03-23 07:54:03 +00:00
王怡栋 a83c92fc96 Merge branch 'sprint/fixbug_hufangzhou_14233' into 'master'
* Fix bug #14233.

See merge request easycorp/zentaopms!2471
2022-03-23 06:21:21 +00:00
hufangzhou 350c84440e * Fix bug #14233. 2022-03-23 11:29:55 +08:00
hufangzhou 8b8b4f6989 * Fix bug #16207. 2022-03-23 09:58:09 +08:00
王怡栋 3d64ad4392 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-22 16:28:26 +08:00
王怡栋 2684fd08fe * code for task #51330. 2022-03-22 16:27:54 +08:00
hufangzhou b3003228e0 * Fix bug #17264. 2022-03-22 10:14:18 +08:00
hufangzhou a9eebef134 * Fix bug #16114, #16204. 2022-03-22 09:06:37 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
mayue 034daa3bb6 * Fix bug #14184. 2022-03-18 09:43:22 +08:00
tanghucheng 88230cd949 * Fix bug #20779,20782,20783. 2022-03-15 15:49:25 +08:00
tianshujie 0fde764778 * Fix bug #17944. 2022-03-15 10:27:27 +08:00
孙广明 2e83840675 Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug #19820,20528.

See merge request easycorp/zentaopms!2233
2022-03-14 08:03:51 +00:00
tanghucheng d32f3d2664 * Fix bug #19820,20528. 2022-03-14 14:51:03 +08:00
孙广明 63786c575d Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2204
2022-03-11 06:08:38 +00:00
tanghucheng 477e89a09e * Fix bug. 2022-03-11 14:03:30 +08:00
tianshujie b9366903dc * Fix bug #20656. 2022-03-11 10:57:18 +08:00
zhouxin 38ebc88fd5 Fix bug. 2022-03-10 03:20:19 +00:00
zhouxin ccdcec9e32 Fix bug 50414. 2022-03-10 01:49:52 +00:00
tanghucheng b4726315ba * Fix bug. 2022-03-09 17:27:01 +08:00
唐胡成 4c7b17eed2 Update create.html.php 2022-03-07 08:47:46 +00:00
tanghucheng 15e6262065 * Fix bug #20329,20350,20366. 2022-03-07 16:42:58 +08:00
tianshujie a9f1fcabc2 * Fix bug #20247. 2022-03-02 14:30:41 +08:00
王怡栋 76eea1f5d9 * adjust for global create. 2022-03-02 10:06:19 +08:00