Commit Graph

462 Commits

Author SHA1 Message Date
xieqiyu
afa1631a35 * Code for task#58578. Delete name. 2022-06-30 10:09:32 +08:00
leiyong
6f4e6390cb * It is judged that the project name cannot be empty. 2022-06-29 06:02:23 +00:00
leiyong
f888f66bf5 * Finish task#58578. 2022-06-28 09:59:34 +00:00
tianshujie
bf7f947f72 * Finish task #58288. 2022-06-23 15:05:22 +08:00
liumengyi
c26c9dc110 * Optimize code for task #58288. 2022-06-23 09:39:29 +08:00
liumengyi
4c5ff19a61 * Finish task #58288. 2022-06-22 17:01:39 +08:00
liumengyi
b7a32b354b * Finish task #58288. 2022-06-22 16:15:06 +08:00
孙广明
dab3b7eab2 Merge branch 'sprint/207_mayue_bug#23765' into 'zentaopms_207'
* Fix bug #23765.

See merge request easycorp/zentaopms!4037
2022-06-21 07:24:12 +00:00
王怡栋
83ecf656d3 Merge branch 'sgm_parentplan' into 'master'
* Code for feedback #397.

See merge request easycorp/zentaopms!4033

(cherry picked from commit beaddb012c)

f0c23584 * Code for feedback #397.
2022-06-21 06:28:13 +00:00
王怡栋
c30ba304ab Revert "Merge branch 'sgm_parentplan' into 'master'"
This reverts merge request !4033
2022-06-21 06:25:45 +00:00
mayue
d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
孙广明
f0c23584e0 * Code for feedback #397. 2022-06-21 10:23:58 +08:00
tianshujie
33cecbfcd3 * Optimize the code. 2022-06-17 13:14:55 +08:00
孙广明
3f83669de2 Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Fix bug#23707.

See merge request easycorp/zentaopms!3992
2022-06-16 09:28:33 +00:00
leiyong
f4e3a0dc61 * Fix bug#23707. 2022-06-16 09:14:11 +00:00
王怡栋
bd1dc044d1 Merge branch 'master_xieqiyu_23829' into 'master'
* Fix bug#23829.

See merge request easycorp/zentaopms!3972
2022-06-16 09:03:35 +00:00
liumengyi
e4b44a2b05 * Fix issue #678. 2022-06-16 14:18:29 +08:00
xieqiyu
e33c963505 * Fix bug#23829. 2022-06-16 13:33:23 +08:00
王怡栋
9f7840a2d7 Merge branch 'sprint/204_liumengyi_677' into 'master'
* Fix issue #677.

See merge request easycorp/zentaopms!3966
2022-06-16 03:28:18 +00:00
liumengyi
d369332447 * Fix issue #677. 2022-06-16 11:25:41 +08:00
tianshujie
b3e240eda5 * Finish task #57095. 2022-06-16 10:29:31 +08:00
孙广明
1f13b14799 Merge branch 'master' into 'sprint/204_tianshujie_57095'
# Conflicts:
#   module/execution/css/all.css
2022-06-15 09:03:47 +00:00
tianshujie
1f0f1ff36e * Finish task #57095. 2022-06-15 16:52:26 +08:00
tianshujie
7f000fd968 * Finish task #57095. 2022-06-15 16:41:12 +08:00
liumengyi
764d54148d * Fix bug 23744. 2022-06-15 15:18:47 +08:00
tianshujie
2c176439d3 * Finish task #57095. 2022-06-15 15:09:34 +08:00
liumengyi
5054fd14b2 * Optimize code. 2022-06-15 15:08:58 +08:00
liumengyi
a77547cfa6 * Optimize code. 2022-06-15 15:07:58 +08:00
liumengyi
f75c14ea54 * Fix bug #23744. 2022-06-15 15:04:31 +08:00
liumengyi
023eaedf83 * Fix bug #23744. 2022-06-15 13:57:12 +08:00
liumengyi
9a74ea6d5d * Fix bug of task #57089. 2022-06-15 10:05:52 +08:00
liumengyi
ee49b70482 * Finish task #57089. 2022-06-14 16:42:12 +08: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
wangyidong
11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
xieqiyu
86561ba4ca * Code for task#56393,#56390,#56389. 2022-06-08 10:15: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
zenggang
c69ffb8d7d * Fix bug#23246 2022-06-06 04:30:37 +00:00
wangyidong
2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
liumengyi
e661948d67 * Finish story #32879,#32887,#32935,#32934. 2022-05-31 09:21:05 +08:00
liumengyi
ecdbeb4e0a * Fix bug #23022. 2022-05-27 09:51:32 +08:00
孙广明
1926f2ee8d Merge branch 'sprint/195_mayue_task#55175' into 'master'
* Finish task #55175.

See merge request easycorp/zentaopms!3563
2022-05-24 08:52:12 +00:00
mayue
815eb40a20 * Optimize code. 2022-05-24 08:39:55 +00:00
tianshujie
7d4781fdd2 * Fixed edit Execution Kanban save error. 2022-05-24 16:13:37 +08:00
mayue
07906fb1f8 * Add code comments. 2022-05-24 07:38:39 +00:00
mayue
37125b72bc * Finish task #55175. 2022-05-24 07:34:38 +00:00
zenggang
463ff11e9d * Add project name 2022-05-19 07:03:55 +00:00
liumengyi
e83da7c524 * Fix bug for task #54336. 2022-05-18 11:15:21 +08:00
liumengyi
aacfdcdc1c * Fix bug for task #54336. 2022-05-18 11:10:57 +08:00
zenggang
56363dbfeb * Adjust code 2022-05-17 08:52:33 +00:00