Commit Graph
950 Commits
Author SHA1 Message Date
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
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
xieqiyu 030d826624 * Finish task#56912. 2022-06-14 13:34:49 +08:00
xieqiyu d343298490 * Finish task#56913. 2022-06-14 13:28:42 +08:00
王怡栋 fd0cb543ba Merge branch 'master' into 'sprint_200'
# Conflicts:
#   module/execution/lang/en.php
#   module/execution/lang/zh-cn.php
#   module/execution/view/kanban.html.php
#   module/kanban/css/space.css
2022-06-09 03:16:20 +00:00
leiyong 49604b2248 * Adjust code. 2022-06-08 07:10:02 +00:00
王怡栋 196b78a0aa Merge branch 'sprint/201_tianshujie_56476' into 'master'
Sprint/201 tianshujie 56476

See merge request easycorp/zentaopms!3794
2022-06-08 06:48:46 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
leiyong 6ba36fc282 * Finish task#56387. 2022-06-07 08:16:56 +00:00
tianshujie c7b1da840f * Fix bug #56476. 2022-06-07 15:14:24 +08:00
tianshujie 8c2654c7d2 * Fix bug #22979. 2022-05-26 13:55:49 +08:00
tianshujie 3e427c11a4 * Fix bug #22943. 2022-05-26 11:35:01 +08:00
李玉春 b41cdeb6f4 Merge branch 'sprint/194_tianshujie_55257' into 'master'
Sprint/194 tianshujie 55257

See merge request easycorp/zentaopms!3594
2022-05-25 08:08:26 +00:00
孙广明 2c60c73f47 Merge branch 'sprint/195_zg_55147' into 'master'
* Finish task#55174,55172

See merge request easycorp/zentaopms!3573
2022-05-25 05:51:37 +00:00
tianshujie e3d1c44eae * Finish task #55257. 2022-05-25 13:45:10 +08:00
daitingting 79af02f18a * Remove useless object param. 2022-05-25 01:25:53 +00:00
zenggang 5b623fa3c4 * Finish task#55174 2022-05-25 01:12:37 +00:00
daitingting e2f7c10296 * Set default value in getFieldControl function, finish task #54954. 2022-05-25 01:03:06 +00:00
孙华伟 545dcf550c *Optimize the code. 2022-05-17 17:28:11 +08:00
孙华伟 3099628ce1 *Optimize the code. 2022-05-17 17:08:27 +08:00
孙华伟 4bc08301f8 *Fix bug #22375 2022-05-17 10:40:11 +08:00
xieqiyu e085535743 * Fix bug#22375. 2022-05-16 14:59:06 +08:00
wangyuting2 3380222afc * Fix build action menu bug. 2022-05-11 16:11:34 +08:00
wangyuting2 d4ed89e64a * Finish task #53548. 2022-05-11 15:05:13 +08:00
孙广明 37733991df Merge branch 'fixbug_21140' into 'master'
*Fixbug_21140

See merge request easycorp/zentaopms!3107
2022-04-25 06:42:26 +00:00
sunjun 1cf2e5e541 *Fixbug_21140 2022-04-25 13:10:55 +08:00