Commit Graph
1137 Commits
Author SHA1 Message Date
xieqiyu 62b51f7c9e * Code for task#66954,66959. 2022-09-07 14:20:33 +08:00
liumengyi 72591c381e * Fix bug #27186. 2022-09-07 09:20:35 +08:00
zenggang e96c5b3818 * Fix bug#26943 2022-09-02 09:00:58 +00:00
曾刚 d0e33c4e3c * Fix bug#27141,27153 2022-09-01 06:53:32 +00:00
xieqiyu 6768c63f62 * Fix bug. 2022-09-01 12:15:09 +08:00
xieqiyu 0d321210c5 * Code for task#66954. 2022-08-31 20:05:42 +08:00
xieqiyu 0cd8ce30cd * Finish task#66954,#66960,#66959,#66958,#66956. 2022-08-31 12:35:45 +08:00
zenggang 494474d349 * Fix sprint231 bugs 2022-08-26 05:10:26 +00:00
王怡栋 f0aa2a0111 Merge branch 'master' into 'sprint/231_zg_issues'
# Conflicts:
#   module/story/lang/zh-cn.php
2022-08-26 01:35:56 +00:00
王怡栋 38dd8fdac2 Merge branch 'master_xieqiyu_fixFileBug' into 'master'
* Delete reset file name of story change page.

See merge request easycorp/zentaopms!5135
2022-08-26 01:22:42 +00:00
王怡栋 7b8333da4e Merge branch 'master_xieqiyu_26878' into 'master'
* Fix bug#26878.

See merge request easycorp/zentaopms!5123
2022-08-26 01:21:00 +00:00
xieqiyu dedf5e6dc2 * Delete reset file name of story change page. 2022-08-26 09:14:16 +08:00
xieqiyu 6717931bf5 * Fix bug#26878. 2022-08-26 08:07:40 +08:00
王怡栋 8a7cceaaa5 Merge branch 'master_xieqiyu_26873' into 'master'
* Fix bug#26873.

See merge request easycorp/zentaopms!5120
2022-08-25 08:19:40 +00:00
zenggang bf24ce64fd * Fix sprint/231 issues 2022-08-25 07:49:02 +00:00
xieqiyu 84cd1e4835 * Fix bug#26878. 2022-08-25 14:56:39 +08:00
tianshujie 766d166a5b * Fix bug #26879. 2022-08-25 14:46:07 +08:00
xieqiyu 1bef0993ae * Fix bug#26873. 2022-08-25 14:16:54 +08:00
zenggang 7f90361e59 * Fix sprint231 bugs 2022-08-25 03:30:54 +00:00
孙广明 5115d871b6 Merge branch 'sprint/231_liumengyi_26846' into 'master'
* Fix bug #26846.

See merge request easycorp/zentaopms!5106
2022-08-25 02:03:22 +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
liumengyi 9408410fee * Fix bug #26846. 2022-08-25 09:56:42 +08: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
xieqiyu 14ce3c97f9 * Fix bug#26804,26797. 2022-08-24 22:43:27 +08:00
liumengyi c033a87009 * Fix bug #26845. 2022-08-24 17:19:59 +08:00
xieqiyu 6b9885067d * Fix bug#26776. 2022-08-24 13:59:49 +08:00
zenggang 73c8091a82 * Finish task#65782,65779 2022-08-24 03:24:03 +00:00
xieqiyu 1590364db3 * Fix bug of link story. 2022-08-23 15:23:17 +08:00
xieqiyu 99e4534f38 Merge branch 'master' into master_xieqiyu_draftStory 2022-08-22 17:29:21 +08:00
sunguangming 9d52e47151 Merge branch 'sprint/228_tianshujie_64967' 2022-08-22 10:24:40 +08:00
liumengyi f42d3690c5 * Finish task #64967. 2022-08-22 10:06:05 +08:00
xieqiyu 42a5ae7f3c * * Modify activate story. 2022-08-20 20:11:27 +08:00
tianshujie c990e09f61 * Finish task #64967. 2022-08-19 16:29:53 +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
liumengyi ce3e1bf617 * Finish task #64967. 2022-08-18 10:37:17 +08:00
xieqiyu 5cc82f3bbf * * Fix bug of last one review story. 2022-08-18 09:24: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
xieqiyu d39529acb8 * Modify do not submit lang. 2022-08-17 13:53:02 +08:00
xieqiyu c49353ae13 * Add error comment when empty reviewer. 2022-08-17 13:36:10 +08:00
xieqiyu 3881b0b34d * Add reviewer in edit story page. 2022-08-17 13:15:41 +08:00
xieqiyu a61ad52efa * Code for task#62968. 2022-08-17 08:41:05 +08:00
xieqiyu d9a8156b76 * Modify changing process. 2022-08-15 22:03:08 +08:00
xieqiyu 7bbaee5a6a * Add file of submit review story. 2022-08-13 13:41:53 +08:00
liumengyi b44027690c * Fix bug #26358. 2022-08-12 16:07:06 +08:00
xieqiyu 17773dee90 * Code for story of add draft status. 2022-08-12 16:00:00 +08:00