 李玉春
|
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 |
|
|
孙广明
|
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 |
|
|
孙广明
|
05592f11a4
|
Merge branch 'sprint/168_zenggang_15929' into 'sprint/168'
* Fix bug#15929
See merge request easycorp/zentaopms!280
|
2021-11-02 06:01:44 +00:00 |
|
|
孙广明
|
c7f0e74517
|
* Assign btn check priv.
|
2021-11-02 13:59:41 +08:00 |
|
|
李玉春
|
f5ddaea3d9
|
Merge branch 'sprint/168_tianshujie_15909' into 'sprint/168'
* Fix bug #15909.
See merge request easycorp/zentaopms!279
|
2021-11-02 05:06:15 +00:00 |
|
|
tianshujie
|
40a2c67b6d
|
* Fix bug #15909.
|
2021-11-02 12:29:30 +08:00 |
|
|
zenggang
|
b48c61becc
|
* Fix bug#15929
|
2021-11-02 03:49:50 +00:00 |
|
|
李玉春
|
f5e671c523
|
Merge branch 'sprint/168_tianshujie_15889' into 'sprint/168'
* Fix bug #15889.
See merge request easycorp/zentaopms!276
|
2021-11-02 02:45:22 +00:00 |
|
|
李玉春
|
e57c5d4cd4
|
Merge branch 'sprint/168_tianshujie_15870' into 'sprint/168'
* Fix bug #15870.
See merge request easycorp/zentaopms!277
|
2021-11-02 02:44:55 +00: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 |
|
|
tianshujie
|
cfda1731a1
|
* Fix bug #15889.
|
2021-11-02 10:10:02 +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 |
|
|
李玉春
|
27abd7ddf0
|
Merge branch 'sprint/168_xieqiyu_15888' into 'sprint/168'
* Fix bug#15888.
See merge request easycorp/zentaopms!274
|
2021-11-02 01:47:09 +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 |
|
|
liyuchun
|
4936056465
|
* Fix bug #15907.
|
2021-11-02 09:15:53 +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 |
|
|
李玉春
|
c054ee2c8c
|
Merge branch 'sprint/168_tianshujie_15904' into 'sprint/168'
* Fix bug #15904.
See merge request easycorp/zentaopms!272
|
2021-11-02 01:01:57 +00:00 |
|
|
tianshujie
|
237b488504
|
* Fix bug #15904.
|
2021-11-02 08:57:47 +08: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 |
|
|
李玉春
|
e7c595df19
|
Merge branch 'sprint/168_xieqiyu_kanban' into 'sprint/168'
* Fix bug#15886.
See merge request easycorp/zentaopms!268
|
2021-11-02 00:33:07 +00:00 |
|
|
xieqiyu
|
47ee3885ba
|
* Optimize the code.
|
2021-11-02 08:27:32 +08: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
|
38fe82e21d
|
* Fix bug #15874.
|
2021-11-01 16:57:10 +08:00 |
|
|
liyuchun
|
1631791368
|
* Fix bug #15887,#15877.
|
2021-11-01 16:54:02 +08:00 |
|
|
李玉春
|
5cfaf07475
|
Merge branch 'sprint/168_hufangzhou_43423' into 'sprint/168'
* Code for task #43423.
See merge request easycorp/zentaopms!264
|
2021-11-01 08:41:04 +00:00 |
|
|
李玉春
|
38da2ef80d
|
Merge branch 'sprint/168_tianshujie_15882' into 'sprint/168'
* Fix bug #15882.
See merge request easycorp/zentaopms!263
|
2021-11-01 08:40:07 +00: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 |
|
|
hufangzhou
|
aadb69106d
|
* Code for task #43423.
|
2021-11-01 16:32:28 +08: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 |
|
|
李玉春
|
697498e199
|
Merge branch 'sprint/168_xieqiyu_merge' into 'sprint/168'
* Delete the unused code.
See merge request easycorp/zentaopms!259
|
2021-11-01 08:22:31 +00:00 |
|
|
xieqiyu
|
19fca33fa3
|
* Delete the unused code.
|
2021-11-01 16:20:01 +08:00 |
|
|
xieqiyu
|
edc60704d5
|
* Add color to the lane.
|
2021-11-01 16:15:22 +08:00 |
|
|
李玉春
|
a3e3b5a7fd
|
Merge branch 'sprint/168_tianshujie_15881' into 'sprint/168'
* Fix bug #15881.
See merge request easycorp/zentaopms!258
|
2021-11-01 08:14:47 +00:00 |
|
|
liyuchun
|
bec1e33ea2
|
Merge branch 'sprint/168_hufangzhou_43423' into sprint/168
|
2021-11-01 16:13:56 +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 |
|
|
李玉春
|
353b9bbb33
|
更新module/kanban/control.php
|
2021-11-01 08:12:17 +00:00 |
|
|
李玉春
|
9ccc42efc0
|
更新module/kanban/model.php
|
2021-11-01 08:11:47 +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
|
200801ebee
|
* Add the dynamic for moving swimlane.
|
2021-11-01 15:51:30 +08:00 |
|