Commit Graph

884 Commits

Author SHA1 Message Date
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
liumengyi
9bd39c1e98 * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:44:11 +08:00
Zongjun Lan
d97c7ee4a2 * move to extension 2022-02-24 16:22:27 +08:00
liumengyi
e0814cd74b * Change maxVersion bizVersion proVersion to edition. 2022-02-24 16:15:08 +08:00
孙广明
39c8e0a2e7 Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
Sprint/185 fixbug wangyidong

See merge request easycorp/zentaopms!1957
2022-02-24 08:09:43 +00:00
王怡栋
189158dabd Merge branch 'sprint/185_fixbug_wangyidong' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185_fixbug_wangyidong 2022-02-23 17:01:24 +08:00
王怡栋
f34bce05bf * code for task #49401. 2022-02-23 17:00:55 +08:00
王怡栋
4fe35caf8e Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* Fix bug #49335

See merge request easycorp/zentaopms!1910
2022-02-23 04:58:52 +00:00
Zongjun Lan
245a062277 modify code format 2022-02-23 11:34:17 +08:00
Zongjun Lan
91f09fe484 modify code format 2022-02-23 11:27:10 +08:00
Zongjun Lan
f6b9ade20a * Fix bug #49335 2022-02-23 11:07:27 +08:00
王怡栋
545ba95f90 * code for task #49372. 2022-02-23 09:55:38 +08:00
孙广明
e4552821b0 Merge branch 'sprint/185' into 'sprint/185_fixbug_wangyidong'
# Conflicts:
#   extension/lite/action/ext/lang/zh-cn/lite.php
2022-02-23 01:54:46 +00:00
王怡栋
39fad91f7e * code for task #49372. 2022-02-22 16:28:43 +08:00
zhujinyong
408f8d4d91 * Move die to return. 2022-02-22 14:15:00 +08:00
tanghucheng
422811bcbd * code for task #49697. 2022-02-21 17:01:42 +08:00
王怡栋
0cb4581eec Merge branch 'sprint/185_tanghucheng_49697' into 'sprint/185'
* Finish task #49697.

See merge request easycorp/zentaopms!1856
2022-02-21 05:21:01 +00:00
tanghucheng
510e7397d4 * Finish task #49697. 2022-02-21 13:12:51 +08:00
liumengyi
fe8f6bb4dd * Modify getUserSuspendTasks. 2022-02-18 15:52:25 +08:00