Commit Graph

2954 Commits

Author SHA1 Message Date
朱金勇
f2b5b5cd42 Merge branch 'fix/typo' into 'master'
* Fix typo.

See merge request easycorp/zentaopms!6779
2023-01-31 05:59:58 +00:00
liuhong
40ca0b3f77 * Adjust code logic for 30389. 2023-01-31 01:38:33 +00:00
王怡栋
5ce0bb3c97 Merge branch 'master_bug_30389' into 'master'
* Fix bug #30389 :if delete execution directly the execute is empty.

See merge request easycorp/zentaopms!6793
2023-01-29 08:49:21 +00:00
liuhong
3a2ef158b5 * Fix bug #30389 :if delete execution directly the execute is empty. 2023-01-29 08:00:24 +00:00
王怡栋
87480efae9 Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6791
2023-01-29 07:28:22 +00:00
王怡栋
3a2c5a4b00 Merge branch 'sprint/tsj_uinttest' into 'master'
* Add test case and remove unused function.

See merge request easycorp/zentaopms!6788
2023-01-29 06:37:57 +00:00
caoyanyi
152ec6b49c * Add test case and remove unused function. 2023-01-29 13:58:40 +08:00
王怡栋
3ed4d5d692 Merge branch 'zenops_46' into 'master'
Merge branch zenops_46 into  'master'

See merge request easycorp/zentaopms!6784
2023-01-29 05:07:38 +00:00
tianshujie
f08ba04142 * Fix bug #23550. 2023-01-29 12:05:13 +08:00
caoyanyi
97506ed3c1 * Add test case. 2023-01-29 11:27:22 +08:00
tanghucheng
ed313382c1 * Fix bug #31490. 2023-01-29 10:12:46 +08:00
xieqiyu
62215c84b0 * Fix bug#30264. 2023-01-18 17:08:31 +08:00
Lufei
6beeb45da4 * Fix typo. 2023-01-18 16:42:02 +08:00
xieqiyu
9644dd5206 * Fix bug#31693. 2023-01-17 11:01:22 +08:00
caoyanyi
5035c4a462 * Add test case and modify function name. 2023-01-13 14:11:01 +08:00
caoyanyi
c1fa0b85fe Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tsj_uinttest 2023-01-13 10:56:17 +08:00
xieqiyu
584c57e313 * Fix bug#31345. 2023-01-12 16:15:57 +08:00
xieqiyu
9dd04c346f * Fix bug#31502. 2023-01-12 15:26:00 +08:00
caoyanyi
7b0dd36f82 * Add test case. 2023-01-12 10:06:45 +08:00
Yagami
e9f88d3cbd * Fix code error. 2023-01-05 13:59:41 +08:00
田淑杰
624ac45620 * Fix bug #31439. 2023-01-04 15:20:35 +08:00
田淑杰
289005c41a * Fix bug #31439. 2023-01-04 15:11:54 +08:00
wangzemei
4f2b9530d0 * fix kanban css 2023-01-03 15:59:18 +08:00
wangzemei
c70d4da58a * fix css of kanban 2023-01-03 15:39:49 +08:00
孙广明
c29776bbfe Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug

See merge request easycorp/zentaopms!6667
2023-01-03 05:54:09 +00:00
tianshujie
5576aaa048 * Fix bug #30396. 2023-01-03 08:58:06 +08:00
caoyanyi
39a6706815 * Fix bug #29478. 2023-01-03 08:46:41 +08:00
wangyidong
be81b08952 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-12-30 14:48:49 +08:00
孙广明
b34e312e86 * Fix bug #31353. 2022-12-30 14:18:50 +08:00
曾刚
c6cfa19dd9 Merge branch 'master' into 'feedback_1796'
# Conflicts:
#   module/testcase/js/browse.js
2022-12-30 05:45:51 +00:00
孔令茂
69a916745a * Resolved feedback #1865, create project error when chose no sprint type and multiple product's main branch. 2022-12-30 05:29:10 +00:00
zenggang
3e1c744945 * Resolve feedback#1796 2022-12-30 02:12:57 +00:00
田淑杰
b790198243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-30 08:46:01 +08:00
孙广明
137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
田淑杰
866b4086e8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-29 15:22:13 +08:00
xieqiyu
2664a0c85e * Finish task#81190. 2022-12-27 13:49:08 +08:00
wangyidong
489d7aa695 * fix bug save lastExecution. 2022-12-26 16:21:09 +08:00
田淑杰
db2851ceae * Fix bug #28021. 2022-12-26 09:54:51 +08:00
liugang
8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
宋辰轩
c0933cea53 * Fix execution view burn. 2022-12-23 10:57:52 +08:00
宋辰轩
c0f84b7f29 * Modify burn chart . 2022-12-23 10:49:21 +08:00
Lufei
c3244b958f * Fix search style error in execution view page. 2022-12-19 16:36:14 +08:00
xieqiyu
fa65b4a6e0 * Code for task#79440. 2022-12-15 13:43:08 +08:00
孙广明
9648b48513 * Finish task #79457. 2022-12-14 09:45:36 +08:00
lanzongjun
0a492b61fa Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-13 09:08:08 +08:00
lanzongjun
6da0c6ea01 * Finish Task #79670 2022-12-13 09:06:53 +08:00
lanzongjun
d2cb9938b5 * Finish Task #79670 2022-12-12 17:34:43 +08:00
Yagami
27b73d7dcd * Code for function review. 2022-12-12 16:16:51 +08:00
Yagami
92ba115642 * Finish task #79460. 2022-12-12 15:57:05 +08:00
Yagami
8a5d1a8e04 * Finish task #79461. 2022-12-12 15:22:45 +08:00