 孙广明
|
b09d6a161b
|
Merge branch 'sprint/182_tianshujie_18663' into 'master'
* Fix bug #18663.
See merge request easycorp/zentaopms!1475
|
2022-01-18 06:05:34 +00:00 |
|
|
tianshujie
|
0c1ebe9beb
|
* Fix bug #18663.
|
2022-01-18 14:04:42 +08:00 |
|
|
孙广明
|
820993a452
|
* Add delay.
|
2022-01-18 08:52:13 +08:00 |
|
|
孙广明
|
b01b6a90eb
|
Merge branch 'kanban'
|
2022-01-17 10:34:08 +08:00 |
|
|
孙广明
|
758c03968f
|
* Add kanban type in query.
|
2022-01-17 08:41:59 +08:00 |
|
|
liumengyi
|
0167541bb4
|
* Add move card for execution-kanban.
|
2022-01-14 15:00:36 +08:00 |
|
|
hufangzhou
|
97308d9d09
|
* Adjust the moveCards function.
|
2022-01-14 08:14:54 +08:00 |
|
|
tianshujie
|
b8321c127a
|
* Finish task #47353.
|
2022-01-13 10:10:30 +08:00 |
|
|
孙广明
|
ff650dd8fb
|
Merge branch 'sprint/182_tianshujie_47352' into 'kanban'
* Finish task #47352.
See merge request easycorp/zentaopms!1369
|
2022-01-13 01:47:50 +00:00 |
|
|
tianshujie
|
940587e1ca
|
* Finish task #47352.
|
2022-01-13 09:44:07 +08:00 |
|
|
王怡栋
|
69ca909802
|
Merge branch 'sgm_kanban' into 'kanban'
Sgm kanban
See merge request easycorp/zentaopms!1365
|
2022-01-12 08:50:10 +00:00 |
|
|
孙广明
|
16b6264a75
|
* Refactor kanban code.
|
2022-01-12 16:34:01 +08:00 |
|
|
tianshujie
|
8b22fdcabc
|
* Finish task #47336,47344,47345.
|
2022-01-12 16:28:16 +08:00 |
|
|
tianshujie
|
e19602194a
|
* Modify the editing project error problem.
|
2022-01-12 10:30:55 +08:00 |
|
|
tianshujie
|
d20ba7265b
|
* Modify the code logic.
|
2022-01-11 21:23:16 +08:00 |
|
|
tianshujie
|
9faee43d47
|
* Modify default value.
|
2022-01-11 17:07:40 +08:00 |
|
|
tianshujie
|
aca23db346
|
* Finish task #47358.
|
2022-01-11 17:02:17 +08:00 |
|
|
tianshujie
|
378abd8527
|
* Modify variable name.
|
2022-01-11 10:09:40 +08:00 |
|
|
tianshujie
|
4a5ec8d84b
|
* Modify variable name.
|
2022-01-11 10:06:47 +08:00 |
|
|
tianshujie
|
fc081f1d21
|
* Modify the code logic.
|
2022-01-11 10:03:22 +08:00 |
|
|
tianshujie
|
eac960afe5
|
* Fix bug #47314.
|
2022-01-11 09:38:21 +08:00 |
|
|
liumengyi
|
8425897a08
|
* Fix bug #17939.
|
2021-12-24 17:25:16 +08:00 |
|
|
tianshujie
|
ff3a24fdbb
|
* Fix bug #17928.
|
2021-12-24 11:18:22 +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 |
|
|
tianshujie
|
63210497d3
|
* Fix bug #17785,#17743.
|
2021-12-23 11:43:04 +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 |
|
|
孙广明
|
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 |
|
|
tianshujie
|
25a2e79f43
|
* Finish task #46242.
|
2021-12-23 09:59:34 +08:00 |
|
|
liumengyi
|
04c61d1205
|
* Fix the bug caused by personnel deletion.
|
2021-12-23 09:39:37 +08:00 |
|
|
liumengyi
|
0a689661f2
|
* Fix bug #17822.
|
2021-12-23 09:20:40 +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 |
|
|
孙广明
|
0d36e78c85
|
* Fix kanban style.
|
2021-12-22 15:51:17 +08:00 |
|
|
liumengyi
|
12b292b157
|
* Fix bug #17822.
|
2021-12-22 15:10:45 +08:00 |
|
|
孙广明
|
75a3d20358
|
Merge branch 'master' into 'sprint/179_tianshujie_46241'
# Conflicts:
# module/group/lang/resource.php
# module/kanban/css/space.css
# module/kanban/js/view.js
|
2021-12-22 06:03:21 +00:00 |
|
|
tianshujie
|
dab44100d5
|
* Finish task #46241.
|
2021-12-22 13:16:32 +08:00 |
|
|
孙广明
|
08c7f0cc50
|
* Finish task #46161.
|
2021-12-22 10:31:43 +08:00 |
|
|
liumengyi
|
b8166358ad
|
* Finish task #46244, #46243.
|
2021-12-21 13:46:31 +08:00 |
|
|
孙广明
|
e1a6381454
|
Merge branch 'sprint/179_liumengyi_46156' into 'master'
* Finish task #46156.
See merge request easycorp/zentaopms!1016
|
2021-12-21 00:44:25 +00:00 |
|
|
liumengyi
|
8712f7640a
|
* Finish task #46156.
|
2021-12-21 08:37:40 +08:00 |
|
|
孙广明
|
54b712feed
|
Merge branch 'master' into 'sprint/179_tianshujie_46157'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-20 08:46:31 +00:00 |
|
|
tianshujie
|
442fbdad44
|
* Finish task #46157.
|
2021-12-20 14:42:06 +08:00 |
|
|
liumengyi
|
14c584555e
|
* Add function comments.
|
2021-12-20 14:35:36 +08:00 |
|
|
liumengyi
|
6fadc5c013
|
* Finish task #46155.
|
2021-12-20 14:29:55 +08:00 |
|
|
孙广明
|
177c9b158f
|
Merge branch 'sprint/179_tianshujie_46151' into 'kanban'
Sprint/179 tianshujie 46151
See merge request easycorp/zentaopms!991
|
2021-12-20 02:41:05 +00:00 |
|
|
孙广明
|
ab43352a90
|
Merge branch 'sprint/179_zhengrunyu_46159' into 'kanban'
Sprint/179 zhengrunyu 46159
See merge request easycorp/zentaopms!987
|
2021-12-20 01:35:14 +00:00 |
|
|
zhengrunyu
|
08b8e71727
|
*Finish
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
cc7c03b834
|
* Fix code details.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
7fb096c451
|
* Finish task #46164.
|
2021-12-20 09:32:34 +08:00 |
|
|
孙广明
|
1c61b2a759
|
Merge branch 'kanban' into 'sprint/179_liumengyi_46158'
# Conflicts:
# module/kanban/js/view.js
|
2021-12-20 00:53:10 +00:00 |
|