 李玉春
|
c97af049d8
|
Merge branch 'sprint/171_sgm_43948' into 'spirnt/168_liyuchun_bug'
Sprint/171 sgm 43948
See merge request easycorp/zentaopms!346
|
2021-11-08 09:04:11 +00:00 |
|
|
liyuchun
|
bddeb2d5b2
|
* Remove more button in group lane.
|
2021-11-08 16:50:12 +08:00 |
|
|
孙广明
|
870b311f06
|
* Fix errors.
|
2021-11-08 16:32:18 +08:00 |
|
|
孙广明
|
3d00ecc5b0
|
* Fix an error.
|
2021-11-08 15:48:58 +08:00 |
|
|
孙广明
|
1f49e46582
|
* Finish task #43948.
|
2021-11-08 14:29:10 +08:00 |
|
|
holan20180123
|
3f01755d1b
|
* Fix error of kanban session.
|
2021-11-07 20:48:04 +08:00 |
|
|
holan20180123
|
30b0c8db07
|
* Finish task #43938,#43939.
|
2021-11-07 20:31:28 +08:00 |
|
|
liyuchun
|
28027af1b0
|
* Fix bug #43931.
|
2021-11-03 17:03:57 +08:00 |
|
|
liyuchun
|
ddc8fade9a
|
* Fix bug #15869.
|
2021-11-03 16:51:14 +08:00 |
|
|
liyuchun
|
a25e86cb59
|
* Adjust error of kanban action.
|
2021-11-03 09:15:07 +08:00 |
|
|
李玉春
|
f011907e1f
|
Merge branch 'sprint/168_sgm_fixvarname' into 'sprint/168'
* Change var name.
See merge request easycorp/zentaopms!281
|
2021-11-02 06:13:46 +00:00 |
|
|
孙广明
|
90b6253107
|
* Fix var name.
|
2021-11-02 14:12:18 +08:00 |
|
|
李玉春
|
86c7464aca
|
Merge branch 'sprint/168_sgm_assignpriv' into 'sprint/168'
* Assign btn check priv.
See merge request easycorp/zentaopms!282
|
2021-11-02 06:09:04 +00:00 |
|
|
孙广明
|
cc321393f6
|
* Change var name.
|
2021-11-02 14:05:53 +08:00 |
|
|
孙广明
|
3a61d3e8a6
|
Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15852.
See merge request easycorp/zentaopms!275
|
2021-11-02 06:04:03 +00:00 |
|
|
孙广明
|
c7f0e74517
|
* Assign btn check priv.
|
2021-11-02 13:59:41 +08:00 |
|
|
tianshujie
|
a626227f5e
|
* Fix bug #15870.
|
2021-11-02 10:30:30 +08:00 |
|
|
liyuchun
|
59364de4d8
|
* Fix bug #15851.
|
2021-11-02 10:18:44 +08:00 |
|
|
liyuchun
|
03d1e570fc
|
* Fix bug #15844.
|
2021-11-02 09:58:20 +08:00 |
|
|
liyuchun
|
fcce47b768
|
* Fix bug #15852.
|
2021-11-02 09:48:49 +08:00 |
|
|
孙广明
|
b8c16619cc
|
Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15907.
See merge request easycorp/zentaopms!273
|
2021-11-02 01:48:08 +00:00 |
|
|
xieqiyu
|
a91d1f3f98
|
* Code for bug#15888.
|
2021-11-02 09:45:53 +08:00 |
|
|
xieqiyu
|
68c4026e14
|
* Fix bug#15888.
|
2021-11-02 09:38:02 +08:00 |
|
|
liyuchun
|
84de930ed1
|
* Fix bug #15853.
|
2021-11-02 09:27:06 +08:00 |
|
|
孙广明
|
f7ce0adcd0
|
Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15901.
See merge request easycorp/zentaopms!270
|
2021-11-02 01:05:03 +00:00 |
|
|
李玉春
|
cb3e573d30
|
Merge branch 'sprint/168_tianshujie_15902' into 'sprint/168'
* Fix bug #15902.
See merge request easycorp/zentaopms!269
|
2021-11-02 00:34:38 +00:00 |
|
|
tianshujie
|
5fc96f394c
|
* Modify format.
|
2021-11-02 08:19:10 +08:00 |
|
|
liyuchun
|
a925bd1d90
|
* Fix bug #15901.
|
2021-11-01 17:40:36 +08:00 |
|
|
tianshujie
|
5444d35cde
|
* Fix bug #15902.
|
2021-11-01 17:34:25 +08:00 |
|
|
孙广明
|
1c98dbd28b
|
Merge branch 'sprint/168_liyuchun_bug' into 'sprint/168'
* Fix bug #15887,#15877,#15874.
See merge request easycorp/zentaopms!266
|
2021-11-01 09:18:16 +00:00 |
|
|
liyuchun
|
1631791368
|
* Fix bug #15887,#15877.
|
2021-11-01 16:54:02 +08:00 |
|
|
李玉春
|
44c5cfdbc4
|
Merge branch 'sprint/168_tianshujie_15871' into 'sprint/168'
* Fix bug #15871.
See merge request easycorp/zentaopms!262
|
2021-11-01 08:39:12 +00:00 |
|
|
孙广明
|
065b0d04c9
|
Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix bug #15867.
See merge request easycorp/zentaopms!260
|
2021-11-01 08:30:11 +00:00 |
|
|
tianshujie
|
7af3f622c0
|
* Fix bug #15871.
|
2021-11-01 16:26:50 +08:00 |
|
|
xieqiyu
|
19fca33fa3
|
* Delete the unused code.
|
2021-11-01 16:20:01 +08:00 |
|
|
liyuchun
|
d8c96a6430
|
* Fix bug #15867.
|
2021-11-01 16:13:13 +08:00 |
|
|
李玉春
|
16b6f5786e
|
Merge branch 'sprint/168' into 'sprint/168_hufangzhou_43423'
# Conflicts:
# module/execution/js/kanban.js
# module/kanban/model.php
|
2021-11-01 08:12:58 +00:00 |
|
|
李玉春
|
c118bfe048
|
更新module/execution/js/kanban.js
|
2021-11-01 08:05:08 +00:00 |
|
|
孙广明
|
2b2ec6f202
|
Merge branch 'sprint/168_liyuchun_kanban' into 'sprint/168'
* Fix bug #15861.
See merge request easycorp/zentaopms!252
|
2021-11-01 08:02:42 +00:00 |
|
|
hufangzhou
|
f0349dac2c
|
* Adjust the variable name.
|
2021-11-01 14:11:21 +08:00 |
|
|
孙广明
|
4099ac4a20
|
Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168'
Sprint/168 xieqiyu kanban
See merge request easycorp/zentaopms!253
|
2021-11-01 05:53:00 +00:00 |
|
|
hufangzhou
|
702c40addd
|
* Finish task #43423.
|
2021-11-01 13:50:53 +08:00 |
|
|
liyuchun
|
7d31524581
|
* Fix bug #15861.
|
2021-11-01 13:45:43 +08:00 |
|
|
dingna
|
c28e4c1b61
|
* Fix code for task#43401,#43403,#43404,#43405,#43398,#43399.
|
2021-11-01 13:26:57 +08:00 |
|
|
xieqiyu
|
c08c981ab0
|
* Display the sub Lane view kanban.
|
2021-11-01 13:13:56 +08:00 |
|
|
liyuchun
|
970763b0c5
|
* Adjust create object in kanban.
|
2021-11-01 11:32:21 +08:00 |
|
|
孙广明
|
4c91b03239
|
Merge branch 'sprint/168_zenggang_tasks' into 'sprint/168'
* Finish task#43410,43411,43413
See merge request easycorp/zentaopms!227
|
2021-10-29 07:03:13 +00:00 |
|
|
李玉春
|
2e8baf8959
|
Merge branch 'sprint/168_dingna_merge' into 'sprint/168'
* Conflict resolution.
See merge request easycorp/zentaopms!235
|
2021-10-29 06:16:03 +00:00 |
|
|
李玉春
|
188d3fa8d9
|
Merge branch 'sprint/168_xiawenlong' into 'sprint/168'
fix fullscreen bug
See merge request easycorp/zentaopms!233
|
2021-10-29 06:15:26 +00:00 |
|
|
李玉春
|
619b95257c
|
更新module/execution/js/kanban.js
|
2021-10-29 06:15:03 +00:00 |
|