Commit Graph

1720 Commits

Author SHA1 Message Date
朱金勇
f1e97497a3 Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!903
2021-12-13 00:46:27 +00:00
xieqiyu
46ed4772cf * Delete unused code. 2021-12-11 14:39:19 +08:00
xieqiyu
5472859d6e * Code for task#45536. 2021-12-11 14:28:45 +08:00
朱金勇
161233a64f Merge branch 'sprint/176_xieqiyu_45536' into 'master'
Sprint/176 xieqiyu 45536

See merge request easycorp/zentaopms!884
2021-12-10 06:15:15 +00:00
xieqiyu
ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
hufangzhou
73b43980eb * Fix an error for lang item. 2021-12-09 10:12:08 +08:00
tianshujie
9818fe17de * Fix bug #17173. 2021-12-09 10:04:46 +08:00
tianshujie
a2355212ad * Fix bug #17272. 2021-12-08 17:08:10 +08:00
tianshujie
545652e0e4 * Fix bug #17259. 2021-12-08 16:50:48 +08:00
liumengyi
9d7cd3b29e * Fix bug #17031,#17029. 2021-12-02 16:08:17 +08:00
王怡栋
bf16167b19 * Support for flow. 2021-12-02 10:55:04 +08:00
tianshujie
41da1fdb7e * Fix the problem of graying out the maintenance product. 2021-12-01 17:05:45 +08:00
李玉春
20ae1dba85 Merge branch 'sprint/175_liumengyi_16882' into 'master'
* Fix bug #16882.

See merge request easycorp/zentaopms!690
2021-12-01 05:01:11 +00:00
zhujinyong
8ee3e5ce16 Merge branch 'sprint/168_sunhao/task45145' 2021-12-01 11:32:08 +08:00
liumengyi
bba0c40dfe * Fix bug #16882, #16924. 2021-12-01 11:25:02 +08:00
liumengyi
86674338d9 * Fix bug #16882. 2021-12-01 10:24:45 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
Hao Sun
39a2d7296b * refactor pages with kanban lib. 2021-11-30 14:21:24 +08:00
孙广明
f89071b9e7 Merge branch 'sprint/168' into 'sprint/168_zhengrunyu_45148'
# Conflicts:
#   module/execution/view/view.html.php
2021-11-30 03:13:21 +00:00
zhengrunyu
e78c876216 *Finish task #45148. 2021-11-30 09:22:04 +08:00
tianshujie
7e225ce3f7 * Finish task #45081,45012. 2021-11-30 09:18:05 +08:00
zhengrunyu
b3c8ee7ccb *Finish task #45148. 2021-11-29 09:29:44 +08:00
tianshujie
582f0e036d * Finish task #45043. 2021-11-27 18:14:41 +08:00
zhengrunyu
9dac5358e3 *Finish task #45148. 2021-11-26 15:20:17 +08:00
liyuchun
1b63752f83 * Finish task #45152. 2021-11-26 14:00:54 +08:00
zhengrunyu
07363c68ff *Finish task #45148. 2021-11-26 09:01:56 +08:00
zhengrunyu
2f41e85fda *Finish task #sprint/168_zhengrunyu_45148. 2021-11-26 08:30:55 +08:00
zhengrunyu
0edae7664d *Finish task #45148. 2021-11-25 15:42:18 +08:00
songchenxuan
6922251f39 * Fix bug 16596. 2021-11-23 15:48:27 +08:00
tianshujie
7a743f5786 * Fix bug #16486. 2021-11-22 09:51:19 +08:00
liyuchun
8cde6c30d4 * Finish task #44357,#44358. 2021-11-19 12:26:23 +08:00
xieqiyu
47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
Hao Sun
ecb8881734 * task #44358, project kanban support drag-and-drop. 2021-11-17 11:01:59 +08:00
mayue
a2f3100ea5 * Modify branch. 2021-11-15 16:18:26 +08:00
孙广明
184629174c * Adjust create project page. 2021-11-15 15:53:54 +08:00
李玉春
dbf8840697 Merge branch 'sprint/170_mayue_16223' into 'sprint/170'
* Fix bug #16223.

See merge request easycorp/zentaopms!449
2021-11-15 01:40:34 +00:00
xieqiyu
a9ba1c9344 * Fix bug#16094. 2021-11-14 14:18:40 +08:00
mayue
3921075895 * Fix bug #16223. 2021-11-12 17:55:58 +08:00
tianshujie
48d7682b0f * Modify the code issue. 2021-11-12 15:18:26 +08:00
tianshujie
50b4590655 * Fix bug #16194. 2021-11-12 14:53:51 +08:00
tianshujie
fb7f493036 * Modify the error code. 2021-11-10 09:58:49 +08:00
tianshujie
5ab6fe77c2 * Modify code logic. 2021-11-09 14:21:17 +08:00
tianshujie
3986d8c297 * Add the logic of project-related multi-branch products. 2021-11-09 10:04:05 +08:00
孙广明
d420eba707 * Finish task #44005. 2021-11-05 11:24:19 +08:00
孙广明
75d547998c * Code for task #44005. 2021-11-04 16:55:37 +08:00
zhengrunyu
3a5bbcdaf7 *Finish task #43915. 2021-11-03 17:20:24 +08:00
zhengrunyu
6a20c5b9b9 *Finish task #43915. 2021-11-03 17:16:46 +08:00
Hao Sun
d8327a0cdc * Task #43195, fix project creating guide modal not show as expected sometimes. 2021-10-15 11:18:37 +08:00
zenggang
5f35a398ad * Finish task#43179 2021-10-11 07:26:18 +00:00
王怡栋
96a8ef6b04 Merge branch '15.5' into 165 2021-10-09 10:06:05 +08:00