 孙广明
|
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 |
|
|
孙广明
|
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 |
|
|
孙广明
|
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 |
|
|
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 |
|
|
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 |
|
|
tianshujie
|
25ee419afc
|
* Implement the partial refresh function of the task card.
|
2022-01-20 15:31:10 +08:00 |
|
|
王怡栋
|
beaed8f006
|
Merge branch 'sprint/183_liumengyi_48011' into 'master'
* Finish task #48011.
See merge request easycorp/zentaopms!1519
|
2022-01-20 06:56:11 +00:00 |
|
|
liumengyi
|
df8366e1ad
|
* Modify code format.
|
2022-01-20 14:55:06 +08:00 |
|
|
liumengyi
|
e2e794c27f
|
* Finish task #48011.
|
2022-01-20 14:49:16 +08:00 |
|
|
王怡栋
|
6cf1ba1cf4
|
Merge branch 'revert-98d5844e' into 'master'
Revert "Merge branch 'devops_caoyanyi' into 'master'"
See merge request easycorp/zentaopms!1517
|
2022-01-20 06:07:56 +00:00 |
|
|
王怡栋
|
49cf88b669
|
Merge branch 'sprint/183_tianshujie_48012' into 'master'
* Achieve smooth refresh of completed tasks.
See merge request easycorp/zentaopms!1516
|
2022-01-20 05:50:27 +00:00 |
|
|
tianshujie
|
7383bb566d
|
* Modify the question.
|
2022-01-20 13:49:21 +08:00 |
|
|
李玉春
|
39e8a3fae7
|
Revert "Merge branch 'devops_caoyanyi' into 'master'"
This reverts merge request !1515
|
2022-01-20 05:42:05 +00:00 |
|
|
李玉春
|
98d5844e64
|
Merge branch 'devops_caoyanyi' into 'master'
* Modify page error.
See merge request easycorp/zentaopms!1515
|
2022-01-20 05:41:54 +00:00 |
|
|
tianshujie
|
ee15a96157
|
* Achieve smooth refresh of completed tasks.
|
2022-01-20 13:41:20 +08:00 |
|
|
caoyanyi
|
f87294adf7
|
* Modify page error.
|
2022-01-20 05:37:33 +00:00 |
|
|
王怡栋
|
438f0348a6
|
Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Remove acl icon.
See merge request easycorp/zentaopms!1513
|
2022-01-20 05:03:54 +00:00 |
|
|
王怡栋
|
abf1d172a6
|
Merge branch 'sprint/183_liumengyi_47977' into 'master'
* Finish task #48006, #48007.
See merge request easycorp/zentaopms!1512
|
2022-01-20 03:22:28 +00:00 |
|
|
liumengyi
|
00f08fc3cd
|
* Remove acl icon.
|
2022-01-20 11:22:14 +08:00 |
|
|
liumengyi
|
2d6226093e
|
* Modify involved kanban judgment.
|
2022-01-20 11:19:27 +08:00 |
|
|
王怡栋
|
2f6dc0b378
|
Merge branch 'sprint/183_tianshujie_bug' into 'master'
* Fix bug #18783,18780.
See merge request easycorp/zentaopms!1511
|
2022-01-20 03:18:00 +00:00 |
|
|
tianshujie
|
b22eed4a6d
|
* Fix bug #18783,18780.
|
2022-01-20 11:15:33 +08:00 |
|