Commit Graph
4318 Commits
Author SHA1 Message Date
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
王怡栋 74a41448dc * add lang for mobile api. 2021-11-23 09:35:16 +08:00
hufangzhou 6d03387d4b * Add the new version. 2021-11-22 16:48:28 +08:00
王怡栋 6b32de5910 Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168'
* fix scroll bar css invalid after merge

See merge request easycorp/zentaopms!582
2021-11-22 08:15:47 +00:00
liyuchun 5dc23ad4f2 * Adjust create bug view. 2021-11-22 14:48:33 +08:00
孙广明 d3c2f014fe Merge branch 'sprint/170_zhengrunyu_16529' into 'sprint/170'
*Finish task #16529.

See merge request easycorp/zentaopms!584
2021-11-22 06:41:02 +00:00
zhengrunyu 1a9175f485 *Finish task #16529. 2021-11-22 14:36:56 +08:00
tianshujie 8f1a017225 * Modify the code. 2021-11-22 14:14:17 +08:00
tianshujie 4058eae297 * Change parameters. 2021-11-22 13:52:19 +08:00
qixinzhi f5d89fee3d * fix scroll bar css invalid after merge 2021-11-22 13:51:27 +08:00
tianshujie 69842996d6 * Fix bug #16533. 2021-11-22 13:45:44 +08:00
liyuchun da47c729d9 * Adjust execution button name. 2021-11-22 13:36:52 +08:00
李玉春 d272f1e392 Merge branch 'sprint/173_xieqiyu_16479' into 'sprint/170'
* Fix bug#16479.

See merge request easycorp/zentaopms!564
2021-11-22 05:04:14 +00:00
李玉春 2e37a3b27c Merge branch 'sprint/170_songchenxuan_16508' into 'sprint/170'
Sprint/170 songchenxuan 16508

See merge request easycorp/zentaopms!569
2021-11-22 03:51:26 +00:00
tianshujie a1c59d2ca0 * Fix bug #16528. 2021-11-22 11:23:09 +08:00
xieqiyu 13ae5b4d9a * Code for task#44503. 2021-11-22 11:16:48 +08:00
songchenxuan 318be4d78b * Fix bug 16508 2021-11-22 11:00:07 +08:00
songchenxuan ab5c52c902 * Fix bug 16508 2021-11-22 10:59:11 +08:00
liumengyi 3836941efd * Fix Bug #16505. 2021-11-22 10:26:45 +08:00
孙广明 11f2c39369 Merge branch 'sprint/172_liyuchun_bug' into 'sprint/168'
Sprint/172 liyuchun bug

See merge request easycorp/zentaopms!561
2021-11-22 01:13:44 +00:00
liyuchun f943413c6d * Adjust style. 2021-11-22 09:12:08 +08:00
李玉春 8e7c536a8d Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
Modify the branch scope when creating and editing bugs.

See merge request easycorp/zentaopms!560
2021-11-22 01:00:45 +00:00
tianshujie 46ac0a5e88 * Modify the code. 2021-11-22 08:59:40 +08:00
文睿 李 36c7fc5a94 Merge branch 'sprint/168' into 'sprint/168_chaideqing_44635'
# Conflicts:
#   module/bug/css/x.view.css
2021-11-22 00:23:13 +00:00
朱金勇 b3762e84aa Merge branch 'sprint/168_qixinzhi_44632' into 'sprint/168'
* beautify scroll bar for task/bug/story card

See merge request easycorp/zentaopms!519
2021-11-22 00:14:33 +00:00
tianshujie 0408f2f8ce * Modify the execution scope of creating and editing bugs. 2021-11-21 10:46:35 +08:00
xieqiyu d91735a9b2 * Fix bug#16465. 2021-11-21 02:13:19 +08:00
tianshujie 47a651b599 * Deal with the scope of the product when creating and editing bugs. 2021-11-19 19:21:34 +08:00
chaideqing be154ba960 * refactor 2021-11-19 16:12:10 +08:00
李玉春 214f0a767e Merge branch 'sprint/170' into 'sprint/170_tianshujie_issue'
# Conflicts:
#   module/testcase/control.php
#   module/testcase/view/create.html.php
2021-11-19 07:36:48 +00:00
liyuchun d185d6db49 * Fix bug #16380,#16387. 2021-11-19 15:13:34 +08:00
tianshujie db6be58c1a * Modify batch create bug page. 2021-11-19 13:12:47 +08:00
chaideqing e792607430 * task #44635, optimize bug card in xuanxuan 2021-11-19 10:04:30 +08:00
王怡栋 fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
liyuchun d188fbd7b8 * Fix bug #16389,#16387. 2021-11-18 22:54:48 +08:00
李玉春 dc8dc55534 Merge branch 'sprint/170_mayue_16406' into 'sprint/170'
* Fix bug #16406.

See merge request easycorp/zentaopms!528
2021-11-18 09:29:29 +00:00
mayue bff4aebfd4 * Fix bug #16406. 2021-11-18 17:24:00 +08:00
李玉春 36e39591be Merge branch 'sprint/173_wangjianhua_44503' into 'sprint/170'
* finish task 44503

See merge request easycorp/zentaopms!516
2021-11-18 09:19:19 +00:00
wangjianhua e011da6fd2 - Finish task 44503. Remove usless variable. 2021-11-18 09:02:45 +00:00
mayue 3a48a57047 * Fix bug #16406. 2021-11-18 16:42:27 +08:00
tianshujie 9c6c4dfc9c * Fix bug #16429. 2021-11-18 16:30:45 +08:00
王怡栋 75b3876193 * adjust for bug changed status. 2021-11-18 15:47:54 +08:00
李玉春 644abad1fb Merge branch 'sprint/170_tianshujie_16431' into 'sprint/170'
* Fix bug #16431.

See merge request easycorp/zentaopms!523
2021-11-18 07:37:37 +00:00
tianshujie 662a1960f5 * Fix bug #16431. 2021-11-18 15:35:54 +08:00
reneeteng 8c15de95c5 * Edit lang for feedbackby. 2021-11-18 15:21:56 +08:00
qixinzhi e502f80728 * beautify scroll bar for task/bug/story card 2021-11-18 15:13:17 +08:00
李玉春 12b6f58053 Merge branch 'sprint/170_songchenxuan_16377' into 'sprint/170'
Sprint/170 songchenxuan 16377

See merge request easycorp/zentaopms!514
2021-11-18 07:06:26 +00:00
songchenxuan 073deec215 * Fix bug 16377 2021-11-18 15:05:56 +08:00
李玉春 c4e9dc5a4e Merge branch 'sprint/170_zhengrunyu_BUG_16378' into 'sprint/170'
*Finish task #16378.

See merge request easycorp/zentaopms!512
2021-11-18 07:03:43 +00:00