Commit Graph
210 Commits
Author SHA1 Message Date
leiyong f4e3a0dc61 * Fix bug#23707. 2022-06-16 09:14:11 +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
zhouxudong 0ec97fbba4 * Finish task #56944 #56943 #56941 #56938. 2022-06-13 05:37:22 +00:00
zhouxudong 26a57e00cd * Fix bug #23543 #23434 #23427 #23419. 2022-06-13 04:24:33 +00:00
王怡栋 e87eb29642 Merge branch 'sprint/mater_zhouxudong_56368' into 'master'
* Finish task #56368.

See merge request easycorp/zentaopms!3855
2022-06-10 05:06:30 +00:00
zhouxudong 291b9a6606 * Fix bug #23510. 2022-06-10 04:59:12 +00:00
孙广明 23ae4cea1c Merge branch 'master_xieqiyu_56376' into 'master'
* Finish task#56376.

See merge request easycorp/zentaopms!3859
2022-06-10 04:29:59 +00:00
xieqiyu 3e4fd3aa0f * Finish task#56376. 2022-06-10 12:01:27 +08:00
zhouxudong 8f8eaaa837 * Finish task #56368. 2022-06-10 03:08:22 +00:00
zhouxudong 82afc7ae76 * Finish task #56374. 2022-06-10 01:43:08 +00:00
leiyong 70c1b06e1c * Adjust code. 2022-06-09 09:31:45 +00:00
leiyong 4d5ccc180e * Fix bug#23494,bug#23486. 2022-06-09 08:58:05 +00:00
王怡栋 c9a29bb420 Merge branch 'master' into 'sprint200_leiyong_task_56384'
# Conflicts:
#   module/kanban/view/space.html.php
2022-06-09 07:40:03 +00:00
leiyong 70ee0323f6 * Fix bug#23487. 2022-06-09 06:48:21 +00:00
王怡栋 ce38afd825 Merge branch 'sprint/master_zhouxudong_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!3817
2022-06-09 06:35:07 +00:00
leiyong aec5b3612e * Finish task#56384. 2022-06-09 06:23:50 +00:00
leiyong 38a7d7334a * Fix bug#23481,bug#23466. 2022-06-09 03:42:53 +00:00
zhouxudong acf028e0a9 * Fix bug. 2022-06-09 03:24:15 +00: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
王怡栋 7f967e8091 Merge branch 'sprint200_leiyong_task_56367' into 'sprint_200'
Sprint200 leiyong task 56367

See merge request easycorp/zentaopms!3795
2022-06-08 08:45:55 +00:00
zhouxudong 512f152a6b * Finish task #56381. 2022-06-08 06:48:34 +00:00
zhouxudong afbda967c1 * Finisha task #56381. 2022-06-08 06:43:38 +00:00
zhouxudong b2cff31389 * Finish task #56379. 2022-06-08 06:41:28 +00:00
zhouxudong 16e9d31d15 * Finish task #56379. 2022-06-08 06:36:13 +00:00
zhouxudong 0586ef58e6 * Finishs task #56381. 2022-06-08 06:32:34 +00:00
leiyong da49166f81 * Adjust CSS. 2022-06-08 05:40:18 +00:00
leiyong 23368e7847 * Adjust style. 2022-06-08 05:26:45 +00:00
leiyong 6ed6c4a956 * Adjust style. 2022-06-08 05:16:22 +00:00
leiyong 5a0cd1562b * Finish task#56371. 2022-06-08 03:20:36 +00:00
leiyong 1086eca0db * Finish task#56367. 2022-06-08 02:44:31 +00:00
zhouxudong 757b86bf33 * Finish task #56379. 2022-06-08 01:52:34 +00:00
zhouxudong 56419e17a8 * Finish task #56379. 2022-06-08 01:39:24 +00:00
zhouxudong dd10aa75f0 * Finish task #56366 #56379 #56382 #56380 2022-06-08 01:06:07 +00:00
zhouxudong b4a27adf49 * Finish task #56379 #56382 #56380. 2022-06-07 08:16:04 +00:00
zhouxudong d89952846b * Finish task #56381. 2022-06-07 06:32:08 +00:00
孙华伟 30c5754f26 *Fix bug#22626. 2022-05-18 15:59:01 +08:00
孙华伟 628c54a838 *Optimize the code. 2022-05-17 11:26:35 +08:00
孙华伟 9fad4e929b *Fix bug #22559. 2022-05-17 11:06:49 +08:00
孙华伟 475c0d6acc *Fix bug #22338. 2022-05-17 09:32:25 +08:00
liumengyi b3fd6f4f53 * Add card desc of productplan card and build card. 2022-05-12 17:22:10 +08:00
liumengyi c5ee9d9873 * Finish task #53663. 2022-05-10 15:35:32 +08:00
Hao Sun b411c07de8 * bug #19078, hide scrollbar on dragging card in ".kanban". 2022-04-18 17:34:44 +08:00
tianshujie 7b731b4a47 * Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813.* Fix bug #19813. 2022-04-06 08:54:57 +08:00
tianshujie 824724f657 * Fix bug #19813. 2022-04-02 20:16:00 +08:00
tianshujie a382e1c434 * Fix bug #19813. 2022-04-02 16:57:52 +08:00
zhouxudong 3e49aee5dc * Fix bug #18744. 2022-03-31 08:59:04 +08:00
zhouxudong 1b4441e546 * Fix bug #18744. 2022-03-31 08:55:14 +08:00
zhouxudong b2ade4c3d7 * Fix bug #18744 #18763. 2022-03-30 17:30:37 +08:00
Hao Sun 0a7c559478 * optimize UI for kanban. 2022-03-24 14:27:03 +08:00