Commit Graph
4530 Commits
Author SHA1 Message Date
tianshujie 6ba9f6a195 * Fix bug #28706. 2022-10-20 11:02:11 +08:00
tianshujie f107a95ba2 * Fix bug #28706. 2022-10-20 10:55:31 +08:00
Yagami 8b41edadbf * Show create testreport btn in waterfall project. 2022-10-20 10:11:09 +08:00
tianshujie 80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
wangzemei 68f702d9ef * fix 28395 28640 28406 2022-10-19 11:07:04 +08:00
李玉春 bb90adf795 Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug

See merge request easycorp/zentaopms!5759
2022-10-17 09:24:39 +00:00
tianshujie 4245745bec * Finish task #72351. 2022-10-17 16:31:40 +08:00
tianshujie 80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
王怡栋 edf6de9fe9 Merge branch 'sprint/gfl_28499' into 'master'
* fix bug * 28499

See merge request easycorp/zentaopms!5741
2022-10-14 00:39:49 +00:00
guofeilong c46cf29a2c * fix bug * 28499 2022-10-12 07:52:09 +00:00
曹延义 704de9685b * Modify stage list data. 2022-10-12 13:16:40 +08:00
曹延义 196af666e7 Merge branch 'master' into cyy_optimize 2022-10-11 16:47:49 +08:00
曹延义 e7391836f7 Merge branch 'master' into cyy_optimize 2022-10-11 16:44:23 +08:00
王怡栋 b59b3babbd Merge branch 'master_xieqiyu_fixbug' into 'master'
Master xieqiyu fixbug

See merge request easycorp/zentaopms!5728
2022-10-11 08:25:44 +00:00
xieqiyu 8f8349b76f * Fix bug#28296. 2022-10-11 14:57:05 +00:00
曹延义 9287efdd8a * Modify acl radio style. 2022-10-11 15:51:34 +08:00
tianshujie 875ac851b4 * Fix bug #28460. 2022-10-11 15:07:12 +08:00
tianshujie 0b49c19866 * Fix bug #28451. 2022-10-11 14:53:01 +08:00
李玉春 bd488328ab Merge branch 'sprint/gfl_71875' into 'master'
* finish task 71875

See merge request easycorp/zentaopms!5716
2022-10-11 06:52:12 +00:00
李玉春 30238c658f Merge branch 'sprint/247_tianshujie_71888' into 'master'
Sprint/247 tianshujie 71888

See merge request easycorp/zentaopms!5723
2022-10-11 06:51:55 +00:00
wangzemei e31a9c3a01 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_28406 2022-10-11 14:44:04 +08:00
tianshujie 65d21e59b6 Delete unnecessary Spaces. 2022-10-11 13:49:39 +08:00
tianshujie 8973962e24 * Finish task #71888. 2022-10-11 13:28:02 +08:00
tianshujie 647859b82c * Fix project list error. 2022-10-11 13:10:18 +08:00
wangzemei b37f3e8d42 * fix bug 28416 2022-10-11 10:32:35 +08:00
曹延义 bb688e7e49 * Code for task #72179. 2022-10-11 08:52:16 +08:00
李玉春 6a5148bbe8 Merge branch 'sprint/247_tianshujie_71905' into 'master'
Sprint/247 tianshujie 71905

See merge request easycorp/zentaopms!5713
2022-10-10 09:16:37 +00:00
李玉春 923718371a Merge branch 'sprint/cyy_71903' into 'master'
* Finish task #71903.

See merge request easycorp/zentaopms!5707
2022-10-10 08:44:41 +00:00
田淑杰 f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css
2022-10-10 08:43:18 +00:00
tianshujie ff6c9221cb * Finish task #71904. 2022-10-10 16:14:45 +08:00
曹延义 0bff4d85fd * Fix bug #28360. 2022-10-10 15:49:57 +08:00
tianshujie 531f5d2cb8 * Finish task #71905. 2022-10-10 14:14:55 +08:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
wangzemei 209e38775d * rm class 2022-10-10 09:32:56 +08:00
李玉春 635693bef4 Merge branch 'sprint/244_wzm_70007' into 'master'
* finish task 70007 & 71896

See merge request easycorp/zentaopms!5689
2022-10-10 00:56:52 +00:00
wangzemei f0c3b79018 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247_wzm_71878 2022-10-09 15:42:16 +08:00
wangzemei 4a656cf175 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-09 15:19:48 +08:00
曹延义 dc6b265503 * Adjust codes. 2022-10-09 14:48:37 +08:00
曹延义 b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08:00
wangzemei ed225f525d * finish task #71878 2022-10-09 10:06:57 +08:00
wangzemei 8d0988d465 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-09 09:43:24 +08:00
wangzemei ca3a61f605 * finish task 71896 2022-10-09 09:42:29 +08:00
曹延义 4b219ab7b1 * Reset page style. 2022-10-08 16:59:02 +08:00
wangzemei 8f02d62c13 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wzm_70007 2022-10-08 16:56:49 +08:00
liyuchun fbb492f4a5 Merge branch 'sprint/244_dyl_70022' 2022-10-08 10:56:08 +08:00
曹延义 80e9e163e7 * Fix bug #28181. 2022-10-08 10:14:54 +08:00
dingyongliang 61a485590e * change nest toggle position. 2022-09-30 08:05:04 +00:00
wangzemei eae74e50fd * modify project execution table style 2022-09-30 15:26:21 +08:00
曹延义 b228a66aca * Modify project style. 2022-09-30 13:42:28 +08:00
曹延义 3911275e4f * Modify click style. 2022-09-30 13:36:56 +08:00