Commit Graph

877 Commits

Author SHA1 Message Date
王怡栋
371b7a7d7d Merge branch 'sprint/pailei2_tianshujie_17944' into 'pailei2'
* Fix bug #17944.

See merge request easycorp/zentaopms!2292
2022-03-16 05:04:22 +00:00
tianshujie
2891ecc0ae * Fix bug #20781. 2022-03-15 11:29:51 +08:00
tianshujie
0fde764778 * Fix bug #17944. 2022-03-15 10:27:27 +08:00
zhouxin
9f289a632a Fix bug 50416. 2022-03-11 06:45:03 +00:00
孙广明
4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
xieqiyu
58d4a9ad37 * Modify review code. 2022-03-09 11:25:45 +08:00
xieqiyu
139ea1e04a * Modify review code. 2022-03-09 11:17:36 +08:00
zhangzilong
6327b37eae * Code for task #49888. 2022-03-09 10:41:46 +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
xieqiyu
944c0efdfe * Add selected lane when batch create in kanban. 2022-03-08 14:43:55 +08:00
zhouxudong
49e06424d1 * Fix bug #19990. 2022-03-08 10:36:57 +08:00
zhouxudong
ca901e8364 * Fix bug #19990. 2022-03-08 10:21:41 +08:00
孙华伟
03e3f26ad5 * 2022-03-08 10:03:06 +08:00
zhangzilong
45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
zhengrunyu
8d34b3ef8b *Fixbug 19999. 2022-02-24 14:52:56 +08:00
zhengrunyu
4e392ea7b2 * Fixbug 19999. 2022-02-24 14:48:36 +08:00
tanghucheng
adb6f14e59 * Code for task #49697. 2022-02-23 10:39:51 +08:00
zhujinyong
5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +08:00
tanghucheng
6b91759988 * fix bug #19031. 2022-01-28 11:20:17 +08:00
liumengyi
46a1da1935 * Fix bug #18949. 2022-01-25 17:15:45 +08:00
tanghucheng
2e2dc5581b * fix project index and global create card. 2022-01-24 16:48:06 +08:00
tianshujie
25ee419afc * Implement the partial refresh function of the task card. 2022-01-20 15:31:10 +08:00
tianshujie
ef66f1418c * Filter out cards from other swimlanes when updating cards. 2022-01-17 12:23:21 +08:00
tianshujie
a241dc5b11 * Finish task #47350. 2022-01-14 14:51:48 +08:00
liyuchun
4991afb982 * Fix bug #18047. 2021-12-29 13:45:40 +08:00
liyuchun
2b44879ba2 * Adjust code style. 2021-12-29 10:24:39 +08:00
liyuchun
8e98e9831e * Finish task #46551. 2021-12-29 10:02:25 +08:00
zhujinyong
45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
朱金勇
56081eb2e3 Merge branch 'sprint/176_mayue_16964' into 'master'
* Fix bug #16964.

See merge request easycorp/zentaopms!892
2021-12-10 06:17:11 +00:00
朱金勇
5ee11088b8 Merge branch 'sprint/176_songchenxuan_45539' into 'master'
Sprint/176 songchenxuan 45539

See merge request easycorp/zentaopms!870
2021-12-10 06:04:23 +00:00
mayue
5761af1ed8 * Fix bug #17248,17246. 2021-12-08 16:31:24 +08:00
songchenxuan
dde57a36cc *Finish task #45539. 2021-12-07 14:03:20 +08:00
mayue
6c4db07b39 * Fix bug #16964. 2021-12-07 11:18:57 +08:00
chaideqing
9a2148a540 * fix xuanxuan 84's bug 2021-12-07 09:27:40 +08:00
Wenrui LI
24440ff526 * replace link title text with lang items. 2021-12-02 15:30:31 +08:00
chaideqing
57b31c8612 * modify card style when in xuanxuan notice 2021-12-02 14:56:05 +08:00
chaideqing
45e127be6e * add linkButton tips in card and card do not show cross scroll 2021-12-01 14:59:33 +08:00
chaideqing
17ba1ea184 * add jump-link in xuanxuan_card which can jump to zentao_extension_page 2021-12-01 11:10:22 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
孙广明
801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
chaideqing
70677f0673 modify zentao bug/task/story card page's srollbar and actionbar 2021-11-24 10:50:51 +08:00
chaideqing
7bfb998913 * refactor 2021-11-19 16:14:47 +08:00
chaideqing
c36c339848 * task #44636, optimize task card in xuanxuan 2021-11-19 09:45:06 +08:00
xieqiyu
17bee6e900 * Fix bug#16197. 2021-11-11 17:46:10 +08:00
zhujinyong
37b486ad1c * Replace htmlspecialchars to htmlSpecialString for compatibility. 2021-11-10 14:57:48 +08:00
liyuchun
38fe82e21d * Fix bug #15874. 2021-11-01 16:57:10 +08:00
tanghucheng
a6544b38ed * Finish task #43557. 2021-10-27 10:05:51 +08:00
tanghucheng
a577f54958 * Finish task #43557. 2021-10-26 10:45:49 +08:00
liyuchun
33e946e968 * Fix bug #15183. 2021-09-18 08:33:58 +08:00
tianshujie
caaaa90cf5 Merge branch '15.5' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.5 2021-09-15 15:56:33 +08:00