Commit Graph

91 Commits

Author SHA1 Message Date
tianshujie
0ef9b12a2c * Fix bug #19070. 2022-01-27 16:13:13 +08:00
zhouxin
e48be0c1db Fix s bug. 2022-01-27 03:11:36 +00:00
李玉春
8bff3489c8 Merge branch 'sgm_47983' into 'master'
* Fix bug #18972.

See merge request easycorp/zentaopms!1633
2022-01-26 02:39:03 +00:00
孙广明
2530d27f0b * Fix bug #18972. 2022-01-26 10:14:30 +08:00
tianshujie
8dcd1a0e4c * Fix the problem of error reporting and button dividing line. 2022-01-26 09:02:16 +08:00
李玉春
bde3d0ef34 Merge branch 'master' into 'sgm_47983'
# Conflicts:
#   module/kanban/css/common.css
#   module/kanban/css/view.css
2022-01-25 09:16:04 +00:00
孙广明
e797653a34 * Finish task #47983. 2022-01-25 16:35:42 +08:00
liumengyi
571f530460 * Fix bug #18936, #18924. 2022-01-25 11:03:05 +08:00
liumengyi
80da12fc7d * Finish task#48008 and fix bug for 48011. 2022-01-21 13:49:47 +08:00
tianshujie
b22eed4a6d * Fix bug #18783,18780. 2022-01-20 11:15:33 +08:00
zhouxin
919e91b029 Finish task #47980. 2022-01-19 05:51:01 +00:00
tianshujie
cb1f7a634e * Fix bug #18578,18536. 2022-01-17 23:49:54 +08:00
liumengyi
deb8ca0142 * Code for execution kanban grouping. 2022-01-17 19:07:23 +08:00
tianshujie
3ee399a75c * Fix bug #18496. 2022-01-17 16:58:56 +08:00
liumengyi
0167541bb4 * Add move card for execution-kanban. 2022-01-14 15:00:36 +08:00
liumengyi
f9d299efd2 * Finish task #47332. 2022-01-14 09:29:50 +08:00
tianshujie
2261371010 * Refactoring task kanban to view logic by group. 2022-01-13 21:11:23 +08:00
liumengyi
0f49102886 * Fix bug for execution kanban view. 2022-01-13 14:36:05 +08:00
孙广明
e82f0f5655 Merge branch 'sprint/182_tianshujie_47313' into 'kanban'
* Finish task #47333,47313.

See merge request easycorp/zentaopms!1374
2022-01-13 03:18:01 +00:00
孙广明
021d9d8b9a Merge branch 'sprint/182_liumengyi_kanban' into 'kanban'
* Finish task #47334.Add card view.

See merge request easycorp/zentaopms!1372
2022-01-13 03:06:47 +00:00
tianshujie
bc265f9364 * Finish task #47333,47313. 2022-01-13 11:02:07 +08:00
liumengyi
1ea0bb4760 * Finish task #47334.Add card view. 2022-01-13 10:35:04 +08:00
tianshujie
940587e1ca * Finish task #47352. 2022-01-13 09:44:07 +08:00
tianshujie
8b22fdcabc * Finish task #47336,47344,47345. 2022-01-12 16:28:16 +08:00
孙广明
5a8c11cb6e Merge branch 'kanban' into 'sprint/182_tianshujie_47336'
# Conflicts:
#   module/execution/control.php
2022-01-12 07:53:04 +00:00
tianshujie
4bca0680ab * Finish task #47335. 2022-01-12 15:44:44 +08:00
liumengyi
0b334a246f * Add column menu. 2022-01-12 15:39:33 +08:00
liumengyi
adf53d8754 * Finish task #47334.Add default view of professional RD Kanban. 2022-01-12 10:08:15 +08:00
孙广明
197a1bceea * Finish task #46165. 2021-12-22 09:41:39 +08:00
孙广明
87c12c800a * Fix code details. 2021-12-17 15:43:19 +08:00
孙广明
9f7eecf9c6 * Finish task #46164. 2021-12-17 15:25:59 +08:00
Hao Sun
5424c131dc * task #45145, support to change scale size for execution kanban. 2021-12-01 08:30:57 +08:00
Hao Sun
9d7449acae * refactor. 2021-12-01 08:29:07 +08:00
孙广明
38619abdd8 * Finish task #45160. 2021-11-30 11:08:33 +08:00
liyuchun
4604c3d496 * Finish task #44217,#44218,#44219,#44220. 2021-11-11 12:32:20 +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
孙广明
954221334b * Finish task #43955. 2021-11-09 10:38:09 +08:00
liyuchun
f634d5f20d * Finish task #43933. 2021-11-09 08:59:56 +08:00
孙广明
1f49e46582 * Finish task #43948. 2021-11-08 14:29:10 +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
liyuchun
03d1e570fc * Fix bug #15844. 2021-11-02 09:58:20 +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
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