Commit Graph

728 Commits

Author SHA1 Message Date
王怡栋
084f66dd51 Merge branch 'master' into 'sprint/master_zhouxudong_56362'
# Conflicts:
#   module/kanban/model.php
2022-06-09 06:32:06 +00:00
zhouxudong
1da6718278 * Finish task #56362. 2022-06-09 05:30:57 +00:00
王怡栋
fd0cb543ba Merge branch 'master' into 'sprint_200'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
#   module/execution/view/kanban.html.php
#   module/kanban/css/space.css
2022-06-09 03:16:20 +00:00
zhouxudong
ea746e862f * Finish task #56362. 2022-06-09 03:04:12 +00:00
王怡栋
df6d8bcb0e Merge branch 'sprint/201' into 'master'
Sprint/201

See merge request easycorp/zentaopms!3793
2022-06-08 06:45:01 +00:00
zhouxudong
edd66c028d * Fix bug #23026. 2022-06-08 06:25:06 +00:00
liumengyi
d0e34c1f19 * Code optimize. 2022-06-08 13:50:15 +08:00
liumengyi
5e74d3bd9f * Finish task #56454. 2022-06-08 10:32:01 +08:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
tianshujie
ff8e718b37 * Fix bug #23349. 2022-06-07 16:00:28 +08:00
zhouxudong
607a871ddf * Finish task #56396. 2022-06-07 06:09:44 +00:00
zhouxudong
0f645a096e * Finish task #56396. 2022-06-07 05:39:44 +00:00
孙广明
61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
liumengyi
4e71cb29a8 * Fix bug #23031. 2022-06-02 14:12:00 +08:00
tianshujie
6837b79449 * Fixed editing RD Kanban error. 2022-06-02 10:51:32 +08:00
孙广明
2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
孙广明
c671cc3186 Merge branch 'sprint/197_zhouxin_55674' into 'sprint/197'
Sprint/197 zhouxin 55674

See merge request easycorp/zentaopms!3691
2022-06-01 08:57:31 +00:00
zhouxin
cda4d7e809 * Adjust code. 2022-06-01 08:56:49 +00:00
zhouxin
2fcd623c62 * Adjust code. 2022-06-01 07:48:32 +00:00
zhouxin
bc803e56c8 * Finish task #55676. 2022-06-01 07:34:04 +00:00
zhouxudong
5c3ac663e6 * Fix bug #23129 #23126 #23108. 2022-06-01 06:30:45 +00:00
tianshujie
5d62ed5900 * Finish task #55675. 2022-06-01 13:06:26 +08:00
mayue
38bdcc9ea4 * Optimize code. 2022-06-01 11:29:41 +08:00
mayue
3c259a09d1 * Fix bug #23086. 2022-06-01 11:20:16 +08:00
王怡栋
f64b61a487 Merge branch 'sprint/196' into 'master'
Sprint/196

See merge request easycorp/zentaopms!3677
2022-06-01 02:28:26 +00:00
tanghucheng
c9daed297e * Fix bug #23105. 2022-06-01 08:41:04 +08:00
tanghucheng
648362bfdb * Fix bug #23095. 2022-05-31 17:22:15 +08:00
tianshujie
0665817eb8 * Finish task #55675. 2022-05-31 17:20:22 +08:00
王怡栋
e0adec2091 Merge branch 'master_xieqiyu_55620' into 'sprint/196'
* Finish task#55620,#55627.

See merge request easycorp/zentaopms!3666
2022-05-31 08:15:51 +00:00
zhouxudong
93e753b39e * Finish task #55619 #55626. 2022-05-31 06:03:37 +00:00
xieqiyu
037a010a6f * Code for task#55626. 2022-05-31 00:11:29 +08:00
zhouxudong
afa9003035 * Finisha task #55626 #55619. 2022-05-31 05:09:49 +00:00
xieqiyu
4d043935be * Finish task#55620,#55627. 2022-05-30 23:29:15 +08:00
mayue
106bd7b3e7 * Fix issue #654. 2022-05-27 15:58:57 +08:00
王怡栋
a0af734e79 Merge branch 'sprint/master_zhouxudong_54991' into 'master'
Sprint/master zhouxudong 54991

See merge request easycorp/zentaopms!3626
2022-05-26 09:28:41 +00:00
zhouxudong
715527fd59 * Finish task #54991. 2022-05-26 09:19:50 +00:00
zhouxudong
e70628fef0 * Finish task #54991. 2022-05-26 07:40:28 +00:00
zhouxudong
4b956437fd * Finisha task #54991. 2022-05-26 06:30:06 +00:00
王怡栋
c39f1f8892 Merge branch 'sprint/master_zhouxudong_54991' into 'master'
* Finish task #54991.

See merge request easycorp/zentaopms!3592
2022-05-25 08:04:31 +00:00
zhouxudong
b1ac09ae53 * Finish task #54991. 2022-05-25 08:01:10 +00:00
zhouxudong
7d5b4616bb * Finish task #54991. 2022-05-25 05:53:27 +00:00
孙广明
04932fc4b0 Merge branch 'sprint/195_mayue_bug#22881' into 'master'
* Fix bug #22881.

See merge request easycorp/zentaopms!3579
2022-05-25 03:29:21 +00:00
李玉春
10691aa653 Merge branch 'fixbug_sunjun_22556' into 'master'
Fixbug sunjun 22556

See merge request easycorp/zentaopms!3553
2022-05-25 02:28:26 +00:00
mayue
623cc446f9 * Fix bug #22881. 2022-05-25 02:28:08 +00:00
zenggang
7d5615ffac * Adjust story sort default to desc 2022-05-24 09:10:28 +00:00
mayue
db30dd1cad * Optimize code. 2022-05-24 08:37:10 +00:00
sunjun
838a8ccb95 fixbug_sunjun_22556 2022-05-24 07:36:58 +00:00
mayue
37125b72bc * Finish task #55175. 2022-05-24 07:34:38 +00:00
孙广明
77dd8b3b64 Merge branch 'sprint/matser_zhouxudong_22722' into 'master'
Sprint/matser zhouxudong 22722

See merge request easycorp/zentaopms!3560
2022-05-24 06:34:08 +00:00