Commit Graph

1008 Commits

Author SHA1 Message Date
tanghucheng
b9542612cb * Fix bug. 2022-03-16 09:51:36 +08:00
tanghucheng
9cffc3bcf7 * Fix bug #20754,20776,20759. 2022-03-15 11:13:26 +08: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
孙华伟
664da372f1 *Fix bug #20279 2022-03-04 16:23:51 +08:00
孙广明
df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
孙广明
f9ed1e1dd9 * Fix group bug. 2022-02-24 15:41:12 +08:00
songchenxuan
f8bd597b39 *Privilage css. 2022-02-22 14:37:38 +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
zhujinyong
b17c3c8206 * Move die to return print. 2022-02-22 08:42:32 +08: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
zhujinyong
5bd64d9312 Merge branch 'lite' into sprint/185 2022-02-17 08:56:40 +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
Wenrui LI
9b78d18465 * tweak group and privs for lite vision, task #47917,47916. 2022-01-19 16:45:58 +08:00
tianshujie
1c60beb471 * Finish task #48005. 2022-01-19 16:02:34 +08:00
孙广明
b01b6a90eb Merge branch 'kanban' 2022-01-17 10:34:08 +08:00
zenggang
f8ef544d94 * Adjust code and fix bugs 2022-01-14 01:54:48 +00:00
zhangrunyu
39e30fc64f Fix compatibility with PHP 5.4 2022-01-13 10:14:15 +08:00
zenggang
eb500460e5 * Finish task#47229,47231 2022-01-12 09:04:38 +00:00
liyuchun
c5aaae3eb8 * Finish task #47233. 2022-01-12 14:16:34 +08:00
zenggang
8f5032d898 * Finish task#47228 2022-01-12 02:41:27 +00:00
tianshujie
aca23db346 * Finish task #47358. 2022-01-11 17:02:17 +08:00
liumengyi
ec74445096 * Finish task #47340.When adding kanban execution, create region, group, lanes and columns. 2022-01-11 15:38:50 +08:00
caoyanyi
8dff489e72 * Finish task #47224. 2022-01-11 02:50:35 +00:00
孙广明
c8db935f34 Merge branch '180' 2022-01-04 22:41:23 +08:00
liyuchun
c2da5eefe2 Merge branch 'devops18' 2021-12-31 10:38:04 +08:00
liyuchun
55c7c7e848 * Fix bug #18078. 2021-12-30 16:13:40 +08:00
liyuchun
adac3aefdf * Finish task #46544. 2021-12-30 14:19:28 +08:00
zenggang
bfde525f13 * Finish task#46555 2021-12-30 03:08:42 +00:00
liumengyi
50efcdf342 * Finish task #46661. 2021-12-28 15:59:57 +08:00
zenggang
7713ab8f29 * Finish task#46554 2021-12-28 07:00:36 +00:00