Commit Graph

25091 Commits

Author SHA1 Message Date
hufangzhou
c1f2dfd857 * Modify the module tree in project story. 2021-11-21 16:10:21 +08:00
李玉春
01bfb0629e Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170'
* fix bugs #16477,#16485 produced by task 44491.

See merge request easycorp/zentaopms!557
2021-11-19 09:30:35 +00:00
wangjianhua
fa32609ca0 * Fix bug #16477和#16485 2021-11-19 08:31:58 +00: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
tianshujie
3d09288eca * Modify the code. 2021-11-19 15:33:19 +08:00
李玉春
51e7f68851 Merge branch 'sprint/170_mayue_modify_style' into 'sprint/170'
* Modify style.

See merge request easycorp/zentaopms!555
2021-11-19 07:14:27 +00:00
mayue
2b258a7665 * Modify style. 2021-11-19 15:11:07 +08:00
mayue
9828fa18f0 * Modify style. 2021-11-19 14:59:56 +08:00
tianshujie
db6be58c1a * Modify batch create bug page. 2021-11-19 13:12:47 +08:00
tianshujie
256c76c0b8 * Modify code logic. 2021-11-19 11:40:58 +08:00
tianshujie
53a34f1546 * Modify the code. 2021-11-19 11:27:36 +08:00
tianshujie
3045b1a234 * Fix the scope of the products listed in the edit case. 2021-11-19 10:54:18 +08:00
李玉春
94f44c39c8 Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170'
* Fix an error for batch run testcase.

See merge request easycorp/zentaopms!549
2021-11-19 02:47:45 +00:00
xieqiyu
8b3198bb0a * Fix an error for batch run testcase. 2021-11-19 10:39:38 +08:00
孙广明
8ffbccc050 Merge branch 'sprint/170_songchenxuan_16411' into 'sprint/170'
* Fix bug 16411.

See merge request easycorp/zentaopms!546
2021-11-19 02:36:47 +00:00
songchenxuan
0a351a6280 * Fix bug 16411. 2021-11-19 10:32:37 +08:00
李玉春
7e24f57dad Merge branch 'sprint/170' into 'sprint/170_songchenxuan_16417'
# Conflicts:
#   module/testcase/control.php
2021-11-19 02:25:07 +00:00
songchenxuan
269633eb6d * Fix bug 16417. 2021-11-19 10:23:44 +08:00
songchenxuan
029c0e4dca * Fix bug 16411 2021-11-19 10:20:58 +08:00
songchenxuan
71a2ba3f3d * Fix bug 16411. 2021-11-19 10:11:37 +08:00
孙广明
ee477c808b Merge branch 'sprint/170_mayue_16407' into 'sprint/170'
* Fix bug #16407.

See merge request easycorp/zentaopms!543
2021-11-19 02:02:47 +00:00
mayue
926e2e853d * Fix bug #16407. 2021-11-19 09:59:01 +08:00
孙广明
08496ebe70 Merge branch 'sprint/170_zhengrunyu_BUG_16368' into 'sprint/170'
*Finish task #16368.

See merge request easycorp/zentaopms!541
2021-11-19 01:53:45 +00:00
zhengrunyu
b959253bdf *Finish task #16368. 2021-11-19 09:48:57 +08:00
李玉春
098a6e7a6a Merge branch 'sprint/170_mayue_16454' into 'sprint/170'
* Fix bug #16454.

See merge request easycorp/zentaopms!539
2021-11-19 01:42:11 +00:00
mayue
90e6d5d315 * Fix bug #16455. 2021-11-19 09:37:32 +08:00
tianshujie
f033e37924 * Modify the product range of a single creation use case. 2021-11-19 09:32:00 +08:00
mayue
1e6f05b4c8 * Fix bug #16454. 2021-11-19 09:25:33 +08:00
songchenxuan
5e49c845e6 * Fix bug 16417 2021-11-19 09:02:21 +08:00
李玉春
9143b15390 Merge branch 'sprint/173_xieqiyu_fixbug' into 'sprint/170'
* Fix bug: add loadLang.

See merge request easycorp/zentaopms!537
2021-11-19 00:54:51 +00:00
李玉春
b9d2f3783e Merge branch 'sprint/170_tianshujie_issue' into 'sprint/170'
* Fix execution and project linked product prompt issues.

See merge request easycorp/zentaopms!536
2021-11-19 00:47:09 +00:00
xieqiyu
8112a6e985 * Fix bug: add loadLang. 2021-11-19 08:45:26 +08:00
tianshujie
70f8e0d320 * Fix execution and project linked product prompt issues. 2021-11-19 08:44:53 +08:00
王怡栋
fde5cb61da Merge branch 'sprint/app10' into sprint/170 2021-11-19 08:41:00 +08:00
李玉春
68d5d5e903 Merge branch 'sprint/170_hufangzhou_16385' into 'sprint/170'
* Fix bug #16385 and fix an error.

See merge request easycorp/zentaopms!534
2021-11-19 00:35:13 +00:00
孙广明
92b7515069 Merge branch 'sprint/170_zhouxin_16408' into 'sprint/170'
Fix bug 16408.

See merge request easycorp/zentaopms!526
2021-11-19 00:33:29 +00:00
hufangzhou
4a07c2324f * Fix bug #16385 and fix an error. 2021-11-18 21:41:48 +08:00
李玉春
40b0b05a3e Merge branch 'sprint/170_mayue_16407' into 'sprint/170'
* Fix bug #16407.

See merge request easycorp/zentaopms!525
2021-11-18 09:33:43 +00:00
zhouxin
b8783ecd5c Fix bug 16408. 2021-11-18 17:32:02 +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
1d9fc9d476 * Fix bug #16407. 2021-11-18 17:26:27 +08:00
李玉春
8a1ab522bd Merge branch 'sprint/173_wangjianhua_44491' into 'sprint/170'
Finish task 44491. Load branch lang before using.

See merge request easycorp/zentaopms!532
2021-11-18 09:24:07 +00:00
mayue
bff4aebfd4 * Fix bug #16406. 2021-11-18 17:24:00 +08:00
李玉春
ba8ec26e96 Merge branch 'sprint/170_zhouxin_44486,44487,44488' into 'sprint/170'
Add realBegan for program.

See merge request easycorp/zentaopms!529
2021-11-18 09:21:25 +00:00
李玉春
7c9add376d Merge branch 'sprint/170_songchenxuan_16376' into 'sprint/170'
Sprint/170 songchenxuan 16376

See merge request easycorp/zentaopms!530
2021-11-18 09:20:35 +00: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
1e57264ff4 * finish task 44491. Load branch lang before using. 2021-11-18 09:16:07 +00:00
songchenxuan
f92a67b62a * Fix bug 16376 2021-11-18 17:09:42 +08:00
songchenxuan
1f9f382aa0 * Fix bug 16376 2021-11-18 17:06:44 +08:00
wangjianhua
e011da6fd2 - Finish task 44503. Remove usless variable. 2021-11-18 09:02:45 +00:00