Commit Graph
550 Commits
Author SHA1 Message Date
liumengyi cca9efbb77 * Finish task #58561. 2022-06-28 10:33:05 +08:00
王怡栋 77d1ab4daf Merge branch 'master' into 'sprint/206_liumengyi_58288'
# Conflicts:
#   db/update17.1.sql
2022-06-23 01:46:35 +00:00
王怡栋 03c76b1565 Merge branch 'master' into 'sprint/206'
# Conflicts:
#   db/update17.1.sql
2022-06-22 07:26:11 +00:00
liumengyi 8f0073050f * Finish task #58288. 2022-06-22 15:23:38 +08:00
liumengyi 2fce450bb8 * Fix bug for task #58063. 2022-06-22 09:54:08 +08:00
mayue d97b5aeb97 * Fix bug #23765. 2022-06-21 13:30:00 +08:00
tianshujie 837849a41a * Finish task #57895. 2022-06-20 14:38:48 +08:00
liyuchun e447ec9a11 * Remove unused code. 2022-06-16 08:57:09 +00:00
孙广明 089662bd5e * Finish task #56629. 2022-06-14 10:20:29 +08:00
tianshujie 450ecef008 * Fix bug #23201. 2022-06-13 10:12:29 +08:00
zhouxudong 94c8b0a523 * Finish task #56374. 2022-06-10 01:32:52 +00:00
leiyong 70ee0323f6 * Fix bug#23487. 2022-06-09 06:48:21 +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
sunjun c4d2cfe200 fixbug_sunjun_sprint194 2022-05-25 03:19:07 +00:00
liumengyi 96785175b6 * Finish story #29765. 2022-05-24 10:52:43 +08:00
liumengyi dfa70c678b * Finish task #54349. 2022-05-17 16:51:19 +08:00
xieqiyu c01b9f54cf * Fix bug#22496. 2022-05-16 16:40:25 +08:00
xieqiyu 5ee54fb81a * Fix bug#22496. 2022-05-16 16:30:24 +08:00
tianshujie b715ecd177 * Finish task #53655. 2022-05-11 11:13:41 +08:00
xieqiyu bcee37d2a9 * Fix bug#6959. 2022-04-14 14:10:09 +08:00
王怡栋 53b0cd0c57 * code for bug #20133. 2022-04-08 11:27:23 +08:00
tianshujie f7fd08aaa3 * Fix bug #20789. 2022-04-01 13:27:26 +08:00
zhouxin 88982a5e0e * Fix bug #15286. 2022-03-30 08:29:20 +00:00
tianshujie 3c25a51bf2 * Fix bug #20738. 2022-03-14 16:59:51 +08:00
tianshujie 937c1a64ab * Fix the problem that professional R&D Kanban does not have permission to view. 2022-03-14 16:49:46 +08:00
王怡栋 7f8d7c6593 * fix bug #20490. 2022-03-11 10:26:33 +08:00
孙广明 fdd36dce95 Merge branch 'sprint/185_zhouxin_49302' into 'sprint/185'
Sprint/185 zhouxin 49302

See merge request easycorp/zentaopms!1874
2022-02-22 01:58:09 +00:00
zhouxin 751fec28e8 Finish task #49302. 2022-02-21 08:53:25 +00:00
xieqiyu 4d3e06bce2 * Finish task#49308. 2022-02-18 14:04:20 +08:00
zenggang 1c667f6e63 * Finish task#48605 2022-02-08 07:44:24 +00:00
caoyanyi b4766914bc * Finish task #48608. 2022-02-08 03:21:20 +00:00
mayue 8d4ee4d242 * Modify permissions. 2022-01-27 10:39:17 +08:00
李玉春 bde3d0ef34 Merge branch 'master' into 'sgm_47983'
# Conflicts:
#   module/kanban/css/common.css
#   module/kanban/css/view.css
2022-01-25 09:16:04 +00:00
liyuchun 555fbaddef Merge branch 'devops20' 2022-01-25 16:55:51 +08:00
liyuchun e9f36e078b * Add auth. 2022-01-25 16:36:43 +08:00
孙广明 e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
zhengrunyu cc299e0b45 Fix bug 18885. 2022-01-24 14:24:19 +08:00
tianshujie 3c7f9cf529 * Add import permission. 2022-01-24 08:54:03 +08:00
孙广明 cfb595e987 Merge branch 'sprint/183_mayue_47998' into 'master'
* Finish task #47998.

See merge request easycorp/zentaopms!1529
2022-01-21 06:00:56 +00:00
mayue 6ba1e7212d * Optimize code. 2022-01-21 13:50:56 +08:00
孙广明 1a136248ba Merge branch 'master' into 'sprint/183_zhouxin_47982'
# Conflicts:
#   module/group/lang/resource.php
#   module/kanban/js/view.js
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2022-01-21 05:47:16 +00:00
mayue aaaefa509c * Optimize code. 2022-01-21 13:32:58 +08:00
zhouxin ac00d73a20 Finish task #47982. 2022-01-21 01:23:30 +00:00
mayue 7b0694844c * Finish task #47998. 2022-01-21 08:32:21 +08:00
王怡栋 a8457f1665 Merge branch 'master' into 'sprint/183_hufangzhou_47986'
# Conflicts:
#   db/update16.2.sql
#   module/group/lang/resource.php
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2022-01-20 08:04:32 +00:00
hufangzhou 9aee0590c5 * Finish task #47986. 2022-01-20 15:52:18 +08:00
liyuchun 7e96eb9f68 Merge branch 'devops19' 2022-01-19 16:55:57 +08:00
tianshujie 1c60beb471 * Finish task #48005. 2022-01-19 16:02:34 +08:00
zenggang f8ef544d94 * Adjust code and fix bugs 2022-01-14 01:54:48 +00:00