 孙广明
|
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 |
|
|
孙广明
|
ea05b6185c
|
Merge branch 'sprint/183_liumengyi_fixbug'
|
2022-01-21 13:57:34 +08: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 |
|
|
孙广明
|
a82d786dde
|
Merge branch 'sprint/183_zhouxin_47982'
|
2022-01-21 13:47:35 +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 |
|
|
孙广明
|
47b2a35290
|
Merge branch 'sprint/183_tianshujie_js' into 'master'
* Finish task #48012.
See merge request easycorp/zentaopms!1537
|
2022-01-21 05:21:17 +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 |
|
|
孙广明
|
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 |
|
|
朱金勇
|
d2d48c063a
|
Merge branch 'sprint/scx_xuanxuan_lang' into 'master'
*Xuanxuan lang.
See merge request easycorp/zentaopms!1532
|
2022-01-21 01:45:34 +00: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 |
|
|
songchenxuan
|
9da1c180f2
|
*Xuanxuan lang.
|
2022-01-21 09:21:16 +08: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 |
|
|
孙广明
|
8583027a92
|
Merge branch 'sprint/183_liumengyi_fixbug' into 'master'
* Fix bug for create kanban.
See merge request easycorp/zentaopms!1526
|
2022-01-21 00:41:10 +00:00 |
|
|
liumengyi
|
ec1f0876aa
|
* Fix bug for create kanban.
|
2022-01-21 08:38:38 +08:00 |
|
|
mayue
|
7b0694844c
|
* Finish task #47998.
|
2022-01-21 08:32:21 +08:00 |
|
|
tianshujie
|
bd99d3def9
|
* Realize the partial refresh function of the story card.
|
2022-01-20 17:35:49 +08:00 |
|
|
王怡栋
|
07107f982f
|
Merge branch 'sprint/183_liumengyi_48012_bug' into 'master'
* Finish task #48012.Add the bug smooth refresh of create, batchcreate, confiremBug,resolve.
See merge request easycorp/zentaopms!1524
|
2022-01-20 09:23:32 +00:00 |
|
|
liumengyi
|
445a26f81e
|
* Modify code format.
|
2022-01-20 17:22:10 +08:00 |
|
|
liumengyi
|
3ec206f626
|
* Finish task #48012.Add the bug smooth refresh of create, batchcreate, confiremBug,resolve.
|
2022-01-20 17:07:03 +08:00 |
|
|
王怡栋
|
01a746992d
|
Merge branch 'sprint/183_liumengyi_48008' into 'master'
* Fix bug for move card.
See merge request easycorp/zentaopms!1522
|
2022-01-20 08:07:21 +00:00 |
|
|
王怡栋
|
6f024ee236
|
Merge branch 'sprint/183_hufangzhou_47986'
|
2022-01-20 16:06:10 +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 |
|
|
liumengyi
|
a6e3dbc371
|
* Fix bug for mova card.
|
2022-01-20 15:39:47 +08:00 |
|
|
朱金勇
|
fc7302c5ce
|
Merge branch 'sprint/183_zhouxudong_trans47956' into 'master'
*Finish task #47956.
See merge request easycorp/zentaopms!1502
|
2022-01-20 07:38:21 +00:00 |
|
|
朱金勇
|
1ce16c8e3a
|
Merge branch 'sprint/scx_international' into 'master'
Sprint/scx international
See merge request easycorp/zentaopms!1499
|
2022-01-20 07:38:04 +00:00 |
|
|
朱金勇
|
399fac5edc
|
Merge branch 'sprint/scx_lang' into 'master'
*Code lang for international ZenTao.
See merge request easycorp/zentaopms!1521
|
2022-01-20 07:37:10 +00:00 |
|
|
songchenxuan
|
4ce9f83f06
|
*Code lang for international ZenTao.
|
2022-01-20 15:33:12 +08:00 |
|