Commit Graph

397 Commits

Author SHA1 Message Date
wangyidong
9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi
dcdc7bd58a * Adjust code. 2022-11-07 13:49:12 +08:00
caoyanyi
e6cbdb8182 * Fix bug #28992. 2022-11-07 13:44:11 +08:00
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
caoyanyi
a82cc215ba * Optimize page style. 2022-10-25 14:53:46 +08:00
wangyidong
19feba7933 * fix for task #71610. 2022-10-11 16:09:53 +08:00
王怡栋
c943f77c80 Merge branch 'zentaopms_239' into 'zentaopms_239_task#71585'
# Conflicts:
#   module/testtask/model.php
2022-10-10 09:22:39 +00:00
wangyuting2
aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
daitingting
f8259297b7 * Finish task #71585,#71586,#71587. 2022-10-10 05:46:31 +00:00
wangyidong
d1f5709027 * code for task #71610. 2022-10-10 10:22:13 +08:00
wangyidong
d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
tianshujie
6f599fad75 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70008 2022-09-23 10:26:29 +08:00
tianshujie
65ce7cb599 * Finish task #70020. 2022-09-22 10:55:46 +08:00
tianshujie
a8bdc9bc6c * Finish task #70008. 2022-09-22 09:07:11 +08:00
liugang
cb9c662a97 * Use the product's name instead of the product's name if the product is a shadow one. 2022-09-20 17:50:07 +08:00
xieqiyu
5c3ff64ce7 * Code for task#67691. 2022-09-08 11:14:53 +08:00
xieqiyu
97b4bb9487 * Code for task#67691. 2022-09-08 11:03:44 +08:00
zhaoke
c01ea66816 - Remove test code. 2022-09-06 14:36:26 +08:00
zhaoke
9d5f645870 * Add do not change case title when submit unit result. 2022-09-06 14:34:20 +08:00
zhaoke
8dfd913f57 * Fix error when caseid is zero. 2022-08-31 14:32:09 +08:00
zhaoke
89c7aa1ffa * Do not change case auto when ci unit result. 2022-08-31 10:02:05 +08:00
zhaoke
c5f3a49071 * Add insert case result for unit ciresult. 2022-08-31 09:52:31 +08:00
liumengyi
ce47faa9cf * Finish task #65780. 2022-08-22 14:05:01 +08:00
王怡栋
eceac71915 Merge branch 'master_liuhong_25078' into 'master'
*Fix bug #25078

See merge request easycorp/zentaopms!4762
2022-08-04 02:01:25 +00:00
liuhong
3c0471a280 *Fix bug #25078*Fix bug #25078*Fix bug #25078*Fix bug #25078*Fix bug 2022-08-04 01:28:19 +00:00
liuhong
892cb2e6dc *Fix bug #25078 2022-08-04 00:18:17 +00:00
liuruogu
a28d225da9 * Finish task #63381. 2022-08-03 08:21:44 +00:00
liuhong
49ff270d97 *Fix bug #25078 2022-08-03 06:53:36 +00:00
daitingting
b834dc794f * Finish task #62919,#62923,#62924. 2022-08-02 07:43:12 +00:00
zenggang
4bd33b9cba * Adjust code 2022-07-27 01:53:26 +00:00
zenggang
7973da34a6 * Finish task#61964 2022-07-26 06:03:35 +00:00
zhouxudong
1e1ce39096 * Fix bug #24736 #24738 #24745 #24748 #24844 #24849. 2022-07-06 06:18:09 +00:00
zhouxudong
0b309f63bd * Finish task #59534 #59530 #59529. 2022-07-04 08:54:44 +00:00
tianshujie
32af972947 * Fix bug #24533. 2022-06-29 15:25:38 +08:00
tianshujie
1f185ff189 * Fix bug #24514. 2022-06-29 14:34:09 +08:00
tianshujie
f994051ea8 * Finish task #58552. 2022-06-28 12:16:11 +08:00
tianshujie
319d29e3d3 * Finish task #58552. 2022-06-28 09:06:38 +08:00
tianshujie
70b01098ac * Finish task #58552. 2022-06-27 17:22:49 +08:00
xieqiyu
d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +08:00
zhujinyong
c2bff85082 * Fix fail of ciresult. 2022-06-20 08:50:47 +08:00
孙广明
f09c614299 * Add comment. 2022-06-14 09:25:04 +08:00
孙广明
7c7a364102 * Finish task #56635. 2022-06-13 14:28:57 +08:00
孙广明
753a5e557a * Finish task #56635. 2022-06-13 11:11:01 +08:00
wangyidong
11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08:00
孙广明
b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明
b528156589 * Change license. 2022-06-08 09:34:46 +08:00
liyuchun
29ceb63023 * Fix bug #23132. 2022-06-02 02:49:27 +00:00
wangyidong
2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
王怡栋
276d1b2197 Merge branch 'sprint/189_package_lanzongjun' into 'sprint/189_package'
* fix bug #22570

See merge request easycorp/zentaopms!3477
2022-05-18 05:35:22 +00:00
lanzongjun
867152e2bc * fix bug #22570 2022-05-18 13:33:54 +08:00