Commit Graph

760 Commits

Author SHA1 Message Date
liyuchun
fa1ffa32bb * Fix bug #16163. 2021-11-12 11:13:37 +08:00
liyuchun
4865431f22 * Fix bug #16166. 2021-11-12 10:36:57 +08:00
liyuchun
4604c3d496 * Finish task #44217,#44218,#44219,#44220. 2021-11-11 12:32:20 +08:00
李玉春
900de67361 Merge branch 'sprint/171_sgm_43998' into 'sprint/168'
* Finish task #43998.

See merge request easycorp/zentaopms!376
2021-11-10 02:35:22 +00:00
孙广明
6d625bb597 * Finish task #43998. 2021-11-10 09:43:04 +08:00
Hao Sun
a233ecdf4b * fix iframe modal show double times on click at second time. 2021-11-09 19:55:15 +08:00
liyuchun
00d9bc4d7f * Sort execution kanban. 2021-11-09 17:22:42 +08:00
孙广明
b4e9ab871d Merge branch 'sprint/168' into 'sprint/168_liyuchun_43982'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2021-11-09 08:57:01 +00:00
liyuchun
cec2fd2c42 * Finish task #43960. 2021-11-09 16:42:22 +08:00
孙广明
521a8e871d * Finish task #44139. 2021-11-09 14:39:07 +08:00
李玉春
60766cee16 Merge branch 'sprint/168_sgm_43995' into 'sprint/168'
* Finish task #43955.

See merge request easycorp/zentaopms!359
2021-11-09 06:36:52 +00:00
孙广明
21d6cbd160 * Fix logic error. 2021-11-09 14:24:49 +08:00
孙广明
a8ce426a32 Merge branch 'sprint/168' into 'sprint/168_liyuchun_43954'
# Conflicts:
#   module/kanban/lang/en.php
#   module/kanban/lang/zh-cn.php
2021-11-09 05:04:22 +00:00
孙广明
954221334b * Finish task #43955. 2021-11-09 10:38:09 +08:00
liyuchun
7589eca470 * Finish task #43954. 2021-11-09 09:50:00 +08:00
孙广明
72a6f47b38 Merge branch 'spirnt/168_liyuchun_bug' into 'sprint/168'
* Finish task #43933.

See merge request easycorp/zentaopms!353
2021-11-09 01:16:47 +00:00
孙广明
f9f26953aa * Adjust kanban details. 2021-11-09 09:10:07 +08:00
liyuchun
f634d5f20d * Finish task #43933. 2021-11-09 08:59:56 +08:00
李玉春
d66bd6f3d3 Merge branch 'sprint/168_sunhao/improve_kanban' into 'sprint/168'
* Adjust kanban layout.

See merge request easycorp/zentaopms!278
2021-11-09 00:32:48 +00:00
李玉春
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
Hao Sun
f786d077e4 * improve layout of execution kanban. 2021-11-02 11:17:12 +08:00
Hao Sun
a48665e11b * limit kanban height. 2021-11-02 11:16:27 +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