Commit Graph
1566 Commits
Author SHA1 Message Date
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
王怡栋 44be255e67 * adjust task #49362 and check priv. 2022-03-01 11:23:44 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
songchenxuan a2a4ec8d6f *Translate. 2022-02-25 11:16:41 +08:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
Zongjun Lan e8b085129b * Fix bug #19903 2022-02-24 11:19:38 +08:00
zhujinyong b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08:00
Wenrui LI acbcfb8f52 * filter project by vision for doclib creation. 2022-01-20 14:47:18 +08:00
Wenrui LI 1e715c26f7 * filter docs for all doc block. 2022-01-20 14:26:38 +08:00
Wenrui LI f451f2865b * filter doclib by vision. 2022-01-20 14:22:51 +08:00
hufangzhou 9b139eb1a9 * Fix bug #18687. 2022-01-18 16:24:18 +08:00
朱金勇 d39aa0ecbb Merge branch 'zentao_client_fix' into 'master'
Zentao client fix

See merge request easycorp/zentaopms!1460
2022-01-18 02:33:01 +00:00
chaideqing 250d944b73 * fix bug #18039,task #47399, show html page when in client create bug/story/task/doc/todo 2022-01-17 14:40:39 +08:00
mayue be717d3937 * Optimize code. 2022-01-17 14:18:39 +08:00
孙广明 758c03968f * Add kanban type in query. 2022-01-17 08:41:59 +08:00
孙广明 021b08995f Merge branch 'sprint/180_xieqiyu_18241' into 'master'
* Fix bug#18241.

See merge request easycorp/zentaopms!1308
2022-01-07 01:33:48 +00:00
xieqiyu 0d9b03dbfb * Fix bug#18241. 2022-01-07 09:27:48 +08:00
孙广明 069f119566 Merge branch 'code_review/001_mayue' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!1302
2022-01-07 01:20:56 +00:00
mayue 7e3e42edaa * Optimize code format. 2022-01-07 09:19:26 +08:00
mayue 91ff44d32e * Optimize code. 2022-01-07 09:14:27 +08:00
孙广明 d5efab2baf Merge branch 'master' into 'sprint/180_xieqiyu_18166'
# Conflicts:
#   module/project/config.php
2022-01-07 00:46:43 +00:00
xieqiyu af54ab16c6 * Fix bug#18242,18241,18240,18239. 2022-01-07 08:35:18 +08:00
孙广明 bff2f36c90 Merge branch 'sprint/181_liumengyi_fixbug' into 'master'
* Finish task #47090 #47098.

See merge request easycorp/zentaopms!1303
2022-01-06 09:25:15 +00:00
liumengyi b6ea0afcb4 * Finish task #47090 #47098. 2022-01-06 16:56:27 +08:00
mayue f151953a49 * Optimize code. 2022-01-06 15:55:49 +08:00
tianshujie 127b69d4c7 * Fix bug #18095. 2022-01-06 13:47:18 +08:00