 王怡栋
|
fd0cb543ba
|
Merge branch 'master' into 'sprint_200'
# Conflicts:
# module/execution/lang/en.php
# module/execution/lang/zh-cn.php
# module/execution/view/kanban.html.php
# module/kanban/css/space.css
|
2022-06-09 03:16:20 +00:00 |
|
|
zhouxudong
|
ea746e862f
|
* Finish task #56362.
|
2022-06-09 03:04:12 +00:00 |
|
|
caoyanyi
|
35a857fd38
|
* Adjust code.
|
2022-06-09 10:33:39 +08:00 |
|
|
liumengyi
|
2279c5d602
|
* Fix bug #23439.
|
2022-06-09 09:45:06 +08:00 |
|
|
liumengyi
|
56b622e91a
|
* Fix bug #23439.
|
2022-06-08 17:09:03 +08:00 |
|
|
caoyanyi
|
55f6cdb651
|
* Finish task #56548.
|
2022-06-08 15:53:37 +08:00 |
|
|
liumengyi
|
a7fcd0f372
|
* Fix bug #23416.
|
2022-06-08 15:33:49 +08:00 |
|
|
孙广明
|
0c0af6336a
|
Merge branch 'sprint/master_zhouxudong_23026' into 'sprint_200'
Sprint/master zhouxudong 23026
See merge request easycorp/zentaopms!3777
|
2022-06-08 06:37:32 +00:00 |
|
|
zhouxudong
|
edd66c028d
|
* Fix bug #23026.
|
2022-06-08 06:25:06 +00:00 |
|
|
liumengyi
|
bf33186b82
|
* Add annotation.
|
2022-06-08 13:45:14 +08:00 |
|
|
liumengyi
|
0fe197894b
|
* Fix bug of task #56454.
|
2022-06-08 13:44:27 +08:00 |
|
|
liumengyi
|
cbdefb47fd
|
* Fix bug of task #56454.
|
2022-06-08 13:18:21 +08:00 |
|
|
liumengyi
|
d1e74eb74a
|
* Fix bug of task #56454.
|
2022-06-08 13:10:13 +08:00 |
|
|
liumengyi
|
5e74d3bd9f
|
* Finish task #56454.
|
2022-06-08 10:32:01 +08:00 |
|
|
zhouxudong
|
607a871ddf
|
* Finish task #56396.
|
2022-06-07 06:09:44 +00:00 |
|
|
zhouxudong
|
1a952376fe
|
* Finish task #56396.
|
2022-06-07 05:44:06 +00:00 |
|
|
zhouxudong
|
0f645a096e
|
* Finish task #56396.
|
2022-06-07 05:39:44 +00:00 |
|
|
李玉春
|
61142f9f67
|
Update managemembers.js
|
2022-06-07 01:01:59 +00:00 |
|
|
tianshujie
|
d2242277e7
|
* Fix bug #23335.
|
2022-06-07 08:57:24 +08:00 |
|
|
李玉春
|
fd356fbb99
|
Merge branch 'sprint/sunhao/fix_kanban_col_height' into 'master'
* fix kanban lane height with auto height option.
See merge request easycorp/zentaopms!3747
|
2022-06-06 07:11:13 +00:00 |
|
|
tianshujie
|
814f1a597f
|
* Fix bug #23255.
|
2022-06-06 15:07:57 +08:00 |
|
|
Hao Sun
|
29ae8cb398
|
* fix kanban lane height with auto height option.
|
2022-06-06 06:58:38 +00:00 |
|
|
孙广明
|
1dd0b6c022
|
Merge branch 'sprint/197_tianshujie_bug23213' into 'master'
* Fix bug #23213.
See merge request easycorp/zentaopms!3725
|
2022-06-02 08:04:56 +00:00 |
|
|
liumengyi
|
7a14f8a946
|
* Fix bug #23213.
|
2022-06-02 16:03:40 +08:00 |
|
|
tianshujie
|
653e681ed2
|
* Fix bug #23213.
|
2022-06-02 16:02:19 +08:00 |
|
|
liumengyi
|
4d2c34c122
|
* Fix bug #23213.
|
2022-06-02 15:59:57 +08:00 |
|
|
李玉春
|
88da2f7565
|
Merge branch 'sprint/197_tianshujie_fixbug' into 'master'
Sprint/197 tianshujie fixbug
See merge request easycorp/zentaopms!3714
|
2022-06-02 05:27:06 +00:00 |
|
|
李玉春
|
d36ec41688
|
Merge branch 'master' into 'sprint/sunhao/fix_kanban_fullscreen'
# Conflicts:
# www/js/zui/kanban/min.js
|
2022-06-02 05:20:38 +00:00 |
|
|
tianshujie
|
fb239cfa06
|
* Fix bug #23194.
|
2022-06-02 12:22:58 +08:00 |
|
|
Hao Sun
|
c1abc19882
|
* fix virtual rendering not work when kanban enter fullscreen
|
2022-06-02 04:11:59 +00:00 |
|
|
李玉春
|
fd269a4777
|
Merge branch 'master' into 'sprint/sunhao/fix_kanban'
# Conflicts:
# www/js/zui/kanban/min.css
# www/js/zui/kanban/min.js
|
2022-06-02 03:29:40 +00:00 |
|
|
Hao Sun
|
96454565b2
|
* adjust cards size in kanban.
|
2022-06-02 03:02:45 +00:00 |
|
|
孙广明
|
2d572a9d14
|
Merge branch '197'
|
2022-06-02 08:32:45 +08:00 |
|
|
孙广明
|
c671cc3186
|
Merge branch 'sprint/197_zhouxin_55674' into 'sprint/197'
Sprint/197 zhouxin 55674
See merge request easycorp/zentaopms!3691
|
2022-06-01 08:57:31 +00:00 |
|
|
liumengyi
|
06a0bb6f03
|
* Fix bug #23110, #23109.
|
2022-06-01 16:27:03 +08:00 |
|
|
zhouxin
|
2fcd623c62
|
* Adjust code.
|
2022-06-01 07:48:32 +00:00 |
|
|
tianshujie
|
095c9b5501
|
* Finish task #55681.
|
2022-06-01 15:07:35 +08:00 |
|
|
zhouxudong
|
5c3ac663e6
|
* Fix bug #23129 #23126 #23108.
|
2022-06-01 06:30:45 +00:00 |
|
|
tianshujie
|
78d38d7723
|
Merge branch 'sprint/197_tianshujie_55675' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/197_tianshujie_55675
|
2022-06-01 13:51:08 +08:00 |
|
|
tianshujie
|
7a70ae8481
|
* Finish task #55675.
|
2022-06-01 13:50:53 +08:00 |
|
|
liumengyi
|
384240bb75
|
* Finish task #55681.
|
2022-06-01 13:47:27 +08:00 |
|
|
tianshujie
|
b076635c79
|
* Finish task #55675.
|
2022-06-01 13:32:34 +08:00 |
|
|
tianshujie
|
5d62ed5900
|
* Finish task #55675.
|
2022-06-01 13:06:26 +08:00 |
|
|
tianshujie
|
2fb1cc0032
|
* Finish task #55675.
|
2022-06-01 10:57:07 +08:00 |
|
|
tianshujie
|
0665817eb8
|
* Finish task #55675.
|
2022-05-31 17:20:22 +08:00 |
|
|
liumengyi
|
62445ea7b0
|
* Code format.
|
2022-05-27 10:59:23 +08:00 |
|
|
liumengyi
|
f889692b40
|
* Remove empty line.
|
2022-05-27 10:47:19 +08:00 |
|
|
liumengyi
|
87ef728908
|
* Fix bug #23012.
|
2022-05-27 10:46:02 +08:00 |
|
|
王怡栋
|
2c4bbef9a6
|
Merge branch 'sprint/master_zhouxudong_54981' into 'master'
Sprint/master zhouxudong 54981
See merge request easycorp/zentaopms!3578
|
2022-05-25 02:33:04 +00:00 |
|
|
zhouxudong
|
55ab5ee69d
|
* Finish task #54981 #54982.
|
2022-05-25 02:31:02 +00:00 |
|