Commit Graph
927 Commits
Author SHA1 Message Date
tianshujie 2176378af6 * Fix bug #29339. 2022-11-07 09:11:40 +08:00
王怡栋 f03d771f33 Merge branch 'master_bug_28882' into 'master'
* Fix bug #28882.

See merge request easycorp/zentaopms!5929
2022-10-28 03:28:35 +00:00
liuhong 67f6c5c346 * Fix bug #28882. 2022-10-28 02:51:28 +00:00
mayue 44f182b305 * Optimize code. 2022-10-26 17:11:59 +08:00
曾刚 d2771a1dea Bug 28795 2022-10-21 07:59:09 +00:00
chaideqing e50dbc5be3 * code review 2022-10-18 09:39:39 +08:00
chaideqing 361040cc94 * refactor ->loadModel('bug')->lang to ->app->loadLang('bug') 2022-10-14 09:19:28 +08:00
王怡栋 900f1f42dc Merge branch 'feedback_1077' into 'master'
* Code for feedback #1077

See merge request easycorp/zentaopms!5743
2022-10-14 00:41:43 +00:00
zenggang fa83b54f4d * Code for feedback #1077 2022-10-12 08:56:08 +00:00
chaideqing 7dd705342c * fix No bug-lang in open source version 2022-10-12 15:34:48 +08:00
leiyong bd612c2e64 * Merge code. 2022-10-10 01:28:39 +00:00
hufangzhou 90e28b35c2 * Fix bug #28266. 2022-10-08 01:24:57 +00:00
hufangzhou 098ad81cd5 * Handle feedback #130. 2022-09-30 15:11:57 +08:00
leiyong cf752602ab * Handling feedback#923. 2022-09-30 05:32:11 +00:00
xieqiyu e84a192501 * Fix bug#28107. 2022-09-29 08:12:31 +00:00
liuyongkai 5795f3a7f9 * Fix export excel bugs. 2022-09-22 06:21:47 +00:00
mayue f206391ee6 * Fix bug #27535. 2022-09-19 13:54:34 +08:00
liuhong c3a1bedeef *Fix bug #27291. 2022-09-19 00:27:43 +00:00
liuhong 3c27ea607f *Fix bug #27291 for show duplicate requirements. 2022-09-18 13:21:03 +00:00
xieqiyu 40bc0e7966 * Fix bug#26942. 2022-09-09 11:17:37 +08:00
xieqiyu 62b51f7c9e * Code for task#66954,66959. 2022-09-07 14:20:33 +08:00
xieqiyu 8db8c3974b * Code for task#68109. 2022-09-06 08:55:35 +08:00
xieqiyu 0cd8ce30cd * Finish task#66954,#66960,#66959,#66958,#66956. 2022-08-31 12:35:45 +08:00
王怡栋 09b0a8c3c5 Merge branch 'fixbug' into 'master'
* Fix bug #26984.

See merge request easycorp/zentaopms!5182
2022-08-29 08:06:33 +00:00
王怡栋 f42b17f605 Update control.php 2022-08-29 08:06:10 +00:00
liumengyi 9b0f6544df * Fix bug #23957, #26846. 2022-08-29 15:11:21 +08:00
tanghucheng ddb8ddaacf * Code for bug #26984. 2022-08-29 15:03:20 +08:00
xieqiyu 34ec8c0a22 * Fix bug#26779. 2022-08-26 16:47:22 +08:00
王怡栋 19b2168668 Merge branch 'master_xieqiyu_65696' into 'master'
Master xieqiyu 65696

See merge request easycorp/zentaopms!5148
2022-08-26 06:57:02 +00:00
xieqiyu b11a645f00 * Fix bug#26941. 2022-08-26 14:09:28 +08:00
王怡栋 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