Commit Graph

2390 Commits

Author SHA1 Message Date
王怡栋
371b7a7d7d Merge branch 'sprint/pailei2_tianshujie_17944' into 'pailei2'
* Fix bug #17944.

See merge request easycorp/zentaopms!2292
2022-03-16 05:04:22 +00:00
李玉春
2872292277 Merge branch 'pailei2_sunhuawei_50714' into 'pailei2'
*Fix bug#20452

See merge request easycorp/zentaopms!2253
2022-03-15 05:34:06 +00:00
tianshujie
2891ecc0ae * Fix bug #20781. 2022-03-15 11:29:51 +08:00
tianshujie
0fde764778 * Fix bug #17944. 2022-03-15 10:27:27 +08:00
孙华伟
ad8f8f5336 *Fix bug#20452 2022-03-15 08:57:34 +08:00
李玉春
bb05dc2ffe Merge branch 'pailei2_sunhuawei_50714' into 'pailei2'
Pailei2 sunhuawei 50714

See merge request easycorp/zentaopms!2231
2022-03-14 08:17:05 +00:00
孙华伟
ffa6d43736 *Fix bug#20452 2022-03-14 16:10:35 +08:00
孙华伟
6d3030063f * 2022-03-14 13:11:08 +08:00
zhouxin
f9c4e15149 Fix bug #50416. 2022-03-14 02:09:18 +00:00
zhouxin
f470e0d96b Fix bug #50416. 2022-03-11 06:58:47 +00:00
zhouxin
9f289a632a Fix bug 50416. 2022-03-11 06:45:03 +00: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
mayue
9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00
xieqiyu
58d4a9ad37 * Modify review code. 2022-03-09 11:25:45 +08:00
xieqiyu
139ea1e04a * Modify review code. 2022-03-09 11:17:36 +08:00
zhangzilong
6327b37eae * Code for task #49888. 2022-03-09 10:41:46 +08:00
孙广明
382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
xieqiyu
944c0efdfe * Add selected lane when batch create in kanban. 2022-03-08 14:43:55 +08:00
李玉春
39d11cbedb Merge branch 'sprint/pailei2_zhouxudong_19990' into 'pailei2'
Sprint/pailei2 zhouxudong 19990

See merge request easycorp/zentaopms!2136
2022-03-08 03:29:32 +00:00
周旭东
c611670e8e Update en.php 2022-03-08 02:40:30 +00:00
周旭东
6b62b3f16d Update create.js 2022-03-08 02:37:53 +00:00
zhouxudong
49e06424d1 * Fix bug #19990. 2022-03-08 10:36:57 +08:00
zhouxudong
ca901e8364 * Fix bug #19990. 2022-03-08 10:21:41 +08:00
孙华伟
03e3f26ad5 * 2022-03-08 10:03:06 +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
7312bfe658 * rollback code 2022-03-03 14:21:44 +08:00
Zongjun Lan
cdf4b29e29 * fix bug 20030 2022-03-02 18:43:41 +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
zhengrunyu
8d34b3ef8b *Fixbug 19999. 2022-02-24 14:52:56 +08:00
zhengrunyu
4e392ea7b2 * Fixbug 19999. 2022-02-24 14:48:36 +08:00
王怡栋
392c0d7264 Merge branch 'sprint/185_fixbug_lanzongjun_49335' into 'sprint/185'
* Fix bug #49355

See merge request easycorp/zentaopms!1933
2022-02-24 05:13:38 +00:00
Zongjun Lan
cf40dbba88 remove a line 2022-02-24 13:11:37 +08:00
Zongjun Lan
8d397cac21 * Fix bug #49355 2022-02-24 08:53:13 +08: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