Commit Graph

168 Commits

Author SHA1 Message Date
xieqiyu
311436573a * Fix bug#25365. 2022-07-15 11:12:04 +08:00
liumengyi
be11f49b45 * Optimize code. 2022-07-13 09:46:02 +08:00
liumengyi
154c18ee43 * Finish task #60476. 2022-07-12 11:07:16 +08:00
tianshujie
ce191b4f9e * Fix bug #24945. 2022-07-08 09:04:57 +08:00
xieqiyu
e10272248b * Code for task#59546. Update create story and copy bug. 2022-07-07 09:06:33 +08:00
孙广明
33dd17eb8a Merge branch 'sprint/207_mayue_bug#23765' into 'master'
Sprint/207 mayue bug#23765

See merge request easycorp/zentaopms!4094
2022-06-23 05:30:16 +00:00
mayue
6c975adff8 * Add some code. 2022-06-22 17:21:55 +08:00
liumengyi
4c5ff19a61 * Finish task #58288. 2022-06-22 17:01:39 +08:00
zhouxudong
51f5d5bd3a * Finish task #56648. 2022-06-10 02:29:54 +00:00
caoyanyi
6a93732c19 * Modify access check. 2022-06-09 15:47:28 +08:00
李玉春
f8581fd2c4 Merge branch 'zentaopms_199' into 'master'
Zentaopms 199

See merge request easycorp/zentaopms!3832
2022-06-09 07:38:52 +00:00
王怡栋
ad0ebf0aa1 Merge branch 'master' into 'sprint/201_liumengyi_fixbug'
# Conflicts:
#   module/execution/js/kanban.js
2022-06-09 07:24:23 +00:00
liumengyi
63717f4fd0 * Fix bug of task #56454. 2022-06-09 15:18:56 +08:00
王怡栋
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
caoyanyi
326323a0c1 * Modify url param. 2022-06-09 09:11:54 +08:00
caoyanyi
55f6cdb651 * Finish task #56548. 2022-06-08 15:53:37 +08: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
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
tianshujie
5d62ed5900 * Finish task #55675. 2022-06-01 13:06:26 +08:00
tianshujie
0665817eb8 * Finish task #55675. 2022-05-31 17:20:22 +08:00
tianshujie
5bdb7f521c * Finish task #53668. 2022-05-10 17:05:49 +08:00
Hao Sun
6ea976a722 * bug #19052, fix width for some models. 2022-04-15 14:35:05 +08:00
tianshujie
14fd19d50b * Fix bug #18781. 2022-04-07 16:58:07 +08:00
zhouxudong
c0bf8f5275 * Fix bug #21378. 2022-04-02 14:16:09 +08:00
Hao Sun
0a7c559478 * optimize UI for kanban. 2022-03-24 14:27:03 +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
孙广明
7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
孙华伟
d8bb8a903e * 2022-03-04 14:34:01 +08:00
孙华伟
c01323fdbb *Fix bug #20273 . 2022-03-03 09:40:43 +08:00
孙华伟
e0640737c2 *Fix bug #20273. 2022-03-03 09:34:41 +08:00
李玉春
a0da36e3f2 Merge branch 'pailei' into 'pailei_sunhuawei_story_30528'
# Conflicts:
#   module/execution/control.php
#   module/execution/view/kanban.html.php
2022-03-02 05:34:15 +00:00
孙华伟
e7d721af85 * 2022-03-02 13:15:04 +08:00
孙华伟
03b0221c99 * 2022-03-02 13:08:22 +08:00
孙华伟
fa34d9e024 * 2022-03-02 11:31:50 +08:00
孙华伟
51b7e615e0 * 2022-03-02 11:30:20 +08:00
孙华伟
5d61f31c3b * 2022-03-02 11:22:23 +08:00
孙华伟
abd00b8f08 * 2022-03-02 11:13:22 +08:00
孙广明
b63fa55607 Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.

See merge request easycorp/zentaopms!2029
2022-03-02 03:00:45 +00:00
zhangzilong
92f4d32a68 * Finish task #49297. 2022-03-02 10:57:48 +08:00
孙华伟
f4bed0d0c6 * 2022-03-02 10:28:01 +08:00
孙华伟
a282e6c0e6 *Story #30528. 2022-03-02 09:56:58 +08:00