Commit Graph
2827 Commits
Author SHA1 Message Date
孙华伟 ab396ef809 *Optimize the code. 2022-05-26 11:14:50 +08:00
孙华伟 c43322977f *Fix bug #22900. 2022-05-26 11:07:01 +08:00
lanzongjun 36010b797f * fix bug #54940 2022-05-25 15:58:26 +08:00
lanzongjun 0a84e5fb81 * fix bug #54940 2022-05-25 15:51:48 +08:00
王怡栋 b4646bcf9c Merge branch 'sprint/master_zhouxudong_54998' into 'master'
* Finish task #54998.

See merge request easycorp/zentaopms!3591
2022-05-25 07:17:49 +00:00
王怡栋 601272cd59 Merge branch 'sprint/193_hufangzhou_54994' into 'master'
* Finish task #54994.

See merge request easycorp/zentaopms!3580
2022-05-25 07:10:56 +00:00
王怡栋 7466f08e23 Merge branch 'sprint/193_hufangzhou_54996' into 'master'
* Finish task #54996.

See merge request easycorp/zentaopms!3581
2022-05-25 07:09:51 +00:00
hufangzhou 9e3133e2a3 * Resolve issue #644. 2022-05-25 13:49:25 +08:00
hufangzhou 47151034b0 * Finish task #54996. 2022-05-25 11:21:49 +08:00
sunjun 532ed847f3 fixbug_sunjun 2022-05-25 03:07:59 +00:00
hufangzhou 5ea15374ac * Finish task #54994. 2022-05-25 10:51:01 +08:00
李玉春 19718e6249 Merge branch 'master' into 'sprint_sunjun_55259'
# Conflicts:
#   module/bug/view/batchcreate.html.php
2022-05-25 02:31:37 +00:00
sunjun 62c617db87 sprint_sunjun_55259 2022-05-25 02:10:02 +00:00
sunjun ca20a35a26 sprint_sunjun_55259 2022-05-25 01:34:10 +00:00
zhouxudong 02d3db0b44 * Finish task #54998. 2022-05-25 01:23:51 +00:00
daitingting e2f7c10296 * Set default value in getFieldControl function, finish task #54954. 2022-05-25 01:03:06 +00:00
wangyidong 967d24dd06 Merge branch 'sprint/189_package' 2022-05-24 10:32:09 +08:00
liumengyi b70e6047db * Fix bug for batch assign. 2022-05-19 16:33:20 +08:00
liumengyi 47ec417f16 * Fix bug #22689. 2022-05-19 15:39:10 +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
wangyidong 415d9ed538 * adjust for merge master code. 2022-05-17 17:12:12 +08:00
tanghucheng d3dc4ebe43 * Fix bug. 2022-05-17 06:00:26 +00: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
wangyidong 759ace3700 * code for task #54026. 2022-05-16 16:36:04 +08: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