Commit Graph
2624 Commits
Author SHA1 Message Date
王怡栋 af1c82ddb1 Merge branch 'master_bug_28949' into 'master'
*Fix bug #28949.

See merge request easycorp/zentaopms!5925
2022-10-28 03:27:38 +00:00
caoyanyi 542ca7e7f0 * Fix bug #29079. 2022-10-28 09:48:29 +08:00
liuhong 8878cbf8b7 *Fix bug #28949. 2022-10-28 01:48:01 +00:00
caoyanyi 6c7e3e0253 * Modify project and execution view page style. 2022-10-28 09:31:09 +08:00
caoyanyi 269f5ab078 * Modify kanban page style. 2022-10-28 09:25:15 +08:00
caoyanyi 6f07a5aa0c * Modify kanban page pri style. 2022-10-28 09:23:20 +08:00
caoyanyi 6947be51e0 * Fix bug #28996. 2022-10-28 09:01:50 +08:00
孙广明 34c04a63e1 Merge branch 'mayue_feedback#1025' into 'master'
* Finish feedback #1025.

See merge request easycorp/zentaopms!5905
2022-10-27 02:32:18 +00:00
tianshujie a72173cd72 * Finish task #73752. 2022-10-26 15:49:13 +08:00
tianshujie 935faa00bd * Finish task #73752. 2022-10-26 14:01:04 +08:00
tianshujie 308a8b9f5e * Finish task #73750. 2022-10-26 13:15:38 +08:00
mayue b9a782d943 * Finish feedback #1025. 2022-10-25 17:02:57 +08:00
Hao Sun d9c98da06c * increase baseline accuracy for burn chart. 2022-10-25 14:53:46 +08:00
Hao Sun 2c09fb7951 * fix burn chart precision 2022-10-25 14:53:46 +08:00
caoyanyi 3867eb0f55 * Code for execution #3238. 2022-10-24 16:56:27 +08:00
Hao Sun ec454fb5ce * increase baseline accuracy for burn chart. 2022-10-22 13:57:28 +00:00
Hao Sun b8923acf1d * fix burn chart precision 2022-10-22 13:54:40 +00:00
王怡栋 b39c666128 Merge branch 'bug_28795' into 'master'
Bug 28795

See merge request easycorp/zentaopms!5858
2022-10-21 07:59:10 +00:00
曾刚 d2771a1dea Bug 28795 2022-10-21 07:59:09 +00:00
liuhong bb47c6e1da * Fix bug #28775. 2022-10-21 05:22:05 +00:00
tianshujie f107a95ba2 * Fix bug #28706. 2022-10-20 10:55:31 +08:00
tianshujie 17ef65813e * Modify Kanban Settings page style issues. 2022-10-20 10:37:07 +08:00
王怡栋 5bed328848 Merge branch 'master_feedback_1133' into 'master'
* Adjust code format.

See merge request easycorp/zentaopms!5815
2022-10-20 00:30:53 +00:00
liuhong f756b892d6 * Adjust code format. 2022-10-19 12:53:54 +00:00
tianshujie 80f9e9ab61 * Fix bug #28499. 2022-10-19 15:34:54 +08:00
liuhong a7765cfae8 * Adjust the code format. 2022-10-19 06:13:35 +00:00
liuhong db48df1bb5 *Fix feedback #1133 for waterfall project choose stagefilteri with Related pages. 2022-10-19 05:09:01 +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
wangzemei 478bbcc87c * Fix bug #28447 2022-10-14 17:21:37 +08:00
王怡栋 af516229bb Merge branch 'bug_28518' into 'master'
* Fix bug#28518

See merge request easycorp/zentaopms!5749
2022-10-14 04:17:35 +00: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
zenggang c7086c8d77 * Fix bug#28518 2022-10-13 07:50:54 +00:00
guofeilong c46cf29a2c * fix bug * 28499 2022-10-12 07:52:09 +00:00
wangzemei 01a12c95d9 * fix bug #283950 2022-10-11 16:42:59 +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 740e144707 * fix bug 28388 && 28395 2022-10-11 14:05:33 +08:00
tianshujie 202be34c31 * Finish task #71888. 2022-10-11 13:50:58 +08:00
wangzemei b14dd4c6ed * fix 28426 2022-10-11 12:11:22 +08:00
曹延义 8f73e4d340 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/gfl_71875 2022-10-11 08:36:05 +08:00
guofeilong 3d563b958b * finish task 71875 2022-10-10 09:21:54 +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
曹延义 68274e57c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/cyy_71903 2022-10-10 16:35:45 +08:00
tianshujie ff6c9221cb * Finish task #71904. 2022-10-10 16:14:45 +08:00
李玉春 333f75d6dc Merge branch 'sprint/cyy_71874' into 'master'
Sprint/cyy 71874

See merge request easycorp/zentaopms!5703
2022-10-10 08:09:39 +00:00
曹延义 0bff4d85fd * Fix bug #28360. 2022-10-10 15:49:57 +08:00