Commit Graph

2584 Commits

Author SHA1 Message Date
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
王怡栋
7091037194 Merge branch 'sprint/175_sgm_upgrade' into 'master'
Sprint/175 sgm upgrade

See merge request easycorp/zentaopms!786
2021-12-06 07:14:51 +00:00
孙广明
69304124b5 * Change for upgrade. 2021-12-06 10:58:52 +08:00
songchenxuan
417c625c84 *Fix bug #17109. 2021-12-06 10:02:17 +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
zhujinyong
5f3b5817c9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-05 23:51:59 +08:00
zhujinyong
f6d7234156 * Fix bugs of api. 2021-12-05 23:51:27 +08:00
xieqiyu
a944ec7ccd * Fix bug#17075. 2021-12-03 14:46:12 +08:00
tanghucheng
be4c1f3041 * Merge programplan into stage. 2021-12-03 14:31:47 +08:00
孙广明
669e66e39d Merge branch 'sprint/175_liumengyi_17031' into 'master'
* Fix bug #17031,#17029.

See merge request easycorp/zentaopms!752
2021-12-02 08:44:20 +00:00
liumengyi
cbf1fe21ac * Remove empty lines. 2021-12-02 16:16:03 +08:00
liumengyi
9d7cd3b29e * Fix bug #17031,#17029. 2021-12-02 16:08:17 +08:00
李玉春
befdfa2eb4 Merge branch 'sprint/174_tianshujie_16927' into 'master'
* Fix bug #16927.

See merge request easycorp/zentaopms!730
2021-12-02 07:39:36 +00:00
Wenrui LI
24440ff526 * replace link title text with lang items. 2021-12-02 15:30:31 +08:00
Wenrui LI
fac5fc6b22 * remove console.log. 2021-12-02 15:22:12 +08:00
Wenrui LI
3898d35852 * fix unable to click on pager links in cards. 2021-12-02 15:00:18 +08:00
chaideqing
57b31c8612 * modify card style when in xuanxuan notice 2021-12-02 14:56:05 +08:00
李玉春
7bcbab370a Merge branch 'sprint/174_songchenxuan_16872' into 'master'
* Fix bug #16872.

See merge request easycorp/zentaopms!735
2021-12-02 05:08:27 +00:00
songchenxuan
febde653ad * Fix bug #16872. 2021-12-02 13:06:03 +08:00
tianshujie
565ef0adbb * Fix bug #16927. 2021-12-02 11:27:24 +08:00
qixinzhi
e70a9157d2 * fix different screen scale cause element display different,use scroll bar 2021-12-02 11:08:41 +08:00
tianshujie
4ac099088e * Fix bug #16927. 2021-12-02 11:01:06 +08:00
tianshujie
a5598ddf64 * Fix bug #16897. 2021-12-02 10:04:02 +08:00
mayue
07f8a820b0 * Code format #16987. 2021-12-02 09:28:02 +08:00
mayue
63d4d3dad8 * Fix bug #16987. 2021-12-02 09:20:37 +08:00
liyuchun
f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
chaideqing
45e127be6e * add linkButton tips in card and card do not show cross scroll 2021-12-01 14:59:33 +08:00
liyuchun
c8c954a3fd * Fix bug #16911. 2021-12-01 13:53:13 +08:00
李玉春
686d773f0b Merge branch 'sprint/174_mayue_44987,44988,44989' into 'master'
* Finish task #44987,44988,44989.

See merge request easycorp/zentaopms!692
2021-12-01 05:23:47 +00:00
李玉春
950c567912 Merge branch 'sprint/174_xieqiyu_45079' into 'master'
Finish task #44992, task #44991, task #44990.

See merge request easycorp/zentaopms!687
2021-12-01 05:23:04 +00:00
songchenxuan
1261ac3edb * Fix bug #16953. 2021-12-01 11:11:11 +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
songchenxuan
1bb80cb5b3 * Fix bug #16953. 2021-12-01 11:02:31 +08:00
mayue
c62d599292 * Finish task #44987,44988,44989. 2021-12-01 10:44:38 +08:00
chaideqing
de1a9ddd9b Merge branch 'sprint/168' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/168_chaideqing_44857 2021-12-01 10:35:47 +08:00
hufangzhou
c04947228f * Finish task #44992, task #44991, task #44990. 2021-12-01 10:02:46 +08:00
xieqiyu
d0afac5593 * Fix bug for batch edit story and bug in project. 2021-11-30 17:10:12 +08:00
李玉春
dbc186a0c4 Merge branch 'master' into 'sprint/174_xieqiyu_45080'
# Conflicts:
#   module/story/control.php
#   module/story/view/header.html.php
#   module/testcase/control.php
2021-11-30 07:44:47 +00:00
xieqiyu
888fbfe73b * Code for task#45080. 2021-11-30 15:05:16 +08:00
李玉春
a4426db6f0 Merge branch 'sprint/174_tianshujie_45081' into 'master'
* Fix bug #16939 and modify the scope of the plan when editing bugs.

See merge request easycorp/zentaopms!672
2021-11-30 06:45:48 +00:00
tianshujie
03cb9122ef * Adjust code style of bug module. 2021-11-30 14:44:48 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
tianshujie
508d7d78bf * Fix bug #16939 and modify the scope of the plan when editing bugs. 2021-11-30 14:14:14 +08:00
孙广明
801c9ce3d0 Merge branch 'sprint/169' into sprint/168 2021-11-30 13:47:05 +08:00
孙广明
e752382609 * Remove unused code. 2021-11-30 11:30:50 +08:00
李玉春
adb7b76f3c Merge branch 'sprint/174_songchenxuan_45049' into 'master'
Sprint/174 songchenxuan 45049

See merge request easycorp/zentaopms!643
2021-11-30 03:19:07 +00:00
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
tianshujie
7e225ce3f7 * Finish task #45081,45012. 2021-11-30 09:18:05 +08:00
songchenxuan
d19f60d9df * Finish task 45049. 2021-11-30 08:57:36 +08:00