Commit Graph
77 Commits
Author SHA1 Message Date
liuyongkai 3d5f702b1e * Fix bug of kanban and the view of admin in lite 2022-08-11 07:19:07 +00:00
liuyongkai e14424eba3 * Fix bug #26065 2022-08-10 05:46:55 +00:00
liuyongkai 0da420f283 * Fix bug #26065 2022-08-10 05:20:19 +00:00
liuyongkai 628834cbab * Fix the view of kanbans' content 2022-08-08 05:28:11 +00:00
liuyongkai 7e7b535c13 * Fix the view of kanbans' content 2022-08-08 05:25:02 +00:00
wangyidong a0a56c2b96 * fix bug #26064,26065. 2022-08-04 17:25:32 +08:00
tianshujie 40ba26dda6 * Finish task #60475. 2022-07-12 09:21:58 +08:00
zhouxudong 26a57e00cd * Fix bug #23543 #23434 #23427 #23419. 2022-06-13 04:24:33 +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 1b511cac59 * Handling html tags. 2022-06-09 07:33:00 +00:00
leiyong 70ee0323f6 * Fix bug#23487. 2022-06-09 06:48:21 +00:00
xieqiyu 5d5bc8f927 * Finish task#56386. 2022-06-09 14:35:20 +08:00
leiyong aec5b3612e * Finish task#56384. 2022-06-09 06:23:50 +00:00
leiyong a71825d731 * Fix bug. 2022-06-09 05:08:33 +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
王怡栋 4591b20bd7 Merge branch 'sprint/200-zhouxudong_56383' into 'sprint_200'
Sprint/200 zhouxudong 56383

See merge request easycorp/zentaopms!3809
2022-06-09 01:57:00 +00:00
zhouxudong f7c784d6fa * Finish task #56383. 2022-06-09 01:10:38 +00:00
zhouxudong 9694af1c79 * Finish task #56383. 2022-06-09 00:52:00 +00:00
zhouxudong 6265fcd76f * Finish task #56383. 2022-06-08 09:37:10 +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 0dc3a87d2e * Finish task #56383 2022-06-08 08:02:47 +00:00
孙广明 cb4776df2d Merge branch 'sprint/200_zhouxudong_56379' into 'master'
Sprint/200 zhouxudong 56379

See merge request easycorp/zentaopms!3785
2022-06-08 06:46:21 +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
zhouxudong 596ea0124b * Finish task #56383. 2022-06-08 05:01:16 +00:00
leiyong 1086eca0db * Finish task#56367. 2022-06-08 02:44:31 +00:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
zhouxudong 757b86bf33 * Finish task #56379. 2022-06-08 01:52:34 +00:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08: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
sunjun 4a3a1dee33 fixbug_sunjun_sprint194 2022-05-25 05:06:22 +00:00
李玉春 ed24d92ae2 Merge branch 'master' into 'sprint_sunjun_29766'
# Conflicts:
#   module/kanban/config.php
2022-05-25 02:27:08 +00:00
sunjun 5590973533 sprint_sunjun_29766 2022-05-24 07:03:03 +00:00
liumengyi 94078cdc6c * Fix bug for task #55255. 2022-05-24 13:39:27 +08:00
liumengyi 94e8879729 * Modify format fot ask #55255. 2022-05-24 13:34:29 +08:00
liumengyi 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00
tianshujie b40e7699e5 * Fix bug #20731. 2022-03-22 10:37:32 +08:00
Hao Sun aa30172fea * Task #49295, optimize UI for avatar. 2022-03-01 13:24:13 +08:00
liyuchun 0d16a79b63 * Fix bug #19323. 2022-02-15 08:22:25 +08:00
liumengyi 1353d674c7 * Fix bug #18883 and #18891. 2022-01-24 14:19:35 +08:00
liumengyi 7633710cfa * Fix bug#18841, #18865, #18876, #18877, #18879 and #18891. 2022-01-24 13:31:12 +08:00
王怡栋 438f0348a6 Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Remove acl icon.

See merge request easycorp/zentaopms!1513
2022-01-20 05:03:54 +00:00
王怡栋 abf1d172a6 Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Finish task #48006, #48007.

See merge request easycorp/zentaopms!1512
2022-01-20 03:22:28 +00:00
liumengyi 00f08fc3cd * Remove acl icon. 2022-01-20 11:22:14 +08:00
liumengyi b371c22842 * Finish task #48006, #48007. 2022-01-20 11:05:35 +08:00
孙广明 6d2212e7e0 Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Finish task #47977.

See merge request easycorp/zentaopms!1503
2022-01-19 09:32:12 +00:00
mayue 9150697408 * Finish task #47979. 2022-01-19 16:59:00 +08:00