Commit Graph
2604 Commits
Author SHA1 Message Date
xieqiyu d4ac1b4a5f * Code for task#57850. 2022-06-23 17:20:19 +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
tianshujie 7372f7f936 * Finish story #32623. 2022-06-22 08:51:05 +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 eb6e217f3c * Adjust CSS. 2022-06-17 05:21:40 +00: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
孙广明 da2b704d31 * Finish task #57157. 2022-06-14 10:46:29 +08:00
zhouxin 68b8268391 * Finish task #55258. 2022-06-13 01:25:38 +00:00
wangyidong 9b699300ff * code for bug #23516. 2022-06-09 16:50:07 +08:00
王怡栋 95fa3f04e1 Merge branch 'fixbug' into 'master'
* Fix bug #23474,23474,23441,23374.

See merge request easycorp/zentaopms!3830
2022-06-09 07:25:39 +00:00
liumengyi 63717f4fd0 * Fix bug of task #56454. 2022-06-09 15:18:56 +08:00
tanghucheng 415542746b * Fix bug #23374. 2022-06-09 14:54:54 +08:00
tanghucheng c4765a8431 * Fix bug #23441. 2022-06-09 14:41:26 +08:00
tanghucheng 87e879e047 * Fix bug #23474,23474. 2022-06-09 14:34:11 +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
wangyidong 11e6edcd22 Merge branch 'zdoo18' 2022-06-08 17:06:07 +08: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
liumengyi 5511a51882 * Fix bug #23340. 2022-06-08 10:35:41 +08: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
liumengyi 6e4ac95a48 * Fix bug #23340. 2022-06-07 10:35:13 +08:00
xieqiyu 4bd7502e34 * Fix bug#23083. 2022-06-06 01:46:45 +08:00
wangyidong fb786e9cf6 * remove useless flow action. 2022-06-02 15:02:38 +08:00
wangyidong 2400dfc83a * code for task #55568. 2022-06-01 14:48:35 +08:00
tianshujie 7a70ae8481 * Finish task #55675. 2022-06-01 13:50:53 +08:00
tianshujie 2fb1cc0032 * Finish task #55675. 2022-06-01 10:57:07 +08:00
tianshujie bee7fe5ae4 * Export tasks Add task mode. 2022-05-27 05:38:05 +08:00
tianshujie ae096f635c * Fix bug #22979. 2022-05-26 21:32:07 +08:00
tianshujie 53e95069e4 * Fix bug #22979. 2022-05-26 21:08:37 +08:00
tianshujie 50e9f82455 * Fix bug #22988. 2022-05-26 14:20:44 +08:00
tianshujie 8c2654c7d2 * Fix bug #22979. 2022-05-26 13:55:49 +08:00
tianshujie 017019f6af * Fix bug #22952,22979. 2022-05-26 11:35:47 +08:00