Commit Graph
145 Commits
Author SHA1 Message Date
liuhong 68ad91c71b * Fix bug #30061. 2022-11-30 00:53:11 +00:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
xieqiyu e5accc3154 * Fix bug#29356. 2022-11-07 06:54:28 +00:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tanghucheng 43d340fd2f * Fix bug export. 2022-10-24 10:12:38 +08:00
sunguangming 81bb7739be * Code for bug #28417. 2022-10-11 11:12:59 +08:00
曹延义 f4aa951774 * Finish task #71874. 2022-10-10 09:59:14 +08:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
tanghucheng 2ac544b181 * Fix bug for bug export. 2022-09-27 08:45:07 +08:00
dingyongliang c7c4ec7429 * task #70018, change bug confirmed color. 2022-09-22 01:12:16 +00:00
sunguangming faa8fae956 * Code for task #69596. 2022-09-21 16:06:14 +08:00
sunguangming 262bc3c572 * Merge code. 2022-09-21 11:00:20 +08:00
wangyidong 78d1de70c2 * code for task #69248. 2022-09-16 16:28:50 +08:00
xieqiyu 9dedf90d27 * Fix bug#27276,#27280. 2022-09-06 14:20:39 +08:00
xieqiyu 6bcc09aeca * Fix bug#27244. 2022-09-02 14:42:22 +08:00
xieqiyu d552aa67f9 * Code for task#66955. 2022-09-01 10:47:58 +08:00
xieqiyu e6bc611d14 * Finish task#66955. 2022-08-31 19:20:02 +08:00
tianshujie 6bd27a7aeb * Finish task #63687. 2022-08-15 19:33:12 +08:00
tianshujie 4f08c31607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-15 10:48:36 +08:00
tanghucheng 90f16b91ca * Fix bug for bug and story export. 2022-08-14 15:25:00 +08:00
tanghucheng 9a4d97f7ed * Fix bug for bug import. 2022-08-14 10:40:40 +08:00
tianshujie 4cc14dfe59 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-11 11:04:58 +08:00
tianshujie 1838710b42 * Finish task #63696,63695,63687. 2022-08-10 09:02:49 +08:00
tanghucheng 5544a9ded5 * Code for port. 2022-08-09 21:11:36 +08:00
tanghucheng d71cb4dd67 * Code for port. 2022-08-08 11:07:36 +08:00
tanghucheng 5ee43ad1f8 * rename exporttemplet to exporttemplate. 2022-08-01 16:03:38 +08:00
tanghucheng be483be25b * Code for bug showimport. 2022-07-25 11:24:37 +08:00
tanghucheng 18e857217f * Code for port. 2022-07-19 17:25:30 +08:00
tanghucheng d9cec2568a * Code for bug config. 2022-07-18 14:45:09 +08:00
tanghucheng 39b0ffe0f3 * Code for export story. 2022-07-10 21:15:17 +08:00
tanghucheng 6eb8428c4b * Fix bug config. 2022-07-08 15:34:31 +08:00
tanghucheng 525e444cd5 * Fix bug config and execl config. 2022-07-08 13:33:54 +08:00
tanghucheng ad32cd3092 * Fix getRows and set config for bug. 2022-07-08 11:00:47 +08:00
王怡栋 06a6d3f112 Merge branch 'sprint/master_zhouxudong_23687' into 'master'
* Fix bug #23687.

See merge request easycorp/zentaopms!3950
2022-06-16 00:31:01 +00:00
zhouxudong 6059c89194 * Fix bug #23687. 2022-06-15 09:13:37 +00:00
tanghucheng 7d8325f469 * Fix bug #23775. 2022-06-15 16:12:03 +08:00
sunjun a69d10d9db sprint_194 add project in batchcreate view 2022-06-10 06:36:12 +00:00
hufangzhou 5ea15374ac * Finish task #54994. 2022-05-25 10:51:01 +08:00
李玉春 fd977ff822 Merge branch 'sprint/191_zhouxin_fixbug' into 'master'
* Fix bug #22651,#22645.

See merge request easycorp/zentaopms!3512
2022-05-19 06:40:20 +00:00
hufangzhou 0a7b3d4786 * Adjust the color. 2022-05-19 13:54:14 +08:00
zhouxin 83248ea9f7 * Fix bug #22651,#22645. 2022-05-19 05:52:24 +00:00
hufangzhou 775a397395 * Finish task #54484,#54485,#54486. 2022-05-19 11:09:53 +08:00
liumengyi 977e100d04 * Finish task #53647. 2022-05-11 09:48:08 +08:00
wangxiaomeng c1a51d747c fix_bug #17253 2022-04-15 14:07:42 +08:00
wangxiaomeng 4eab870165 fix_bug_17253 2022-04-15 10:29:09 +08:00
mayue 4aaefa9fb7 * Fix bug #18065. 2022-04-12 15:24:47 +08:00
zhengrunyu 748fbfe340 * Fix bug. 2022-02-25 13:24:30 +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