 zhengrunyu
|
cc299e0b45
|
Fix bug 18885.
|
2022-01-24 14:24:19 +08:00 |
|
|
zhengrunyu
|
9fd9fcceb1
|
*Fix bug
|
2022-01-24 09:38:26 +08:00 |
|
|
zhengrunyu
|
cff61e144d
|
*Fix bug
|
2022-01-24 09:32:24 +08:00 |
|
|
孙广明
|
3b100b47d2
|
Merge branch 'master' into 'sprint/183_zhengrunyu_48003'
# Conflicts:
# module/kanban/lang/en.php
# module/kanban/lang/zh-cn.php
# module/kanban/model.php
|
2022-01-24 01:26:45 +00:00 |
|
|
zhengrunyu
|
18b70fac64
|
*Finish task 47997 48003.
|
2022-01-24 09:22:56 +08:00 |
|
|
zhengrunyu
|
ea3c1dd61b
|
*Finish task 47997 48003.
|
2022-01-24 09:12:19 +08:00 |
|
|
zhengrunyu
|
87463359ec
|
*Finish task 47997 48003.
|
2022-01-24 09:02:29 +08:00 |
|
|
zhengrunyu
|
b323508a0b
|
*Finish task 47997 48003.
|
2022-01-24 08:56:29 +08:00 |
|
|
tianshujie
|
3c7f9cf529
|
* Add import permission.
|
2022-01-24 08:54:03 +08:00 |
|
|
zhengrunyu
|
38f3b30b4e
|
*Finish task 47997 48003.
|
2022-01-24 08:53:14 +08:00 |
|
|
zhengrunyu
|
23c9ebab65
|
*Finish task 47997 48003.
|
2022-01-24 08:47:23 +08:00 |
|
|
zhengrunyu
|
f06c5c5e30
|
*Finish task 47997 48003.
|
2022-01-24 08:36:25 +08:00 |
|
|
孙广明
|
b2342fd7fb
|
Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug for task#47976.
See merge request easycorp/zentaopms!1545
|
2022-01-21 09:28:59 +00:00 |
|
|
liumengyi
|
e34ea32b16
|
* Fix bug for task#47976.
|
2022-01-21 17:27:40 +08:00 |
|
|
tianshujie
|
78dc1af6bd
|
* Modify the format.
|
2022-01-21 15:40:56 +08:00 |
|
|
tianshujie
|
3f15a1e016
|
* Fix bug #18806.
|
2022-01-21 15:04:25 +08:00 |
|
|
tianshujie
|
2e030b874c
|
* Fix bug #18806.
|
2022-01-21 14:59:21 +08:00 |
|
|
王怡栋
|
9e50180887
|
Merge branch 'sgm_fixbug' into 'master'
* Delete unused lang.
See merge request easycorp/zentaopms!1541
|
2022-01-21 06:36:02 +00:00 |
|
|
孙广明
|
7e250dfaee
|
Merge branch 'xieqiyu_fixbug_18792' into 'master'
* Fix bug#18792.
See merge request easycorp/zentaopms!1520
|
2022-01-21 06:35:15 +00:00 |
|
|
孙广明
|
a2477a59bf
|
* Delete unused lang.
|
2022-01-21 14:33:58 +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 |
|
|
孙广明
|
c40034f942
|
Merge branch 'master' into 'sprint/183_liumengyi_fixbug'
# Conflicts:
# module/execution/js/kanban.js
|
2022-01-21 05:57:10 +00:00 |
|
|
mayue
|
ecef85b7f7
|
* Add a file.
|
2022-01-21 13:54:33 +08:00 |
|
|
mayue
|
6ba1e7212d
|
* Optimize code.
|
2022-01-21 13:50:56 +08:00 |
|
|
liumengyi
|
80da12fc7d
|
* Finish task#48008 and fix bug for 48011.
|
2022-01-21 13:49:47 +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 |
|
|
zhouxin
|
6041f71d99
|
Adjust code.
|
2022-01-21 05:44:18 +00:00 |
|
|
zhouxin
|
2d6115537f
|
Fix bug.
|
2022-01-21 05:35:35 +00:00 |
|
|
mayue
|
aaaefa509c
|
* Optimize code.
|
2022-01-21 13:32:58 +08:00 |
|
|
孙广明
|
262c93b714
|
Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug for task #47976.
See merge request easycorp/zentaopms!1536
|
2022-01-21 05:28:30 +00:00 |
|
|
tianshujie
|
dfddd4e48b
|
* Modify the code.
|
2022-01-21 13:19:02 +08:00 |
|
|
tianshujie
|
fe23db6218
|
* Finish task #48012.
|
2022-01-21 12:23:38 +08:00 |
|
|
liumengyi
|
d0739e40e3
|
* Fix bug for task #47976.
|
2022-01-21 12:16:16 +08:00 |
|
|
zhengrunyu
|
9b500daa08
|
*Finish task 47997 48003.
|
2022-01-21 11:21:52 +08:00 |
|
|
孙广明
|
8c2bd2386d
|
Merge branch 'sprint/183_liumengyi_48012_bug' into 'master'
* Finish task #48012.
See merge request easycorp/zentaopms!1535
|
2022-01-21 02:52:33 +00:00 |
|
|
liumengyi
|
039437a741
|
* Modify bug smooth refresh variable.
|
2022-01-21 10:49:54 +08:00 |
|
|
zhouxin
|
7cb49dd86b
|
Fix bug.
|
2022-01-21 02:46:05 +00:00 |
|
|
孙广明
|
58c0c34a65
|
Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug for edit kanban.
See merge request easycorp/zentaopms!1527
|
2022-01-21 02:44:31 +00:00 |
|
|
liumengyi
|
02c47ead7c
|
* Finish task #48012.
|
2022-01-21 10:39:54 +08:00 |
|
|
朱金勇
|
bcd35e6ca6
|
Merge branch 'sprint/scx_reportlang' into 'master'
*Report lang.
See merge request easycorp/zentaopms!1530
|
2022-01-21 01:44:39 +00:00 |
|
|
朱金勇
|
7531adfb82
|
Merge branch 'sprint/183_zhouxudong_trans47958' into 'master'
*Finish task #47958.
See merge request easycorp/zentaopms!1531
|
2022-01-21 01:44:08 +00:00 |
|
|
zhouxin
|
19be4266e8
|
Fix lang.
|
2022-01-21 01:30:39 +00:00 |
|
|
zhouxin
|
ac00d73a20
|
Finish task #47982.
|
2022-01-21 01:23:30 +00:00 |
|
|
孙广明
|
9011d2f61b
|
Merge branch 'sprint/183_tianshujie_48012' into 'master'
Sprint/183 tianshujie 48012
See merge request easycorp/zentaopms!1528
|
2022-01-21 01:16:16 +00:00 |
|
|
songchenxuan
|
1993f8ec27
|
*Report lang.
|
2022-01-21 09:08:45 +08:00 |
|
|
zhouxudong
|
d19df00d0b
|
*Finish task #47958.
|
2022-01-21 09:07:28 +08:00 |
|
|
tianshujie
|
d38bb533b9
|
* Restore code.
|
2022-01-21 09:02:16 +08:00 |
|
|
tianshujie
|
c3ca6cf370
|
* Remove useless code.
|
2022-01-21 08:48:59 +08:00 |
|
|
刘梦艺
|
d980d5132d
|
Update control.php
|
2022-01-21 00:46:28 +00:00 |
|
|
liumengyi
|
04f89dd9ba
|
* Fix bug for edit kanban.
|
2022-01-21 08:44:11 +08:00 |
|