 王怡栋
|
53b0cd0c57
|
* code for bug #20133.
|
2022-04-08 11:27:23 +08:00 |
|
|
孙广明
|
af9545b817
|
Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21403,21474,21410,21414,21417.
See merge request easycorp/zentaopms!2756
|
2022-04-07 07:57:51 +00:00 |
|
|
tanghucheng
|
3d3ffe9348
|
* Fix bug #21403,21474,21410,21414,21417,21456.
|
2022-04-07 15:27:54 +08:00 |
|
|
zenggang
|
2429bc7f6e
|
* Fix bug#20886,16610
|
2022-04-07 01:58:09 +00:00 |
|
|
孙广明
|
ed276fb0fe
|
Merge branch 'master_xieqiyu_20882' into 'master'
* Fix bug#20882.
See merge request easycorp/zentaopms!2743
|
2022-04-02 08:10:56 +00:00 |
|
|
xieqiyu
|
0ab12f5d80
|
* Fix bug#20882.
|
2022-04-02 13:07:33 +08:00 |
|
|
zenggang
|
8c1b36fb3d
|
* Fix bug#13131,16610
|
2022-04-01 07:49:52 +00:00 |
|
|
tianshujie
|
f7fd08aaa3
|
* Fix bug #20789.
|
2022-04-01 13:27:26 +08:00 |
|
|
孙广明
|
2907e3171d
|
Merge branch 'fixbugs_zhouxin_15286' into 'master'
* Fix bug #15286.
See merge request easycorp/zentaopms!2645
|
2022-03-30 09:15:38 +00:00 |
|
|
zhouxin
|
88982a5e0e
|
* Fix bug #15286.
|
2022-03-30 08:29:20 +00:00 |
|
|
tianshujie
|
b452680fb3
|
* Fix bug #14841.
|
2022-03-30 14:48:34 +08:00 |
|
|
王怡栋
|
fe91dc8481
|
Merge branch 'pailei2'
|
2022-03-22 09:01:03 +08:00 |
|
|
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 |
|
|
zhouxin
|
97216edb43
|
Adjust code.
|
2022-03-08 02:47:43 +00:00 |
|
|
zhouxin
|
63a6825b95
|
Fix bug 16448,16449.
|
2022-03-08 02:28:58 +00: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 |
|