Commit Graph

902 Commits

Author SHA1 Message Date
tanghucheng
0c2c898c01 * Fix bug #21576. 2022-04-13 10:46:44 +08:00
xieqiyu
a60f498ea8 * Modify review code. 2022-04-11 17:23:59 +08:00
xieqiyu
ee5d43bea9 * Fix bug#18080. 2022-04-11 08:53:28 +08:00
朱金勇
ecbbc59166 Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest

See merge request easycorp/zentaopms!2775
2022-04-06 09:09:27 +00:00
孙广明
bd895ca244 * Add project test and fix bug. 2022-04-06 16:01:06 +08:00
xieqiyu
c4e9e00959 * Fix bug#13881. 2022-04-06 09:49:30 +08:00
王怡栋
6edb5fe805 * fix bug #21413. 2022-04-02 14:44:18 +08:00
孙广明
3d2de17fff Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #11348.

See merge request easycorp/zentaopms!2648
2022-03-31 03:08:50 +00:00
zhouxudong
8efcc37f4b * Fix bug #18083. 2022-03-31 11:02:59 +08:00
xieqiyu
0983c30e8d * Fix bug#18083. 2022-03-30 17:26:17 +08:00
liyuchun
74d2ed5ea6 * Fix bug #11348. 2022-03-30 17:01:15 +08:00
zhouxudong
e97eab6f68 * Fix bug #18083. 2022-03-30 08:50:14 +08:00
zhouxudong
a7f9fdca86 * Fix bug #18083. 2022-03-29 14:03:53 +08:00
zhouxudong
5607b4f6c8 * Fix bug #11919. 2022-03-28 15:12:12 +08:00
zhouxudong
d689db05a7 * Fix bug #11919. 2022-03-28 13:10:11 +08:00
zhouxudong
5129df89d2 * Fix bug #11919. 2022-03-28 11:11:31 +08:00
zhouxudong
0f999761c9 * Fix bug #11919. 2022-03-28 11:10:21 +08:00
zhouxudong
92648cadc8 * Fix bug #11919. 2022-03-25 15:23:15 +08:00
Wenrui LI
56053267c1 * fix where deleted condition of query. 2022-03-22 11:07:49 +08:00
Wenrui LI
b232bd54fe * filter out deleted lanes, task #51311, bug #20972. 2022-03-22 10:39:28 +08:00
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
孙华伟
ad8f8f5336 *Fix bug#20452 2022-03-15 08:57:34 +08:00
孙华伟
ffa6d43736 *Fix bug#20452 2022-03-14 16:10:35 +08:00
孙华伟
6d3030063f * 2022-03-14 13:11:08 +08:00
tanghucheng
477e89a09e * Fix bug. 2022-03-11 14:03:30 +08:00
孙广明
4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
xieqiyu
4ba238cd27 * Modify review code. 2022-03-09 14:36:50 +08:00
孙广明
ebfdd2a742 Merge branch 'autoTest_liumengyi' into 'master'
* Add auto test for task.

See merge request easycorp/zentaopms!2159
2022-03-09 05:53:01 +00:00
liumengyi
b1623bb73a * Add auto test for task. 2022-03-09 13:46:19 +08:00
zhangzilong
6327b37eae * Code for task #49888. 2022-03-09 10:41:46 +08:00
王怡栋
fb22e1dcb0 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 50368

See merge request easycorp/zentaopms!2128
2022-03-08 07:54:22 +00:00
Zongjun Lan
64d797b109 * fix bug 50368 2022-03-08 15:49:39 +08:00
xieqiyu
944c0efdfe * Add selected lane when batch create in kanban. 2022-03-08 14:43:55 +08:00
Zongjun Lan
b82a7e5f57 * fix bug 50368 2022-03-08 09:51:34 +08:00
王怡栋
4778730e92 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-07 17:27:25 +08:00
王怡栋
b936dae827 * code for task #50359. 2022-03-07 17:26:33 +08:00
Zongjun Lan
3f9ca9c4fe * fix bug undefine lane 2022-03-07 17:18:31 +08:00
zhangzilong
45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
王怡栋
6a3af094fe Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20234,20022

See merge request easycorp/zentaopms!2072
2022-03-04 06:38:10 +00:00
Zongjun Lan
a2e18288cf * fix bug 20022 2022-03-04 14:31:27 +08:00
Zongjun Lan
23d699311d * fix bug 20022 2022-03-04 14:27:25 +08:00
tianshujie
6dc0d7a70d * Solve the problem that the project field of the pending task list is 0. 2022-03-04 09:04:02 +08:00
Zongjun Lan
f4970f502d * fix bug 20023 2022-03-01 16:34:34 +08:00
hufangzhou
8a71dc32bb * Fix bug #20155. 2022-03-01 09:29:26 +08:00
hufangzhou
b79cd2db12 * Fix bug #20119. 2022-02-28 14:27:46 +08:00
Zongjun Lan
8dd88cb766 * fix task 49335 2022-02-28 11:02:52 +08:00
孙广明
df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
孙广明
25f71e0a51 Merge branch 'sprint/185' into 'sprint/186_liumengyi_modify'
# Conflicts:
#   module/task/model.php
2022-02-25 00:41:58 +00:00
王怡栋
a6c782de7b Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* move to extension

See merge request easycorp/zentaopms!1963
2022-02-24 09:06:41 +00:00
Zongjun Lan
2cc1105512 * fix move extensions to module 2022-02-24 16:59:39 +08:00