Commit Graph
2688 Commits
Author SHA1 Message Date
孙广明 8acea5b35c Merge branch 'master_xieqiyu_20878' into 'master'
* Fix bug#20878.

See merge request easycorp/zentaopms!2547
2022-03-25 06:59:00 +00:00
xieqiyu 39123bd4d9 * Fix bug#20878. 2022-03-25 14:15:30 +08:00
Hao Sun b818f4054a * bug #11279, fix hotkey up/down with datetimepicker not work in batch action page. 2022-03-25 13:13:29 +08:00
zenggang 1357480ac6 * Finish task#51109,51108,51128 2022-03-23 07:54:03 +00:00
孙广明 a2a191b421 Merge branch 'liyuchun_bug_17235' 2022-03-22 15:45:41 +08:00
孙广明 41eee3ddd4 Merge branch 'master' into 'liyuchun_bug_17235'
# Conflicts:
#   module/common/model.php
2022-03-22 07:43:58 +00:00
zenggang 784e153159 * Finish task#51115,51116,51120,51121,51133 2022-03-22 07:11:57 +00:00
liyuchun 166cda1186 * Fix bug #17235. 2022-03-22 14:12:44 +08:00
李玉春 2b1fee6181 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2433
2022-03-22 05:43:55 +00:00
tianshujie 129c55db39 * Delete useless judgment conditions. 2022-03-22 13:40:43 +08:00
tianshujie 1004f727ae * Modify language item. 2022-03-22 12:35:34 +08:00
xieqiyu e2fbaa6828 * Fix bug#20396. 2022-03-22 11:10:44 +08:00
tianshujie 8cf4b3bcae * Fix bug #19261. 2022-03-22 11:01:14 +08:00
xieqiyu f1aa12aae3 * Fix bug. 2022-03-22 09:36:32 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
xieqiyu 0d21516997 * Modify create bug. 2022-03-22 08:40:43 +08:00
liyuchun 0187fb80c7 Merge branch 'devops24' 2022-03-22 08:28:32 +08:00
孙广明 73e6d617ef Merge branch 'sprint/autoTest_liumengyi_bug' into 'master'
* Modify code.

See merge request easycorp/zentaopms!2383
2022-03-21 00:29:00 +00:00
zhujinyong 9fcb03b0fd + Add api of tetsuite. 2022-03-21 08:25:20 +08:00
liumengyi dfb6c1361e * Modify code. 2022-03-21 08:12:51 +08:00
zenggang ed17f3b7bb * Finish task#51105,51102 2022-03-18 05:17:53 +00:00
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