Commit Graph
4318 Commits
Author SHA1 Message Date
mayue 034daa3bb6 * Fix bug #14184. 2022-03-18 09:43:22 +08:00
liumengyi bb361baa6e * Add function annotation. 2022-03-17 17:12:08 +08:00
zhouxudong bf90e83326 * Fix bug #16264. 2022-03-17 14:27:34 +08:00
zhouxudong a778efdbb8 * Fix bug #16264. 2022-03-17 13:12:18 +08:00
zhouxudong 9b49071863 * Fix bug #16264. 2022-03-17 09:39:27 +08:00
孙广明 e2eb8999e5 Merge branch 'pailei2_zhouxin_50789' into 'pailei2'
Pailei2 zhouxin 50789

See merge request easycorp/zentaopms!2294
2022-03-16 05:28:51 +00:00
王怡栋 74280e35c8 Merge branch 'sprint/pailei2_tianshujie_19314' into 'pailei2'
Sprint/pailei2 tianshujie 19314

See merge request easycorp/zentaopms!2293
2022-03-16 05:04:59 +00:00
tianshujie 260a42de02 * Fixed an issue where the console reported an error when editing bugs. 2022-03-16 09:55:29 +08:00
tianshujie c0d4c5fa8c * Fix bug #19314,19298. 2022-03-16 09:43:58 +08:00
zhouxin f6a7577749 Fix bug #18306. 2022-03-16 01:39:05 +00:00
王怡栋 9ffa55da56 * fix bug #20682. 2022-03-15 14:31:01 +08:00
tianshujie 0fde764778 * Fix bug #17944. 2022-03-15 10:27:27 +08:00
孙华伟 02e25eadb0 * 2022-03-14 10:35:21 +08:00
孙华伟 5ee928527a *Fix bug#20455 2022-03-14 10:30:55 +08:00
孙华伟 0402417504 *Fix bug#20455 2022-03-14 09:13:28 +08:00
孙广明 4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
xieqiyu 4ba238cd27 * Modify review code. 2022-03-09 14:36:50 +08:00
mayue 9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00
tianshujie e7670ff411 * Add spaces. 2022-03-09 13:22:43 +08:00
tianshujie e4dba8b073 * Modify the code writing logic. 2022-03-09 12:40:28 +08:00
xieqiyu 58d4a9ad37 * Modify review code. 2022-03-09 11:25:45 +08:00
xieqiyu 139ea1e04a * Modify review code. 2022-03-09 11:17:36 +08:00
zhangzilong 6327b37eae * Code for task #49888. 2022-03-09 10:41:46 +08:00
tianshujie 234a2352ec * Fix bug #20487. 2022-03-09 10:37:10 +08:00
zhangzilong d04161c0cc * Code for task #49888. 2022-03-09 10:08:46 +08:00
tianshujie 06701aa5a0 * Fix style issues when raising bugs. 2022-03-09 09:34:52 +08:00
孙广明 382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
xieqiyu 944c0efdfe * Add selected lane when batch create in kanban. 2022-03-08 14:43:55 +08:00
孙华伟 c7f5c1f255 * 2022-03-08 14:43:41 +08:00
xieqiyu 25ad53744a * Add selected lane when batch create bug in kanban. 2022-03-08 10:44:38 +08:00
孙华伟 03e3f26ad5 * 2022-03-08 10:03:06 +08:00
tanghucheng 15e6262065 * Fix bug #20329,20350,20366. 2022-03-07 16:42:58 +08:00
zhangzilong 45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
孙广明 7b962c4e38 Merge branch 'pailei' 2022-03-07 10:56:26 +08:00
孙华伟 d8bb8a903e * 2022-03-04 14:34:01 +08:00
liumengyi 0358331dc9 * Fix bug #20255. 2022-03-04 10:18:55 +08:00
liumengyi 65fc1b9ca9 * Fix bug #20255. 2022-03-04 09:08:54 +08:00
tianshujie 794c22298f * Fix bug #20270. 2022-03-03 14:22:42 +08:00
孙广明 b63fa55607 Merge branch 'pailei_zhangzilong_49297' into 'pailei'
* Finish task #49297.

See merge request easycorp/zentaopms!2029
2022-03-02 03:00:45 +00:00
zhangzilong 92f4d32a68 * Finish task #49297. 2022-03-02 10:57:48 +08:00
zhangzilong ccc4ce9298 * Code for bug #49297. 2022-03-02 10:10:47 +08:00
xieqiyu 996992936e * Change branches for batch create bug in execution. 2022-03-02 10:00:08 +08:00
孙广明 6873b1061f Merge branch 'sprint/185_xieqiyu_49304' into 'pailei'
Sprint/185 xieqiyu 49304

See merge request easycorp/zentaopms!2007
2022-03-01 07:04:26 +00:00
zhangzilong 3b5ebbda16 * Finish task #49297. 2022-03-01 14:57:23 +08:00
xieqiyu 5cd1872e93 * Modify edit bug and batch edit bug. 2022-02-28 17:04:12 +08:00
孙广明 7ba3ed1dfc Merge branch 'spring/185_zhengrunyu_49305' into 'sprint/185'
* Fix bug 19941 19923 19922 19787.

See merge request easycorp/zentaopms!1980
2022-02-25 05:26:24 +00:00
zhengrunyu 748fbfe340 * Fix bug. 2022-02-25 13:24:30 +08:00
tianshujie b7c3e92e95 * Modify version judgment logic. 2022-02-24 16:17:26 +08:00
xieqiyu 9fa66c3d0f * Code for task#49304. 2022-02-24 14:40:14 +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