Commit Graph
2167 Commits
Author SHA1 Message Date
daitingting 4e9109c5a7 * Finish task #72756. 2022-10-27 05:11:55 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
唐胡成 122a34b4a5 Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Fix bug #29016,#29006,#29020.

See merge request easycorp/zentaopms!5909
2022-10-27 03:19:48 +00:00
tanghucheng ae7589b5e4 * Fix bug #29016,#29006,#29020. 2022-10-27 10:44:59 +08:00
孙广明 7a4179a210 Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Finish task #73241.

See merge request easycorp/zentaopms!5889
2022-10-27 01:03:26 +00:00
wangyidong 14a17688cd * adjust for task #73474. 2022-10-27 08:58:11 +08:00
tanghucheng d96d6bb803 * Finish task #73234,73242. 2022-10-27 08:09:26 +08:00
Yagami 2f04710843 * Finish task #73233. 2022-10-26 15:41:53 +08:00
caoyanyi e2a8f5a0fe * Modify view page style. 2022-10-26 09:56:57 +08:00
wangyidong d6dc22d7e0 * adjust for scroll to selected. 2022-10-26 09:39:05 +08:00
孙广明 e24e771dee * Code for task #73233. 2022-10-26 09:27:33 +08:00
孙广明 faa094ca72 Merge branch 'tanghucheng_zentaopms_252' into 'zentaopms_252'
* Code for task #73235.

See merge request easycorp/zentaopms!5886
2022-10-25 08:38:19 +00:00
tanghucheng e06a98bd09 * Code for task #73235. 2022-10-25 16:26:10 +08:00
Yagami 1875b5be0e * Fix bug #73233. 2022-10-25 09:25:07 +08:00
Yagami c232ec7c7d * Code for task #73233. 2022-10-24 15:43:36 +08:00
wangyidong a1e6005851 * fix bug #72271. 2022-10-20 17:25:28 +08:00
wangyuting2 05f6ade106 * Finish task #71569. 2022-10-20 08:30:23 +00: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
daitingting 378c8309f5 * Finish task #71571. 2022-10-19 06:12:05 +00:00
wangzemei 68f702d9ef * fix 28395 28640 28406 2022-10-19 11:07:04 +08:00
daitingting 6948b02a8c * Finish task #71568. 2022-10-19 03:01:18 +00: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
tianshujie 875ac851b4 * Fix bug #28460. 2022-10-11 15:07:12 +08: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
王怡栋 b7ae9696e3 Merge branch 'zentaopms_239_task#71588' into 'zentaopms_239'
* Finish task #71588,#71589,#71590,#71591.

See merge request easycorp/zentaopms!5714
2022-10-10 09:24:04 +00: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
daitingting 1e7ad8f0f2 * Finish task #71588,#71589,#71590,#71591. 2022-10-10 08:22:50 +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
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
tianshujie 531f5d2cb8 * Finish task #71905. 2022-10-10 14:14:55 +08:00
wangyuting2 79aca158d8 * Finish task #71645. 2022-10-10 02:05:06 +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
曹延义 b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08:00
李玉春 ffc0440271 Merge branch 'zentaopms_239' into 'zentaopms_239_wangjianhua_70793'
# Conflicts:
#   module/project/lang/de.php
#   module/project/lang/en.php
#   module/project/lang/fr.php
#   module/project/lang/zh-cn.php
2022-10-09 02:25:26 +00:00
wangzemei ed225f525d * finish task #71878 2022-10-09 10:06:57 +08:00
dingyongliang 61a485590e * change nest toggle position. 2022-09-30 08:05:04 +00:00
wangjianhua 04702a6139 * Finish task #70792: link project without product to code repository. 2022-09-30 14:20:19 +08:00
wangyidong acc7774419 * adjust for manage members and products for no multiple project. 2022-09-30 13:23:22 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00