 孙广明
|
17aaa5588f
|
Merge branch 'sprint/179_liumengyi_addView' into 'master'
* Add Kanban View.
See merge request easycorp/zentaopms!1090
|
2021-12-23 03:25:49 +00:00 |
|
|
孙广明
|
6736f26abc
|
Merge branch 'sprint/178_songchenxuan_17848' into 'master'
*Fix bug #17848.
See merge request easycorp/zentaopms!1092
|
2021-12-23 03:25:24 +00:00 |
|
|
孙广明
|
919f56ef92
|
Merge branch 'sprint/178_songchenxuan_46100_fixbug' into 'master'
*Fix task #46100 bug.
See merge request easycorp/zentaopms!1093
|
2021-12-23 03:25:07 +00:00 |
|
|
liyuchun
|
48620ee08c
|
Merge branch 'sgm_fixbug'
|
2021-12-23 11:23:34 +08:00 |
|
|
李玉春
|
6eda721a3b
|
Merge branch 'master' into 'sgm_fixbug'
# Conflicts:
# module/kanban/model.php
# module/kanban/view/view.html.php
|
2021-12-23 03:23:07 +00:00 |
|
|
Hao Sun
|
db17670d31
|
* Bug #17663, optimize kanban ui on dragging.
|
2021-12-23 11:09:27 +08:00 |
|
|
孙广明
|
75f14ac945
|
* Fix bugs.
|
2021-12-23 10:56:33 +08:00 |
|
|
songchenxuan
|
ea82e4f855
|
*Fix task #46100 bug.
|
2021-12-23 10:54:40 +08:00 |
|
|
mayue
|
ce6d095ec8
|
* Fix a bug #17854.
|
2021-12-23 10:52:27 +08:00 |
|
|
孙广明
|
2528270fe1
|
Merge branch 'sprint/178_songchenxuan_46100'
|
2021-12-23 10:46:31 +08:00 |
|
|
孙广明
|
7bdb0499e9
|
Merge branch 'master' into 'sprint/178_songchenxuan_46100'
# Conflicts:
# module/productplan/view/batchedit.html.php
# module/productplan/view/browse.html.php
|
2021-12-23 02:46:03 +00:00 |
|
|
孙广明
|
c9c8dd72eb
|
Merge branch 'sprint/179_tianshuje_46242' into 'master'
Sprint/179 tianshuje 46242
See merge request easycorp/zentaopms!1089
|
2021-12-23 02:38:16 +00:00 |
|
|
liumengyi
|
259bfef9d9
|
* Add Kanban View.
|
2021-12-23 10:30:56 +08:00 |
|
|
tianshujie
|
52259ab836
|
* Optimize the details.
|
2021-12-23 10:28:34 +08:00 |
|
|
songchenxuan
|
171b3d0c56
|
*Fix bug #17848.
|
2021-12-23 10:15:47 +08:00 |
|
|
王怡栋
|
49c3e04818
|
Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Fix bug #17811.
See merge request easycorp/zentaopms!1087
|
2021-12-23 02:08:47 +00:00 |
|
|
songchenxuan
|
1d7882d51f
|
*Finish task #46100.
|
2021-12-23 10:06:54 +08:00 |
|
|
liyuchun
|
57deb67041
|
* Fix bug #17811.
|
2021-12-23 10:02:57 +08:00 |
|
|
tianshujie
|
25a2e79f43
|
* Finish task #46242.
|
2021-12-23 09:59:34 +08:00 |
|
|
李玉春
|
f281e35958
|
Merge branch 'sgm_kanbandetail' into 'master'
* Adjust kanban details.
See merge request easycorp/zentaopms!1086
|
2021-12-23 01:59:18 +00:00 |
|
|
孙广明
|
b948b51841
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix the bug caused by personnel deletion.
See merge request easycorp/zentaopms!1085
|
2021-12-23 01:55:38 +00:00 |
|
|
孙广明
|
3ee3458a3b
|
* Adjust kanban details.
|
2021-12-23 09:54:56 +08:00 |
|
|
李玉春
|
a89a51deec
|
Merge branch 'sgm_fixbug' into 'master'
* Fix css.
See merge request easycorp/zentaopms!1084
|
2021-12-23 01:41:25 +00:00 |
|
|
liumengyi
|
04c61d1205
|
* Fix the bug caused by personnel deletion.
|
2021-12-23 09:39:37 +08:00 |
|
|
孙广明
|
2a322567cc
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17822.
See merge request easycorp/zentaopms!1082
|
2021-12-23 01:39:19 +00:00 |
|
|
孙广明
|
31f4e04ad0
|
* Fix css.
|
2021-12-23 09:38:37 +08:00 |
|
|
songchenxuan
|
c0e1f91e9a
|
*Finish task #46100.
|
2021-12-23 09:29:34 +08:00 |
|
|
王怡栋
|
becda9cbe0
|
Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Fix bug #17841,17830.
See merge request easycorp/zentaopms!1083
|
2021-12-23 01:25:26 +00:00 |
|
|
李玉春
|
80455b5ed9
|
Merge branch 'devops17_46005' into 'devops17'
* Code for task#46005
See merge request easycorp/zentaopms!1081
|
2021-12-23 01:23:13 +00:00 |
|
|
liyuchun
|
51d75e0802
|
* Fix bug #17841,17830.
|
2021-12-23 09:20:40 +08:00 |
|
|
liumengyi
|
0a689661f2
|
* Fix bug #17822.
|
2021-12-23 09:20:40 +08:00 |
|
|
孙广明
|
6282b7e066
|
Merge branch 'sprint/179_sunhao/kanban_ui' into 'master'
* Fix kanban columns width.
See merge request easycorp/zentaopms!1073
|
2021-12-23 01:02:58 +00:00 |
|
|
zenggang
|
4c96f9d833
|
* Code for task#46005
|
2021-12-23 01:02:23 +00:00 |
|
|
李玉春
|
36a1c2e6af
|
Merge branch 'devops17_mr_update' into 'devops17'
Devops17 mr update
See merge request easycorp/zentaopms!1075
|
2021-12-23 00:49:55 +00:00 |
|
|
songchenxuan
|
055df23f69
|
*Finish task #46100.
|
2021-12-22 17:32:44 +08:00 |
|
|
李玉春
|
66bf2a0f80
|
Merge branch 'devops17_wangyidong_api' into 'devops17'
* code for mr diff that is from ztool.
See merge request easycorp/zentaopms!1080
|
2021-12-22 09:22:08 +00:00 |
|
|
王怡栋
|
a1406ac51e
|
Merge branch 'sprint/devops17_liyuchun' into 'devops17'
Sprint/devops17 liyuchun
See merge request easycorp/zentaopms!1079
|
2021-12-22 09:20:33 +00:00 |
|
|
王怡栋
|
11dc36d278
|
* code for mr diff that is from ztool.
|
2021-12-22 17:17:11 +08:00 |
|
|
王怡栋
|
40d37f91f9
|
Merge branch 'devops17_caoyanyi_bug' into 'devops17'
* Remove empty.
See merge request easycorp/zentaopms!1078
|
2021-12-22 09:10:44 +00:00 |
|
|
caoyanyi
|
80ce63d880
|
* Remove empty.
|
2021-12-22 09:09:29 +00:00 |
|
|
liyuchun
|
ca30f986e8
|
* Adjust code for api create mr.
|
2021-12-22 17:07:31 +08:00 |
|
|
liyuchun
|
7e59c27945
|
* Adjust api create mr.
|
2021-12-22 16:54:07 +08:00 |
|
|
王怡栋
|
0682282971
|
Merge branch 'sprint/devops17_liyuchun' into 'devops17'
* Code for task #46003.
See merge request easycorp/zentaopms!1077
|
2021-12-22 08:16:40 +00:00 |
|
|
liyuchun
|
e10a7875f7
|
* Adjust code for task #46003.
|
2021-12-22 16:15:49 +08:00 |
|
|
liyuchun
|
cdbff35897
|
* Code for task #46003.
|
2021-12-22 16:12:03 +08:00 |
|
|
zenggang
|
b164538b75
|
* Adjust code
|
2021-12-22 08:11:38 +00:00 |
|
|
李玉春
|
9126094ec3
|
Merge branch 'devops17_17846' into 'devops17'
* Fix bug#17846
See merge request easycorp/zentaopms!1069
|
2021-12-22 08:07:29 +00:00 |
|
|
李玉春
|
483995dca6
|
Merge branch 'sgm_46153' into 'master'
* Fix kanban style.
See merge request easycorp/zentaopms!1076
|
2021-12-22 08:01:49 +00:00 |
|
|
孙广明
|
b8cd9a28dd
|
Merge branch 'sprint/179_zhengrunyu_fixbug'
|
2021-12-22 15:51:42 +08:00 |
|
|
孙广明
|
0d36e78c85
|
* Fix kanban style.
|
2021-12-22 15:51:17 +08:00 |
|