 zhujinyong
|
ec8b31e847
|
Merge branch 'sprint/169' of https://gitlab.zcorp.cc/easycorp/zentaopms into 169
|
2021-10-27 11:06:45 +08:00 |
|
|
孙广明
|
1275fa87cd
|
Merge branch 'sprint/169_tanghucheng_43557' into 'sprint/169'
Finish task #43557
See merge request easycorp/zentaopms!170
|
2021-10-27 02:29:46 +00:00 |
|
|
孙广明
|
1007936087
|
Merge branch 'sprint/169_wangjingbo_43541' into 'sprint/169'
Sprint/169 wangjingbo 43541
See merge request easycorp/zentaopms!157
|
2021-10-27 02:29:25 +00:00 |
|
|
孙广明
|
5cec976a63
|
Merge branch 'sprint/169_zhouxin_43561' into 'sprint/169'
Sprint/169 zhouxin 43561
See merge request easycorp/zentaopms!160
|
2021-10-27 02:28:04 +00:00 |
|
|
tanghucheng
|
554214895b
|
* Finish task #43557
|
2021-10-27 10:26:23 +08:00 |
|
|
tanghucheng
|
a6544b38ed
|
* Finish task #43557.
|
2021-10-27 10:05:51 +08:00 |
|
|
李玉春
|
e565ab289a
|
Merge branch 'sprint/169_mayue_15712' into 'sprint/169'
*Fix a bug #15712
See merge request easycorp/zentaopms!164
|
2021-10-27 00:57:38 +00:00 |
|
|
mayue
|
131b428d20
|
*Fix a bug #15712
|
2021-10-26 18:20:14 +08:00 |
|
|
zhouxin
|
396d267729
|
Finish task #43561.
|
2021-10-26 16:00:50 +08:00 |
|
|
孙广明
|
7ad0747fd6
|
Merge branch 'sprint/168_zenggang' into 'sprint/168'
* Fix menu pri judge
See merge request easycorp/zentaopms!159
|
2021-10-26 07:57:05 +00:00 |
|
|
孙广明
|
d48c8c0d5a
|
Merge branch 'sprint/168_sunhao/kanban_demo' into sprint/168
|
2021-10-26 15:56:09 +08:00 |
|
|
孙广明
|
fb5687c6a4
|
Merge branch 'sprint/168' into 'sprint/168_sunhao/kanban_demo'
# Conflicts:
# module/execution/js/kanban.js
# module/execution/view/kanban.html.php
|
2021-10-26 07:53:38 +00:00 |
|
|
zenggang
|
1da7061d7a
|
* Fix menu pri judge
|
2021-10-26 07:49:56 +00:00 |
|
|
Hao Sun
|
0063ed7950
|
* replace kanban with kanbandemo.
|
2021-10-26 15:47:50 +08:00 |
|
|
wangjingbo
|
706128a141
|
* Finish task #43541.
|
2021-10-26 15:39:25 +08:00 |
|
|
Hao Sun
|
b6f3608ab4
|
* change kanban page width to full size.
|
2021-10-26 15:38:00 +08:00 |
|
|
王怡栋
|
014bf4f068
|
Merge branch 'sprint/169_liugang_bug' into 'sprint/169'
Remove the outdated code and fix return value.
See merge request easycorp/zentaopms!152
|
2021-10-26 07:31:50 +00:00 |
|
|
孙广明
|
dd2657b9a1
|
Merge branch 'spring/169/xiawenlong' into 'sprint/169'
Spring/169/xiawenlong
See merge request easycorp/zentaopms!156
|
2021-10-26 07:31:25 +00:00 |
|
|
孙广明
|
e2d368f251
|
Merge branch 'sprint/168_liyuchun_43519' into 'sprint/168'
Sprint/168 liyuchun 43519
See merge request easycorp/zentaopms!155
|
2021-10-26 07:31:02 +00:00 |
|
|
xiawenlong
|
d4f7c938c1
|
rollback code.
|
2021-10-26 15:26:05 +08:00 |
|
|
liyuchun
|
c45866a3a3
|
* Code for task #43519.
|
2021-10-26 15:24:09 +08:00 |
|
|
李玉春
|
0458578361
|
Merge branch 'sprint/168_sgm_kanban' into 'sprint/168'
* Add kanban view.
See merge request easycorp/zentaopms!154
|
2021-10-26 07:16:12 +00:00 |
|
|
李玉春
|
c7f185503c
|
Merge branch 'sprint/169_mayue_15739' into 'sprint/169'
*Fix a bug #15739
See merge request easycorp/zentaopms!150
|
2021-10-26 07:12:32 +00:00 |
|
|
孙广明
|
354061c768
|
Merge branch 'sprint/169_tanghucheng_43549' into 'sprint/169'
Finish task #43549
See merge request easycorp/zentaopms!151
|
2021-10-26 07:10:17 +00:00 |
|
|
孙广明
|
ad05f1d4cf
|
* Add kanban view.
|
2021-10-26 15:03:27 +08:00 |
|
|
mayue
|
fdc33354fc
|
*Fix a bug #15739
|
2021-10-26 15:01:14 +08:00 |
|
|
liugang
|
c884f07868
|
* Remove the outdated code.
|
2021-10-26 14:56:48 +08:00 |
|
|
liugang
|
dd729bb202
|
* Fix return value.
|
2021-10-26 14:55:15 +08:00 |
|
|
Hao Sun
|
cc3fb38f50
|
* fix maxCount not show in kanban header.
|
2021-10-26 14:55:12 +08:00 |
|
|
Hao Sun
|
f5420202e2
|
* remove width limit in kanban page.
|
2021-10-26 14:54:57 +08:00 |
|
|
Hao Sun
|
43d52ddb9b
|
* improve style for affixed header in kanban.
|
2021-10-26 14:54:16 +08:00 |
|
|
李玉春
|
28dcdf4449
|
Merge branch 'sprint/168_tianshujie_43426' into 'sprint/168'
* Correct Kanban data.
See merge request easycorp/zentaopms!147
|
2021-10-26 06:49:35 +00:00 |
|
|
mayue
|
4e082eb883
|
*Fix a bug #15739
|
2021-10-26 14:48:54 +08:00 |
|
|
tanghucheng
|
aa9aeb37b0
|
* Finish task #43549.
|
2021-10-26 14:48:32 +08:00 |
|
|
liyuchun
|
0dc857f2bb
|
* Code for task #43519.
|
2021-10-26 14:38:00 +08:00 |
|
|
mayue
|
17118b4595
|
*Fix a bug #15739
|
2021-10-26 14:37:42 +08:00 |
|
|
tianshujie
|
4d09ade9cb
|
* Get card data of kanban column.
|
2021-10-26 14:37:39 +08:00 |
|
|
xiawenlong
|
9edd374612
|
* Finish task #43551.
|
2021-10-26 14:06:45 +08:00 |
|
|
tianshujie
|
83a1e66eab
|
* Adjust code.
|
2021-10-26 13:35:02 +08:00 |
|
|
zhouxin
|
b28abf1c4c
|
Finish task#43538.
|
2021-10-26 13:02:12 +08:00 |
|
|
tianshujie
|
f8447c9825
|
* Correct Kanban data.
|
2021-10-26 11:46:33 +08:00 |
|
|
Hao Sun
|
920b8234a3
|
+ add kanban demo files.
|
2021-10-26 11:42:23 +08:00 |
|
|
李玉春
|
ff8f020485
|
Merge branch 'sprint/168_tianshujie_43426' into 'sprint/168'
* Refactoring the Kanban function.
See merge request easycorp/zentaopms!145
|
2021-10-26 02:51:13 +00:00 |
|
|
tianshujie
|
4a2b7dae24
|
* Add comment of kanban model.php
|
2021-10-26 10:49:42 +08:00 |
|
|
tanghucheng
|
a577f54958
|
* Finish task #43557.
|
2021-10-26 10:45:49 +08:00 |
|
|
李玉春
|
5f286affd8
|
Merge branch 'sprint/168_dingna_api' into 'sprint/168'
* Add testcase of product.
See merge request easycorp/zentaopms!140
|
2021-10-26 02:28:59 +00:00 |
|
|
tianshujie
|
a71cacdaa8
|
* Refactoring the Kanban function.
|
2021-10-26 10:25:33 +08:00 |
|
|
xiawenlong
|
58116c1bbc
|
* Finish task #43543.
|
2021-10-26 10:06:38 +08:00 |
|
|
王怡栋
|
b77f8474c3
|
Merge branch 'sprint/168_liugang_bug' into 'sprint/168'
* Remove the outdated code.
See merge request easycorp/zentaopms!143
|
2021-10-25 09:07:40 +00:00 |
|
|
liugang
|
f860008e56
|
* Remove the outdated code.
|
2021-10-25 16:18:48 +08:00 |
|