Commit Graph
1647 Commits
Author SHA1 Message Date
sunjun 3a60274cf6 *Fixbug_sunjun_19732 2022-04-15 14:23:08 +08:00
renying d219dac730 Fix bug#17274 2022-04-14 14:37:10 +08:00
李玉春 50e153d0df Merge branch 'devops26_52602' into 'master'
Fix bug#15760,12963

See merge request easycorp/zentaopms!2910
2022-04-13 09:36:30 +00:00
tianshujie d41521bbcc * Fix bug #21699. 2022-04-13 14:53:33 +08:00
zenggang 0ed499a6d0 * Fix bug#12963 2022-04-13 06:48:32 +00:00
孙广明 e17188285c Merge branch 'master_xieqiyu_19625' into 'master'
* Fix bug#19625.

See merge request easycorp/zentaopms!2890
2022-04-12 08:33:15 +00:00
孙广明 92eb57d9ef Merge branch 'shunhuawei_fixbug_21488' into 'master'
*Beautify the interface.

See merge request easycorp/zentaopms!2894
2022-04-12 07:50:54 +00:00
孙华伟 6c85c8f49c *Beautify the interface. 2022-04-12 15:47:01 +08:00
xieqiyu e7314a8343 * Fix bug#19625. 2022-04-12 15:27:51 +08:00
孙广明 1e86d0872a Merge branch 'shunhuawei_fixbug_21488' into 'master'
Shunhuawei fixbug 21488

See merge request easycorp/zentaopms!2879
2022-04-12 06:44:47 +00:00
孙华伟 684196f776 *Optimize the code. 2022-04-12 14:43:05 +08:00
孙华伟 91597abdb7 *Optimize the code. 2022-04-12 14:39:27 +08:00
孙华伟 03cf60bdcb *project,execution,bug have the same problem. 2022-04-12 14:26:12 +08:00
xieqiyu 68097e7725 * Fix bug#14595. 2022-04-11 17:36:44 +08:00
朱金勇 0c23ddd5f7 Merge branch 'sprint/sunhao/bug16555' into 'master'
* bug #16555, remove scrollbar when drag item to outside of kanban.

See merge request easycorp/zentaopms!2799
2022-04-08 06:06:13 +00:00
Hao Sun 281ad7e876 * fix search and redirect in ajax dropmenu not work as expected sometimes. 2022-04-08 11:43:35 +08:00
王怡栋 6c07213aa2 Merge branch 'sprint/tianshujie_bug18781' into 'master'
Modify the popup style of the popup window.

See merge request easycorp/zentaopms!2809
2022-04-07 09:25:16 +00:00
孙广明 d9345f6a62 Merge branch 'master_xieqiyu_21550' into 'master'
* Fix bug#21550.

See merge request easycorp/zentaopms!2807
2022-04-07 09:23:31 +00:00
tianshujie 534783603f Modify the popup style of the popup window. 2022-04-07 17:22:26 +08:00
xieqiyu 8aaaeafcb3 * Modify review code. 2022-04-07 17:22:15 +08:00
xieqiyu 1a59190992 * Fix bug#21550. 2022-04-07 17:09:41 +08:00
李玉春 69a8379657 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2806
2022-04-07 09:09:04 +00:00
tianshujie 14fd19d50b * Fix bug #18781. 2022-04-07 16:58:07 +08:00
Hao Sun 8b336e8694 * bug #16555, remove scrollbar when drag item to outside of kanban. 2022-04-07 16:06:46 +08:00
Hao Sun 8b58e71667 * bug #16555, remove scrollbar when drag item to outside of kanban. 2022-04-07 16:05:54 +08:00
tianshujie 2af6c7df8b * Fix bug #20977. 2022-04-07 14:38:41 +08:00
xieqiyu d6ab24caff * Fix bug#21552. 2022-04-07 13:53:41 +08:00
孙广明 c286e44d55 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #16610.

See merge request easycorp/zentaopms!2773
2022-04-07 02:44:02 +00:00
liyuchun 3804046bdb * Fix bug #21182. 2022-04-07 09:15:35 +08:00
tianshujie 0530b892e4 * Fix bug #18710. 2022-04-06 15:22:15 +08:00
王怡栋 d75d09e70a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-06 13:14:16 +08:00
王怡栋 4f5529867b * code for bug #20933. 2022-04-06 13:13:29 +08:00
朱金勇 33adc0ffbb Merge branch 'sprint/sunhao/bug17170' into 'master'
* bug #17170, support for toggle all children rows on toggle parent row.

See merge request easycorp/zentaopms!2744
2022-04-02 08:23:42 +00:00
Hao Sun f4222d7247 * bug #17170, support for toggle all children rows on toggle parent row. 2022-04-02 16:10:53 +08:00
孙广明 30645ffbff Merge branch 'master_xieqiyu_21334' into 'master'
* Fix bug#21334.

See merge request easycorp/zentaopms!2729
2022-04-02 08:10:36 +00:00
孙广明 1b7c01606a Merge branch 'master_xieqiyu_19711' into 'master'
Master xieqiyu 19711

See merge request easycorp/zentaopms!2742
2022-04-02 08:10:22 +00:00
xieqiyu f9295faec3 * Fix bug#19711. 2022-04-02 15:39:03 +08:00
王怡栋 adb3a7ea72 Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/project/model.php
2022-04-02 07:33:24 +00:00
李玉春 addc89cede Merge branch 'master' into 'sprint/tianshujie_fixbug'
# Conflicts:
#   module/execution/js/kanban.js
2022-04-02 07:07:46 +00:00
tianshujie 479c647cf5 * Fix code style issues. 2022-04-02 15:01:16 +08:00
王怡栋 f9961cfa52 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-02 14:55:35 +08:00
王怡栋 534ed4e9d8 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21422#21455#21413

See merge request easycorp/zentaopms!2733
2022-04-02 06:53:04 +00:00
Zongjun Lan 6865f5cdd6 * fix bug 2022-04-02 14:52:33 +08:00
王怡栋 c18710567b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-02 14:44:44 +08:00
王怡栋 6edb5fe805 * fix bug #21413. 2022-04-02 14:44:18 +08:00
Zongjun Lan 1542533e44 * fix bug #21455#21413 2022-04-02 14:36:13 +08:00
zhouxudong c0bf8f5275 * Fix bug #21378. 2022-04-02 14:16:09 +08:00
tanghucheng 1d168b0468 * Fix bug #21408,21406,20199. 2022-04-02 14:06:41 +08:00
tianshujie 9d03df55de * Fix bug #19950. 2022-04-02 13:46:49 +08:00
tianshujie 8b2c7f1288 * Fix bug #21158. 2022-04-02 13:41:52 +08:00