Commit Graph

2264 Commits

Author SHA1 Message Date
朱金勇
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
朱金勇
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
朱金勇
e8feeca41e Merge branch 'sprint/176_songchenxuan_45538' into 'master'
*Finish task #45538.

See merge request easycorp/zentaopms!886
2021-12-10 06:07:32 +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
xieqiyu
ad8ed52f22 * Code for task#45536. 2021-12-10 10:57:56 +08:00
songchenxuan
f77b8ddb9b *Finish task #45538. 2021-12-09 17:10:55 +08:00
mayue
b1c483be84 * Optimize code #17248,17246. 2021-12-08 16:52:50 +08: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
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
孙广明
69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
zhengrunyu
d5f6181ea3 *Fixbug 17066. 2021-12-03 13:53:53 +08:00
王怡栋
7343f4a2af * fix bug for save query condition. 2021-12-02 15:43:36 +08:00
liyuchun
0e30ba0a3b * Fix bug #16836. 2021-12-02 13:19:50 +08:00
mayue
63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
mayue
eec94fd383 * Fix bug #16936. 2021-12-01 17:14:43 +08:00
mayue
c62d599292 * Finish task #44987,44988,44989. 2021-12-01 10:44:38 +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
李玉春
4b223ec01b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!657
2021-11-30 05:02:41 +00:00
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
songchenxuan
9efa9b1759 * Finish task #45018. 2021-11-30 10:49:38 +08:00
王怡栋
21e42772b2 * add lang for api. 2021-11-29 15:29:00 +08:00
mayue
a77510b311 * Finish task #44987,44988,44989. 2021-11-29 15:11:16 +08:00
liumengyi
3e1fc7ad5a * minor refactor. 2021-11-29 10:52:29 +08:00
liumengyi
235d7bbc0a * Finish task #45157. 2021-11-29 10:43:05 +08:00
liumengyi
f77c484548 * Finish task #45157. 2021-11-29 08:21:29 +08:00
liumengyi
e5f3e87ea1 * Finish task #45157. 2021-11-26 15:08:17 +08:00
liumengyi
0c2b88ae38 * Finish task #45157. 2021-11-26 15:04:47 +08:00
liumengyi
4d8b54a0b1 * Finish task #45157. 2021-11-26 10:08:56 +08:00
liumengyi
c6e4ff62d6 * Finish task #45157. 2021-11-26 09:07:28 +08:00
liumengyi
99b52e6b7e * Finish task #45157. 2021-11-26 08:59:55 +08:00
liumengyi
fb843381ca * Finish task #45157. 2021-11-26 08:55:04 +08:00
liumengyi
26da1c72cb * Finish task#45157. 2021-11-25 15:52:15 +08:00
chaideqing
45556985f7 * refactor ifelse code 2021-11-24 11:22:07 +08:00
chaideqing
70677f0673 modify zentao bug/task/story card page's srollbar and actionbar 2021-11-24 10:50:51 +08:00
qixinzhi
f5d89fee3d * fix scroll bar css invalid after merge 2021-11-22 13:51:27 +08:00
文睿 李
68edb2f0a4 Merge branch 'sprint/168' into 'sprint/168_chaideqing_44636'
# Conflicts:
#   module/task/css/x.view.css
2021-11-22 00:23:57 +00: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
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
qixinzhi
e502f80728 * beautify scroll bar for task/bug/story card 2021-11-18 15:13:17 +08:00
zhouxin
b658a98de3 Fix some problem. 2021-11-18 14:13:32 +08:00
王怡栋
d4ccff00e3 * fix bug. 2021-11-17 17:13:00 +08:00
zhouxin
b7e3fe9003 Finis task #44486,44487,44488. 2021-11-17 15:49:24 +08:00
hufangzhou
e441e4a28d * Fix the bugs. 2021-11-15 08:50:05 +08:00
liyuchun
1ae2cffc7c * Fix bug #16165. 2021-11-12 11:01:04 +08:00
xieqiyu
17bee6e900 * Fix bug#16197. 2021-11-11 17:46:10 +08:00
孙广明
eb62dcead9 Merge branch 'sprint/170_zhengrunyu_44163' into 'sprint/170'
*Finish task #44163.

See merge request easycorp/zentaopms!399
2021-11-11 03:16:43 +00:00