Commit Graph
1086 Commits
Author SHA1 Message Date
daitingting 90701e792b * Finish task #71573. 2022-10-20 07:53:20 +00:00
tianshujie 17ef65813e * Modify Kanban Settings page style issues. 2022-10-20 10:37:07 +08:00
daitingting 6750bed454 * Finish task #71572. 2022-10-20 01:41:01 +00:00
Yagami b4bdcd0ca3 Merge branch 'zentaopms_239' of https://gitlab.zcorp.cc/easycorp/zentaopms into 239 2022-10-19 15:36:28 +08:00
Yagami 187d3b8ca4 * Finish task #72674. 2022-10-19 15:36:15 +08:00
wangyuting2 5182cf2d42 * Finish task #72775. 2022-10-19 05:20:12 +00:00
Yagami c330b6bc06 * Finish task #72673. 2022-10-19 13:07:04 +08:00
Yagami 33bb2e6082 * Finish task #72672. 2022-10-19 10:47:30 +08:00
Yagami 6788ef5793 * Finish task #72671. 2022-10-19 09:23:59 +08:00
Yagami b99203caa6 * Finish task #72678. 2022-10-18 11:23:12 +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
wangyuting2 d1346511be * Finish task #72259 and bug #28498. 2022-10-17 07:37:21 +00:00
tianshujie 80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
liugang 657b36b3dc * Hide the link and unlink buttons if the execution is a none-product and single one. 2022-10-11 15:57:02 +08:00
sunguangming 587d8285d9 * Fix bug #28389. 2022-10-11 14:54:59 +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
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
liugang bedad1aab6 * Fix bug #28391. 2022-10-11 10:22:26 +08:00
liugang d808b28d2e * Hide the plan field on the linkStory page of the execution module. 2022-10-11 10:14:04 +08:00
liugang 3057b55576 * Fix bug #28392. 2022-10-11 10:13:36 +08:00
王怡栋 abcdde7ea3 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Fix systemMode bug.

See merge request easycorp/zentaopms!5710
2022-10-10 09:18:50 +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
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
liugang 4512eaf2b4 * Fix bug #27899. 2022-10-10 13:40:04 +08:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
曹延义 20a77c4811 * Modify language. 2022-10-10 11:05:49 +08:00
李玉春 7f1d674a73 Merge branch 'sprint/cyy_71876' into 'master'
Sprint/cyy 71876

See merge request easycorp/zentaopms!5683
2022-10-09 06:50:04 +00:00
曹延义 dc6b265503 * Adjust codes. 2022-10-09 14:48:37 +08:00
曹延义 b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08:00
王怡栋 1f68a6b1e7 Merge branch 'master_xieqiyu_26098' into 'master'
* Fix bug#26098.

See merge request easycorp/zentaopms!5658
2022-10-09 05:08:34 +00:00
曹延义 84e1f0295d * Code for task #71876. 2022-10-09 11:15:44 +08:00
曹延义 162c12800b * Finish task #71886. 2022-10-09 09:36:13 +08:00
sunguangming 7efbb7d6ca * Fix bug #28227. 2022-10-08 17:02:01 +08:00
xieqiyu 57dd6eb716 * Fix bug#26098. 2022-09-30 07:19:21 +00:00
liugang 1645dbd263 * Fix bug #27896,27898. 2022-09-30 13:48:12 +08:00
tianshujie 7e523df39b * Fix bug #28253. 2022-09-30 11:31:29 +08:00
李玉春 5e719e9a48 Merge branch 'sprint/wangzemei/28234' into 'master'
* fix bug 28234 & 28215

See merge request easycorp/zentaopms!5635
2022-09-30 01:29:10 +00:00
tianshujie ecdfcffa58 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70505 2022-09-30 09:18:19 +08:00
wangzemei 5c579dc137 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/28234 2022-09-30 09:09:10 +08:00
wangzemei 7c6d631ee8 * fix bug 28215 2022-09-30 09:08:42 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
李玉春 7d24a5ce0d Merge branch 'sprint/244_tianshujie_fixbug' into 'master'
Sprint/244 tianshujie fixbug

See merge request easycorp/zentaopms!5633
2022-09-30 00:58:12 +00:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tianshujie 750e7c41d0 * Fix bug #28161. 2022-09-30 08:48:51 +08:00
xieqiyu 45791d127b * Fix bug#27125. 2022-09-29 08:22:59 +00:00
sunguangming 4f58d80d64 * Hide bug plan in waterfall project. 2022-09-29 16:05:03 +08:00
tianshujie 01c194668b * Finish task #70505. 2022-09-29 15:59:43 +08:00