Commit Graph

1552 Commits

Author SHA1 Message Date
tanghucheng
88230cd949 * Fix bug #20779,20782,20783. 2022-03-15 15:49:25 +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
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
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
zhujinyong
ff9ceaccad * Check auth. 2022-01-05 09:05:32 +08:00
李玉春
d7a9f2fd67 Merge branch 'sprint/180_mayue_46526' into 'sprint/180'
* Finish task #46526.

See merge request easycorp/zentaopms!1249
2022-01-04 07:32:59 +00:00
mayue
e955bc4518 * Optimize code. 2022-01-04 15:30:41 +08:00
mayue
1d28df0e30 * Optimize code. 2022-01-04 15:27:07 +08:00
mayue
0cd9411371 * Finish task #46526. 2022-01-04 10:28:53 +08:00
xieqiyu
5c4609d302 * Modify review problem. 2021-12-31 15:43:27 +08:00
mayue
3e3741796e * Finish task #46526. 2021-12-31 13:03:18 +08:00
tanghucheng
9f341e49ed * Finish task #46677. 2021-12-30 15:10:54 +08:00
mayue
7ac03ddd38 * Optimized code. 2021-12-28 17:14:32 +08:00
mayue
3aeb86e36d * Finish task #46526. 2021-12-28 15:22:08 +08:00
xieqiyu
cac3878f12 * Add return value. 2021-12-28 14:56:04 +08:00
xieqiyu
b6e0307110 * Modify review problem. 2021-12-28 14:05:58 +08:00
xieqiyu
5ab26fee54 * Finish task#46543. 2021-12-28 13:38:35 +08:00