Commit Graph
2806 Commits
Author SHA1 Message Date
liumengyi b70e6047db * Fix bug for batch assign. 2022-05-19 16:33:20 +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
王怡栋 3368eddc78 Merge branch 'sprint/192_hufangzhou_bugreport' into 'master'
# Finish task #54484,#54485,#54486.

See merge request easycorp/zentaopms!3514
2022-05-19 06:28:41 +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
孙广明 6f150a9ea8 Merge branch 'master' into 'sprint/191_zhouxin_54352'
# Conflicts:
#   module/datatable/config.php
2022-05-19 03:18:24 +00:00
hufangzhou 775a397395 * Finish task #54484,#54485,#54486. 2022-05-19 11:09:53 +08:00
zhouxin 8a2e6d63cb * Fix bug. 2022-05-19 03:07:55 +00:00
liumengyi 7659a2376c * Code format for task #54320. 2022-05-19 10:38:00 +08:00
liumengyi 6aabf4eae0 * Finish task #54320. 2022-05-18 17:00:48 +08:00
sunjun 728d85916e fixbug_sunjun_54324 2022-05-18 04:27:46 +00:00
wangyidong d6cf08b9d7 Merge branch 'tid' 2022-05-18 10:20:48 +08:00
tianshujie e848ea7d3f * Fix the project logic to which the lookup execution belongs. 2022-05-17 09:39:07 +08:00
王怡栋 3cd2d727a7 Merge branch 'sprint/master_zhouxudong_22531' into 'master'
* Fix bug #22531.

See merge request easycorp/zentaopms!3431
2022-05-16 09:26:34 +00:00
zhouxudong 48c052efad * Fix bug #22531. 2022-05-16 09:23:29 +00:00
王怡栋 57cf623f54 Merge branch 'fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3423
2022-05-16 06:45:50 +00:00
tanghucheng a0bd326f3b * Fix bug. 2022-05-16 06:43:34 +00:00
zhouxudong 9e4d86d6d8 * FIx bug #22523. 2022-05-16 05:54:54 +00:00
zhouxudong 89a150e856 * Fix bug #22523. 2022-05-16 05:48:54 +00:00
zhouxudong ec0f0b4a95 * Fix bug #22514. 2022-05-16 04:01:58 +00:00
liumengyi 6d61b45068 * Refactoring bug search code. 2022-05-11 16:15:07 +08:00
liumengyi ed90476621 * Refactoring bug search code. 2022-05-11 16:10:07 +08:00
liumengyi 3f0101ac01 * Fix bug #22320,#22317. 2022-05-11 13:37:49 +08:00
王怡栋 f98d33e010 Merge branch 'sprint/189_hufangzhou_53673' into 'master'
* Finish task #53673.

See merge request easycorp/zentaopms!3316
2022-05-11 03:27:53 +00:00
liumengyi 460f597c60 * Fix bug for #task 53647. 2022-05-11 10:46:40 +08:00
hufangzhou 3680af6833 * Finish task #53673. 2022-05-11 10:05:09 +08:00
liumengyi 8c6c09d699 * Finish task #53647. 2022-05-11 10:02:02 +08:00
liumengyi 977e100d04 * Finish task #53647. 2022-05-11 09:48:08 +08:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
wangyuting2 a607161591 * Finish task #53549. 2022-05-09 17:00:41 +08:00
wangyuting2 19631c8b97 * Adjust return. 2022-05-09 16:14:53 +08:00
wangyuting2 e86f32df24 * Adjust feedback menu. 2022-05-09 15:58:02 +08:00
wangyuting2 73dce33bc3 * Adjust bug action menu. 2022-05-09 13:49:02 +08:00
wangyuting2 91366891f4 * Adjust bug action menu. 2022-05-09 13:46:59 +08:00
wangyuting2 219eb1060e * Fix bug. 2022-05-09 13:38:21 +08:00
wangyuting2 cc57fc819a * Add buildOperateMenu for bug module. 2022-05-09 11:16:14 +08:00
wangyuting2 45ae4de775 * Do task 53548. 2022-05-09 09:20:01 +08:00
孙广明 07dc4c4055 Merge branch 'api_zry' into 'master'
* Fix bug 22061.

See merge request easycorp/zentaopms!3234
2022-05-05 08:22:46 +00:00
zhengrunyu e7699d04f1 * Fix bug 22061. 2022-05-05 16:19:48 +08:00
Hao Sun f46b84446e * bug #16382, fix position for #notifyEmailLabel. 2022-04-29 16:39:08 +08:00
xieqiyu 88fbdad2fd * Fix bug#22114. 2022-04-29 11:29:40 +08:00
mayue ba0ddd3ca3 * Fix bug #22069. 2022-04-28 06:58:12 +00:00
mayue aeda6fbe78 * Fix bug #22064#22065. 2022-04-28 06:43:05 +00:00
liyuchun 537c1bea2d * Fix bug #15039. 2022-04-28 02:06:10 +00:00
朱金勇 8b4e68b5a4 Merge branch 'api_zry' into 'master'
Api zry

See merge request easycorp/zentaopms!3159
2022-04-27 08:19:56 +00:00
zhengrunyu 00dda5315a * Change function name. 2022-04-27 16:17:08 +08:00
zhengrunyu 9bd5524ef3 * Add remark. 2022-04-27 15:21:20 +08:00
zhengrunyu 18e2cdb71c * Add block. 2022-04-27 15:19:59 +08:00
zhengrunyu 6f18ae83c2 * Add model function to static. 2022-04-27 15:01:46 +08:00
孙广明 8a70ffb277 * Fix bug #10735. 2022-04-26 10:38:31 +08:00