Commit Graph
897 Commits
Author SHA1 Message Date
王怡栋 705025b96c Merge branch 'sprint/231_zg_bugs' into 'master'
* Fix sprint231 bugs

See merge request easycorp/zentaopms!5145
2022-08-26 05:13:01 +00:00
王怡栋 eaa366c64a Merge branch 'master_liuhong_66232' into 'master'
Fix bug #66232.

See merge request easycorp/zentaopms!5144
2022-08-26 05:11:51 +00:00
zenggang 494474d349 * Fix sprint231 bugs 2022-08-26 05:10:26 +00:00
liuhong 04611bb5cc Fix bug #66232. 2022-08-26 03:31:58 +00:00
zenggang cf0be65b70 * Adjust code 2022-08-26 01:25:14 +00:00
zenggang bf24ce64fd * Fix sprint/231 issues 2022-08-25 07:49:02 +00:00
zenggang 7f90361e59 * Fix sprint231 bugs 2022-08-25 03:30:54 +00:00
孙广明 41e346a299 Merge branch 'sprint/231_tianshujie_bug' into 'master'
Sprint/231 tianshujie bug

See merge request easycorp/zentaopms!5104
2022-08-25 01:57:26 +00:00
tianshujie 5e06502b84 * Fix bug #26858. 2022-08-25 09:49:55 +08:00
王怡栋 297a416762 Merge branch 'master' into 'sprint/231_zg_65782'
# Conflicts:
#   module/story/control.php
2022-08-25 00:51:00 +00:00
王怡栋 6c83e2b3fd Merge branch 'master_xieqiyu_fixStoryBug' into 'master'
Master xieqiyu fix story bug

See merge request easycorp/zentaopms!5098
2022-08-25 00:45:49 +00:00
孙广明 7eb65e9c2e Merge branch 'sprint/231_liumengyi_fixbug' into 'master'
* Fix bug #26845.

See merge request easycorp/zentaopms!5096
2022-08-24 09:23:47 +00:00
liumengyi c033a87009 * Fix bug #26845. 2022-08-24 17:19:59 +08:00
tianshujie ce8a347d07 * Fix bug for task #64967. 2022-08-24 17:06:27 +08:00
xieqiyu 5ab68b8aa2 * Fix bug#26823. 2022-08-24 15:58:30 +08:00
zenggang 73c8091a82 * Finish task#65782,65779 2022-08-24 03:24:03 +00:00
xieqiyu a36eb814db * Add story type for submit review. 2022-08-23 21:52:11 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
xieqiyu f47daae589 * Modify story review and other about story. 2022-08-22 14:34:37 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
xieqiyu 42a5ae7f3c * * Modify activate story. 2022-08-20 20:11:27 +08:00
xieqiyu 4cbf16a82d * * Modify recall story and delete change assign. 2022-08-19 15:28:14 +08:00
tianshujie c0e97a501c * Finish task #64976. 2022-08-18 14:33:10 +08:00
xieqiyu 95df48f63d * * Modify not review position. 2022-08-18 00:09:08 +08:00
liumengyi 73253183bc * Finish task #64967. 2022-08-17 17:10:10 +08:00
tianshujie df8c9caf46 * Finish task #64967. 2022-08-17 16:37:02 +08:00
tianshujie 619068ea8d * Finish task #64967. 2022-08-17 15:40:01 +08:00
xieqiyu 3881b0b34d * Add reviewer in edit story page. 2022-08-17 13:15:41 +08:00
xieqiyu 7fd5c4352d * Modify svae draft sauccess lang. 2022-08-17 09:03:38 +08:00
xieqiyu a61ad52efa * Code for task#62968. 2022-08-17 08:41:05 +08:00
tianshujie 24e39026cc * Finish task #64967. 2022-08-16 17:07:27 +08:00
xieqiyu d9a8156b76 * Modify changing process. 2022-08-15 22:03:08 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00
xieqiyu 809b70a5b8 * Code for task#63769. Story#32949. 2022-08-11 10:29:04 +08:00
xieqiyu 8e5360356b * Finish task#63769. 2022-08-11 10:11:54 +08:00
tianshujie 3cb3c5956f * Finish task #63692. 2022-08-09 16:11:20 +08:00
tianshujie 1200e97722 * Finish task #63692. 2022-08-09 15:19:16 +08:00
tianshujie 93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
tanghucheng d71cb4dd67 * Code for port. 2022-08-08 11:07:36 +08:00
tanghucheng 1c730049d1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-08-03 14:11:48 +08:00
tianshujie 9300ddb0ed * Finish task #62940. 2022-08-03 08:29:41 +08:00
tianshujie 3fdfc473c6 * Finish task #62941. 2022-08-02 17:23:35 +08:00
tianshujie c13808d8df * Finish task #62943,62941,62940,62942. 2022-08-02 15:01:24 +08:00
tanghucheng e642e85411 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into importExport 2022-07-28 17:25:03 +08:00
zhouxudong 116daf8cd6 * Fix bug. 2022-07-28 06:18:48 +00:00
zhouxudong 409825287f * Fix bug. 2022-07-28 05:41:12 +00:00
tanghucheng 96cef1ccfc * Code for bug export. 2022-07-25 09:23:26 +08:00
tanghucheng 2eacd5271e * Code for port. 2022-07-25 08:10:22 +08:00
孙广明 22230645dd * Fix bug #25627. 2022-07-22 13:07:49 +08:00
王怡栋 96d0f549da Merge branch 'sprint/217_liumengyi_61174' into 'master'
* Finish task #61174.

See merge request easycorp/zentaopms!4595
2022-07-19 07:33:30 +00:00