 zhujinyong
|
d065d6077b
|
* Adjust index page of api.
|
2021-12-23 13:27:41 +08:00 |
|
|
zhujinyong
|
f384cdfb1b
|
* Fix style of api.
|
2021-12-23 13:21:18 +08:00 |
|
|
孙广明
|
c6ee25fa52
|
Merge branch 'sprint/178_mayue_17581' into 'master'
* Fix a bug #17581.
See merge request easycorp/zentaopms!1101
|
2021-12-23 05:21:01 +00:00 |
|
|
孙广明
|
105c1ac726
|
Merge branch 'sprint/178_mayue_17854' into 'master'
* Fix a bug #17854.
See merge request easycorp/zentaopms!1091
|
2021-12-23 05:20:39 +00:00 |
|
|
mayue
|
b94fc62ca1
|
* Fix a bug #17581.
|
2021-12-23 13:16:30 +08:00 |
|
|
孙广明
|
a3b4bc8cd9
|
Merge branch 'sprint/178_hufangzhou_17875' into 'master'
* Fix bug #17875.
See merge request easycorp/zentaopms!1100
|
2021-12-23 05:07:26 +00:00 |
|
|
孙广明
|
9a2a490e30
|
Merge branch 'sprint/179_tianshujie_bug'
|
2021-12-23 13:07:08 +08:00 |
|
|
孙广明
|
9bfb3c1377
|
Merge branch 'master' into 'sprint/179_tianshujie_bug'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-23 05:06:50 +00:00 |
|
|
hufangzhou
|
995e01680e
|
* Fix bug #17875.
|
2021-12-23 13:06:18 +08:00 |
|
|
孙广明
|
f0342c9745
|
Merge branch 'sprint/179_zhengrunyu_Fixbug' into 'master'
*Fix card
See merge request easycorp/zentaopms!1098
|
2021-12-23 04:18:26 +00:00 |
|
|
孙广明
|
4e6fe7ffd0
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug for move card.
See merge request easycorp/zentaopms!1099
|
2021-12-23 04:17:26 +00:00 |
|
|
liumengyi
|
fb904ff0d4
|
* Fix bug for move card.
|
2021-12-23 12:09:18 +08:00 |
|
|
zhengrunyu
|
5e07624939
|
*Fix card
|
2021-12-23 12:00:42 +08:00 |
|
|
tianshujie
|
63210497d3
|
* Fix bug #17785,#17743.
|
2021-12-23 11:43:04 +08:00 |
|
|
孙广明
|
f5da2d8a21
|
Merge branch 'sprint/178_hufangzhou_mergeBranch' into 'master'
* Finish task #46096.
See merge request easycorp/zentaopms!1095
|
2021-12-23 03:32:01 +00:00 |
|
|
hufangzhou
|
e1075ca205
|
* Finish task #46096.
|
2021-12-23 11:29:51 +08:00 |
|
|
孙广明
|
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 |
|
|
孙广明
|
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 |
|
|
songchenxuan
|
1d7882d51f
|
*Finish task #46100.
|
2021-12-23 10:06:54 +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 |
|
|
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 |
|
|
songchenxuan
|
055df23f69
|
*Finish task #46100.
|
2021-12-22 17:32:44 +08: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 |
|
|
孙广明
|
453145af31
|
Merge branch 'master' into 'sprint/179_zhengrunyu_fixbug'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-22 07:51:02 +00:00 |
|
|
孙广明
|
ea15a6c2ed
|
Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17822.
See merge request easycorp/zentaopms!1068
|
2021-12-22 07:49:57 +00:00 |
|
|
孙广明
|
ded871aa6f
|
Merge branch 'sprint/31_zhouxin_17711' into 'master'
Sprint/31 zhouxin 17711
See merge request easycorp/zentaopms!1066
|
2021-12-22 07:49:40 +00:00 |
|
|
孙广明
|
83c8385b69
|
Merge branch 'sprint/31_zhouxin_17665' into 'master'
Fix bug #17665.
See merge request easycorp/zentaopms!1074
|
2021-12-22 07:48:35 +00:00 |
|