Commit Graph

1087 Commits

Author SHA1 Message Date
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
tanghucheng
987d0d0443 * Fix bug #20968,20964. 2022-03-21 17:00:42 +08:00
zhouxin
2ab2af045c Fix bug #13855. 2022-03-18 07:17:07 +00:00
李玉春
2ec1dd38b4 Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
*fix bug#17639

See merge request easycorp/zentaopms!2237
2022-03-14 08:28:27 +00:00
孙华伟
951a3ab1af *Fix bug#17639 2022-03-14 16:26:45 +08:00
孙华伟
60e271f10a *fix bug#17639 2022-03-14 15:31:29 +08:00
tianshujie
e20c497d01 * Fix bug #20678. 2022-03-11 14:51:33 +08:00
李玉春
abad40f8f6 Merge branch 'pailei2_sunhuawei_50407' into 'pailei2'
Pailei2 sunhuawei 50407

See merge request easycorp/zentaopms!2196
2022-03-11 02:42:52 +00:00
孙华伟
38ddffdd3f * 2022-03-11 10:39:39 +08:00
孙华伟
e4f3113301 *Fix bug#17639 2022-03-11 10:36:44 +08:00
孙华伟
1dd0399e02 *Fix bug #17639. 2022-03-11 08:33:09 +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
tianshujie
5b2b646db3 * Fix bug #20328. 2022-03-04 16:29:56 +08:00
王怡栋
4f6834011c * fix bug for revert team when edit project. 2022-02-28 14:21:45 +08:00
liumengyi
9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
孙广明
47c48e68a2 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong

See merge request easycorp/zentaopms!1878
2022-02-22 07:53:22 +00:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
王怡栋
2c89a401d5 * code for task #49352 and fix error. 2022-02-22 13:29:07 +08:00
zhujinyong
d02ddc138c Merge branch 'lite' into sprint/185 2022-02-17 10:20:50 +08:00
zhujinyong
5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
tanghucheng
ca0ac94d92 * code for task#49013. 2022-02-14 13:23:51 +08:00
tanghucheng
41e0b66473 * finish task #49013. 2022-02-14 13:17:56 +08:00
tanghucheng
c7fab53ed1 * finish task #49090. 2022-02-14 09:57:10 +08:00
xieqiyu
0b9e65b245 * Fix bug#18983. 2022-01-26 10:27:50 +08:00
tanghucheng
1f81f7cef8 * Fix projectlist. 2022-01-25 16:27:13 +08:00
liumengyi
b6b895bb87 * Modify how the creator is appended to team members. 2022-01-24 17:20:38 +08:00
liumengyi
30236e6a94 * Remove empty line. 2022-01-24 17:11:25 +08:00
liumengyi
ecc9e22867 * Finish task 18883,add project team. 2022-01-24 16:54:30 +08:00
Wenrui LI
acbcfb8f52 * filter project by vision for doclib creation. 2022-01-20 14:47:18 +08:00
王怡栋
03d2e3cb4a Merge branch 'master' into lite 2022-01-19 08:44:43 +08:00
王怡栋
0a619a470e Merge branch 'lite' of https://gitlab.zcorp.cc/easycorp/zentaopms into lite 2022-01-17 17:25:44 +08:00
王怡栋
d8577f7d28 * adjust for project kanban. 2022-01-17 17:25:20 +08:00
Wenrui LI
c32efc0929 * filter executions by vision in blocks, bug #18518. 2022-01-17 15:54:44 +08:00
朱金勇
dce7ddc20c Merge branch 'autoTest_xieqiyu' into 'master'
Auto test xieqiyu

See merge request easycorp/zentaopms!1426
2022-01-17 02:35:38 +00:00
xieqiyu
d4365afb0b * Add project test case. 2022-01-14 08:32:53 +08:00
tianshujie
bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
王怡栋
37d1c0e9e6 * code for task #47149. 2022-01-13 09:03:35 +08:00
tianshujie
a0d61f9d2f * Working with Kanban Data. 2022-01-12 11:07:02 +08:00
孙广明
62b7f5eac1 Merge branch 'sprint/182_liumengyi_47340' into 'kanban'
* Finish task #47340.When adding kanban execution, create region, group, lanes and columns.

See merge request easycorp/zentaopms!1344
2022-01-11 07:53:14 +00:00
liumengyi
ec74445096 * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. 2022-01-11 15:38:50 +08:00
王怡栋
6fecf642ae * code for task #47157. 2022-01-11 15:24:18 +08:00
孙广明
54fc83b0fc * Add execution kanban list. 2022-01-11 11:17:41 +08:00
孙广明
b57562e99e Revert "Merge branch 'sprint/182_hufangzhou_47331' into 'master'"
This reverts merge request !1326
2022-01-11 00:35:04 +00:00
hufangzhou
0b9e2c0fa3 * Finish task #47331. 2022-01-10 17:18:18 +08:00
mayue
91ff44d32e * Optimize code. 2022-01-07 09:14:27 +08:00
zhouxin
7c1d29f971 Fix bug. 2022-01-06 05:12:36 +00:00
李玉春
a19708adeb Merge branch 'master' into 'sprint/32_zhouxin_fixbugs'
# Conflicts:
#   module/project/config.php
2022-01-06 04:01:16 +00:00
zhouxin
0b08489176 Fix bug. 2022-01-06 03:57:50 +00:00