Commit Graph
2792 Commits
Author SHA1 Message Date
朱金勇 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
孙广明 6085ad3089 Merge branch 'sprint/170_tianshujie_44496' into 'sprint/170'
*Finish task #44496

See merge request easycorp/zentaopms!511
2021-11-18 06:59:45 +00:00
songchenxuan 504e284d63 * Fix bug 16377. 2021-11-18 14:48:41 +08:00
songchenxuan 91c8826f45 * Fix bug 16377 2021-11-18 14:08:21 +08:00
songchenxuan 2df3d6aa39 * Fix bug 16377 2021-11-18 14:08:07 +08:00
zhengrunyu 0e51961266 *Finish task #16378. 2021-11-18 13:51:25 +08:00
tianshujie 5e473398be * Batch modify the judgment of the branch to which the bug belongs. 2021-11-18 13:49:04 +08:00
李玉春 e41ccac2b7 Merge branch 'sprint/170' into 'sprint/170_mayue_branch'
# Conflicts:
#   module/build/view/create.html.php
#   module/project/model.php
2021-11-18 05:15:10 +00:00
李玉春 8639b02e76 Merge branch 'sprint/170_songchenxuan_44490' into 'sprint/170'
Sprint/170 songchenxuan 44490

See merge request easycorp/zentaopms!501
2021-11-18 05:12:40 +00:00
王怡栋 3510f6ef63 * code for task #44321. 2021-11-18 11:20:39 +08:00
reneeteng 811d9ecae7 * Edit lang file for feedbackby interface. 2021-11-18 10:48:53 +08:00
xieqiyu 7d15430ab1 * Modify the review code. 2021-11-18 10:39:46 +08:00
mayue c9baf6fddd * Fix bug #16332. 2021-11-18 10:04:16 +08:00
王怡栋 fc50ece3e2 * code for task #44319. 2021-11-18 08:56:53 +08:00
xieqiyu 84340fa6f2 * Code for task#44497. 2021-11-17 22:57:30 +08:00
xieqiyu 47cdcd78c0 * Code for task#44497. 2021-11-17 19:30:13 +08:00
songchenxuan 59f3ac6661 * Finish task 44490 2021-11-17 17:42:10 +08:00
liumengyi dc807a53a5 * Fix bug #16390,#16388. 2021-11-17 17:29:08 +08:00
liumengyi 3e93ba664b * Fix bug #16390. 2021-11-17 16:33:42 +08:00
songchenxuan 8cd05d8301 * Finish task 44490. 2021-11-17 16:22:43 +08:00
songchenxuan 1dab48045e * Finish task 44490. 2021-11-17 15:39:30 +08:00
李玉春 851430dc48 Merge branch 'sprint/168_liumengyi_44369' into 'sprint/168'
* Finish task #44369.

See merge request easycorp/zentaopms!486
2021-11-17 07:21:54 +00:00
liumengyi 3f6bdc127b * Finish task #44369. 2021-11-17 15:20:28 +08:00
wangjianhua f0ee430add * Insert branch name into drop list of bug search form. 2021-11-17 07:18:27 +00:00
liumengyi 30204c1568 * Finish task #44369. 2021-11-17 14:39:37 +08:00
李玉春 293f76a1ed Merge branch 'sprint/170_songchenxuan_44601' into 'sprint/170'
* Fix bug 13756

See merge request easycorp/zentaopms!483
2021-11-17 05:25:38 +00:00