Commit Graph

119 Commits

Author SHA1 Message Date
zhouxudong
67045f3041 *Fix bug #14090. 2022-03-22 11:28:44 +08:00
李玉春
73b13d19fe Merge branch 'sprint/pailei2_zhouxudong_15763' into 'master'
* Fix bug #15763.

See merge request easycorp/zentaopms!2417
2022-03-22 03:01:10 +00:00
zhouxudong
39a58efedf * Fix bug #15763. 2022-03-22 10:53:22 +08:00
zhouxudong
541032f12e * Fix bug #15763. 2022-03-22 10:40:34 +08:00
王怡栋
fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
zhouxudong
d818c3426e * Fix bug #15763. 2022-03-22 08:54:24 +08:00
李玉春
46222a0d13 Merge branch 'sprint/pailei2_zhouxudong23_50762' into 'pailei2'
Sprint/pailei2 zhouxudong23 50762

See merge request easycorp/zentaopms!2282
2022-03-16 00:46:23 +00:00
zhouxudong
1847194fe7 * Finish task #50762. 2022-03-15 16:12:37 +08:00
zhouxudong
2cef18b917 * Finish task #50762 #50763. 2022-03-15 10:26:27 +08:00
zhouxudong
fa85f99e59 * Fix bug #19967. 2022-03-14 17:05:18 +08:00
zhouxudong
2e4bb9c6ba * Fix bug #19967. 2022-03-14 16:37:13 +08:00
tianshujie
56c5c966ea * Modify the problem that the execution label cannot be fully displayed. 2022-03-14 08:55:39 +08:00
tianshujie
7e89329205 * Fix bug #20546. 2022-03-10 15:09:54 +08:00
孙华伟
abd00b8f08 * 2022-03-02 11:13:22 +08:00
孙华伟
f4bed0d0c6 * 2022-03-02 10:28:01 +08:00
孙华伟
a282e6c0e6 *Story #30528. 2022-03-02 09:56:58 +08:00
孙华伟
77210ab767 Fix bug #19435. 2022-02-14 17:09:23 +08:00
zhouxin
e48be0c1db Fix s bug. 2022-01-27 03:11:36 +00:00
liumengyi
0cade87855 * Fix bug #18999. 2022-01-26 11:59:58 +08:00
tianshujie
c56ecee795 * Fix bug #18910,18762. 2022-01-25 14:47:51 +08:00
孙广明
fb8fd8b7de Merge branch 'sprint/182_liumengyi_fixbug' into 'master'
* Fix bug #18584, #18594.

See merge request easycorp/zentaopms!1453
2022-01-18 01:32:19 +00:00
liumengyi
c377f3b54c * Fix bug #18584, #18594. 2022-01-18 09:03:30 +08:00
tianshujie
cb1f7a634e * Fix bug #18578,18536. 2022-01-17 23:49:54 +08:00
tianshujie
53fbf25f17 * Adjust css of kanban view. 2022-01-14 15:18:56 +08:00
tianshujie
1097e61db8 * Adjust css of kanban view. 2022-01-14 15:14:53 +08:00
孙广明
e82f0f5655 Merge branch 'sprint/182_tianshujie_47313' into 'kanban'
* Finish task #47333,47313.

See merge request easycorp/zentaopms!1374
2022-01-13 03:18:01 +00:00
tianshujie
bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
liumengyi
1ea0bb4760 * Finish task #47334.Add card view. 2022-01-13 10:35:04 +08:00
tianshujie
4bca0680ab * Finish task #47335. 2022-01-12 15:44:44 +08:00
liumengyi
adf53d8754 * Finish task #47334.Add default view of professional RD Kanban. 2022-01-12 10:08:15 +08:00
liumengyi
ec74445096 * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. 2022-01-11 15:38:50 +08:00
孙广明
84fae4bc7d Merge branch 'kanban' 2021-12-20 10:59:07 +08:00
朱金勇
4cddc5effd Merge branch 'sprint/176_xieqiyu_46097' into 'master'
* Finish task#46097.

See merge request easycorp/zentaopms!989
2021-12-17 07:44:07 +00:00
Hao Sun
fd3a645a30 * Optimize style for cards in client. 2021-12-17 14:11:50 +08:00
Hao Sun
44921262ff * Adjust url card style in client. 2021-12-17 11:33:13 +08:00
xieqiyu
6227d52547 * Finish task#46097. 2021-12-15 17:24:46 +08:00
tanghucheng
781314142c * Fix bug #17316. 2021-12-14 10:20:34 +08:00
zhujinyong
45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
tanghucheng
70e124b9ef * Fix bug #17126. 2021-12-09 10:34:47 +08:00
chaideqing
06916f0dee * recovery module/execution/css/story.css and refactor #main height 2021-12-07 16:43:21 +08:00
tanghucheng
8afc0024e0 * Fix bug #17126. 2021-12-07 10:07:02 +08:00
chaideqing
9a2148a540 * fix xuanxuan 84's bug 2021-12-07 09:27:40 +08:00
孙广明
379baac86d Merge branch 'master' into 'sprint/master_tanghucheng_project'
# Conflicts:
#   module/programplan/lang/en.php
2021-12-07 00:38:58 +00:00
tanghucheng
ac12590b03 * Fix bug #17130,17129,17128. 2021-12-06 15:28:53 +08:00
Hao Sun
2ed3d819e8 * Bug #17056, fix duplicated modal in execution kanban page. 2021-12-06 10:06:35 +08:00
孙广明
5a8e51a9c6 Merge branch 'sprint/master_tanghucheng_project' into 'master'
* Merge programplan into stage.

See merge request easycorp/zentaopms!760
2021-12-06 00:33:10 +00:00
tanghucheng
2935b5964c * Merge programplan into stage. 2021-12-03 15:49:18 +08:00
chaideqing
c75b9ca550 Merge branch 'sprint/168_xuan_notifications' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_xuan_notifications 2021-12-02 15:46:40 +08:00
chaideqing
af6a88cba5 * add linkButton on productPlan card 2021-12-02 15:46:08 +08:00
Wenrui LI
3898d35852 * fix unable to click on pager links in cards. 2021-12-02 15:00:18 +08:00