Commit Graph
131 Commits
Author SHA1 Message Date
tanghucheng 8f20075c51 * Fix bug #30282. 2022-11-25 16:12:51 +08:00
tanghucheng e09a070318 * Merge branch 'master' into transfer. 2022-11-09 15:44:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
xieqiyu 3056c3d98b * Fix bug#29356,#29168. 2022-11-07 06:35:17 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
Yagami d0abde8930 * Code for zentaopms_250 bug. 2022-10-21 17:31:32 +08:00
曹延义 95cb77cbd5 * Modify line width. 2022-10-12 15:39:54 +08:00
曹延义 a64f141e7b * Modify story page style. 2022-10-12 15:36:05 +08:00
tianshujie 259abfd8b7 Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_70015 2022-09-26 10:48:15 +08:00
wangzemei 20ccc81a8a * fix bug 27863 2022-09-23 10:52:47 +08:00
王怡栋 d2ae5b0e55 Merge branch 'sprint/wangzemei/27809' into 'master'
* fix bug 27809

See merge request easycorp/zentaopms!5492
2022-09-23 02:01:14 +00:00
wangzemei aa3c858053 * fix bug 27814 about reviewedBy width 2022-09-22 17:35:43 +08:00
wangzemei a1356bb29a * fix bug 27809 2022-09-22 17:24:58 +08:00
tianshujie 26a21964f8 * Finish task #70015. 2022-09-21 15:02:17 +08:00
wangzemei 57d8bc7cfd * modify about task #68933 2022-09-14 08:46:13 +00:00
wangzemei 95e6b99345 * task #68933 2022-09-14 06:44:17 +00:00
xieqiyu 9dedf90d27 * Fix bug#27276,#27280. 2022-09-06 14:20:39 +08:00
王怡栋 e1b02d65f8 Merge branch 'sprint/235_tianshujie_bug' into 'master'
Sprint/235 tianshujie bug

See merge request easycorp/zentaopms!5238
2022-09-01 05:45:30 +00:00
tianshujie f0ab716d29 * Fix bug #25848. 2022-09-01 13:22:52 +08:00
xieqiyu d552aa67f9 * Code for task#66955. 2022-09-01 10:47:58 +08:00
xieqiyu 3796dd0e47 * Fix bug#26785. 2022-08-24 18:48:19 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
tanghucheng 935cb51b5b * Fix bug for port showimport. 2022-08-14 13:14:48 +08:00
tanghucheng e91597d3e0 * Code for port. 2022-08-12 17:27:58 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
tanghucheng 3a72c09b5c * Code for port. 2022-08-12 00:34:10 +08:00
tanghucheng ff0ee876f0 * Code for port. 2022-08-11 15:36:26 +08:00
tianshujie 5556829158 * Fix bug #26237. 2022-08-10 16:10:41 +08:00
tanghucheng 851af309cb * Code for port. 2022-08-08 23:26:34 +08:00
tanghucheng 4a418ef9c7 * Code for story. 2022-08-01 17:03:23 +08:00
tanghucheng 96cef1ccfc * Code for bug export. 2022-07-25 09:23:26 +08:00
tanghucheng a12e616202 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-22 14:18:04 +08:00
孙广明 22230645dd * Fix bug #25627. 2022-07-22 13:07:49 +08:00
tanghucheng 05c0195520 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-15 16:04:55 +08:00
tianshujie 0c51ca4328 * Fix bug #25186. 2022-07-14 17:04:57 +08:00
tanghucheng c22da9fe5b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-13 22:55:21 +08:00
tianshujie 43507b65af * Fix bug #25186. 2022-07-13 14:48:10 +08:00
tanghucheng 39b0ffe0f3 * Code for export story. 2022-07-10 21:15:17 +08:00
zhouxin bc803e56c8 * Finish task #55676. 2022-06-01 07:34:04 +00:00
hufangzhou 331e31c911 * Fix bug #22672. 2022-05-19 15:43:38 +08:00
李玉春 9405f7bf71 Merge branch 'sprint/185' into 'sprint/185_zhengrunyu_49283'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/story.html.php
2022-02-23 01:33:37 +00:00
zhangzilong 4e84e5cbd7 * Finish task #49284. 2022-02-17 17:35:11 +08:00
zhengrunyu aa444513d6 * Finish task 49283. 2022-02-17 16:13:24 +08:00
孙华伟 df27f7e149 *Fix bug #19367 #19239. 2022-02-11 10:49:02 +08:00
孙广明 c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
liyuchun a240c9aa23 * Fix bug #16426,#16393. 2021-11-18 23:17:15 +08:00
liyuchun ee073e0530 * Finish task #44366. 2021-11-17 10:44:15 +08:00
songchenxuan 1079ebaec1 * Finish task 44492 2021-11-16 14:46:02 +08:00
songchenxuan 225d83b304 * Fix bug #16186. 2021-11-12 14:29:25 +08:00
hufangzhou 85ad745929 * Add the recall in project story list, add the review and recall in execution story list. 2021-09-06 13:06:33 +08:00