Commit Graph

2281 Commits

Author SHA1 Message Date
liyuchun
c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +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
hufangzhou
1a5adfe15f * Fix bug for compatible php8.0 . 2021-12-28 14:46:10 +08:00
hufangzhou
f043a50e5e * Code for task #17919. 2021-12-24 13:20:04 +08:00
hufangzhou
f02258f8e1 * Fix bug #17919. 2021-12-24 13:16:23 +08:00
hufangzhou
1aeccfed43 * Fix bug #17919. 2021-12-24 10:47:30 +08:00
Hao Sun
44921262ff * Adjust url card style in client. 2021-12-17 11:33:13 +08:00
zhujinyong
45cdfc8f59 Merge branch 'xuan' 2021-12-14 09:08:15 +08:00
Hao Sun
57da5467c9 * add more space for version label in title of client card title. 2021-12-13 11:32:39 +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
朱金勇
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
chaideqing
9a2148a540 * fix xuanxuan 84's bug 2021-12-07 09:27:40 +08:00
hufangzhou
d876550d96 * Add the traditional Chinese language item. 2021-12-07 09:22:58 +08:00
qixinzhi
e4df2494bd * ellipsis long title for zentao card 2021-12-06 17:03:27 +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
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
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
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
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