Commit Graph
975 Commits
Author SHA1 Message Date
孙广明 6b19ed146d Merge branch 'sprint/tianshujie_25268' into 'master'
Sprint/tianshujie 25268

See merge request easycorp/zentaopms!4547
2022-07-14 07:24:17 +00:00
tianshujie 711c0e9e8c * Fix bug #25088. 2022-07-14 14:46:46 +08:00
guofeilong dafb0452d3 * Fix bug #23351 2022-07-14 05:50:28 +00:00
guofeilong 618d44374a Fix bug #23351 in bug and task batchcreate 2022-07-14 05:37:00 +00:00
mayue 090989e25e * Fix bug #24404. 2022-07-13 11:11:36 +08:00
孙广明 1e873272b3 Merge branch 'sprint/216_mayue_bug24404' into 'master'
* Fix bug #24404.

See merge request easycorp/zentaopms!4476
2022-07-13 02:17:12 +00:00
王怡栋 b2097b9b7c Merge branch 'sprint/215_tianshujie_60667' into 'master'
* Fix bug #25070.

See merge request easycorp/zentaopms!4480
2022-07-12 07:40:33 +00:00
mayue f44d5659df * Fix bug #24404. 2022-07-12 15:00:11 +08:00
tianshujie 1d1441f17f * Fix bug #25070. 2022-07-12 14:22:37 +08:00
mayue 14ace897ca * Fix bug #24404. 2022-07-12 10:21:23 +08:00
tianshujie fe4b40e3cd * Fix bug #24127. 2022-07-08 10:34:05 +08:00
tianshujie 5ccd62ea84 * Merge insensitive refresh custom forms into one method. 2022-07-07 10:44:29 +08:00
tianshujie dc7e0ec546 * Put the functions that add and remove elements in my.full.js. 2022-07-06 16:37:10 +08:00
王怡栋 f25fcc1eb2 Merge branch 'master' into 'sprint/211_tianshujie_58557'
# Conflicts:
#   module/testcase/css/create.css
2022-07-06 06:47:25 +00:00
tianshujie 577b42f32c * Hide required fields in custom forms. 2022-07-06 08:41:20 +08:00
tianshujie cdaf164f0a * Fix bug #24752,24747. 2022-07-06 08:26:27 +08:00
tianshujie 64c23417d0 * Modify style issues. 2022-07-05 16:05:33 +08:00
tianshujie 4e05cb1916 * Finish task #59472. 2022-07-05 13:19:03 +08:00
tianshujie 3028701a06 * Finish task #59472. 2022-07-04 17:18:20 +08:00
王怡栋 4bacc1b95f Merge branch 'sprint/211_liumengyi_59468' into 'master'
* Finish task #59468.

See merge request easycorp/zentaopms!4316
2022-07-04 07:04:37 +00:00
王怡栋 04b2a5994f Merge branch 'sprint/208_tianshujie_58554' into 'master'
Sprint/208 tianshujie 58554

See merge request easycorp/zentaopms!4317
2022-07-04 06:59:21 +00:00
tianshujie ee701c75c9 * Finish task #58554. 2022-07-04 13:20:09 +08:00
liumengyi 7f9f5f662c * Finish task #59468. 2022-07-04 11:21:56 +08:00
zhouxudong 1e4f5f1e7d * Fix bug of batchCreate Task. 2022-07-01 05:19:00 +00:00
zhouxudong bd848e13e2 * Fix bug #24598. 2022-06-30 05:51:38 +00:00
tianshujie 8fbf4148c4 * Fix bug #24573. 2022-06-30 10:55:05 +08:00
孙广明 7a80448220 * Code for multi task. 2022-06-30 09:51:35 +08:00
孙广明 793a4ec698 * Code for multi task assignedTo. 2022-06-30 09:41:33 +08:00
孙广明 6c777a0a97 * Finish task #58771. 2022-06-29 13:50:57 +08:00
孙广明 59eeeced39 Merge branch 'sprint210_zg' into 'master'
* Finish task#58772,58774,58775

See merge request easycorp/zentaopms!4184
2022-06-29 01:14:39 +00:00
zhouxudong 0daa2e2130 * Finish task #58605. 2022-06-28 07:50:23 +00:00
tianshujie 621e382cb6 * Finish task #58554. 2022-06-28 15:35:49 +08:00
zenggang 15feb917ce * Finish task#58772,58774,58775 2022-06-28 05:39:31 +00:00
xieqiyu 320c88d44d * Finish task#58584. 2022-06-28 13:30:51 +08:00
孙广明 33dd17eb8a Merge branch 'sprint/207_mayue_bug#23765' into 'master'
Sprint/207 mayue bug#23765

See merge request easycorp/zentaopms!4094
2022-06-23 05:30:16 +00:00
王怡栋 6fd3c28a23 Merge branch 'sprint205_leiyong_task_57878' into 'master'
Sprint205 leiyong task 57878

See merge request easycorp/zentaopms!4074
2022-06-23 00:41:00 +00:00
王怡栋 c69384617a Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.

See merge request easycorp/zentaopms!4083
2022-06-23 00:39:25 +00:00
mayue 6c975adff8 * Add some code. 2022-06-22 17:21:55 +08:00
王怡栋 9ffdc942c2 Merge branch 'master' into 'sprint/205'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
2022-06-22 09:21:12 +00:00
leiyong aeaf517513 * Keep 2 decimal places. 2022-06-22 09:17:10 +00:00
leiyong 3356617455 * Finish task#57878. 2022-06-22 05:35:34 +00:00
xieqiyu 21b0217aa8 * Code for task#57850. 2022-06-22 13:15:44 +08:00
zhouxudong 4dd1445e8b * Finish task #57872. 2022-06-21 05:48:57 +00:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
leiyong c9f1e15c2f * Adjust CSS. 2022-06-17 05:20:32 +00:00
leiyong f4e3a0dc61 * Fix bug#23707. 2022-06-16 09:14:11 +00:00
Hao Sun 60f23970ba * task #56942, optimize UI for task create form. 2022-06-15 09:53:25 +00:00
朱金勇 cb9a0b6af9 Merge branch 'sprint202_leiyong_fix_bug' into 'master'
* Finish task#56933.

See merge request easycorp/zentaopms!3916
2022-06-14 09:44:45 +00:00
leiyong b6f5c18dc9 * Finish task#56933. 2022-06-14 07:56:43 +00:00
xieqiyu a384279f28 * Finish task#56911. 2022-06-14 13:45:45 +08:00