Commit Graph
468 Commits
Author SHA1 Message Date
wangyidong ee559e5e7c * code for bug #22376. 2022-05-13 08:47:42 +08:00
wangyidong 71bc27b631 * fix bug #22433. 2022-05-13 08:27:44 +08:00
王怡栋 a0c13f4d80 Merge branch 'fixbug' into 'master'
* Fix bug #22025,22028.

See merge request easycorp/zentaopms!3181
2022-04-28 08:46:46 +00:00
tanghucheng 32fe42bb94 * Fix bug. 2022-04-28 10:45:30 +08:00
tanghucheng 99fff4eda6 * Fix bug #22028. 2022-04-28 10:38:08 +08:00
wangyidong 899c123dac * code for bug #19303. 2022-04-27 09:37:01 +08:00
王怡栋 480ca71da8 Merge branch 'fixbug' into 'master'
* Fix bug #17602,14850,21439.

See merge request easycorp/zentaopms!3097
2022-04-24 07:00:04 +00:00
tanghucheng bc1a55d155 * Fix bug #14850. 2022-04-24 13:39:19 +08:00
caoyanyi 210d2fb29f * Fix bug #21322. 2022-04-22 05:07:13 +00:00
tanghucheng 3c31a6850e * Fix bug . 2022-04-20 02:01:57 +00:00
zhujinyong 25eb24fe7d - Remove submodule. 2022-04-19 08:23:15 +08:00
zhujinyong 864694faab Merge branch 'sprint/sunhao/bug6910' 2022-04-18 17:16:17 +08:00
Hao Sun 6ea976a722 * bug #19052, fix width for some models. 2022-04-15 14:35:05 +08:00
王怡栋 132ee3b78a Merge branch 'sprint/master_fixbug' into 'master'
* Adjust for license.

See merge request easycorp/zentaopms!2847
2022-04-11 03:09:24 +00:00
tanghucheng 77aab6fcbf * Fix bug . 2022-04-11 11:00:38 +08:00
Zongjun Lan c5aed66c8e * fix bug #21598 2022-04-11 10:21:17 +08:00
王怡栋 22adeeba0e Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #21598#21419#21424#21577

See merge request easycorp/zentaopms!2827
2022-04-08 07:34:19 +00:00
tanghucheng ff08e7261c * Adjust for license. 2022-04-08 14:53:25 +08:00
Zongjun Lan 19d4f476f7 * fix bug #21424 2022-04-08 14:45:48 +08:00
王怡栋 d78a7aeb2a Merge branch '165_package' 2022-04-08 13:55:52 +08:00
Zongjun Lan 0145f5a790 * fix bug #21598 2022-04-08 13:50:09 +08:00
Zongjun Lan cb6a527e95 * modify version name 2022-04-08 10:19:13 +08:00
Zongjun Lan 931c3ccc38 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-07 16:17:21 +08:00
孙广明 af9545b817 Merge branch 'sprint/master_fixbug' into 'master'
* Fix bug #21403,21474,21410,21414,21417.

See merge request easycorp/zentaopms!2756
2022-04-07 07:57:51 +00:00
tanghucheng 3d3ffe9348 * Fix bug #21403,21474,21410,21414,21417,21456. 2022-04-07 15:27:54 +08:00
Zongjun Lan 4846c7af1a * fix bug install vision 2022-04-07 14:11:42 +08:00
Zongjun Lan e9b834db10 * fix bug #21423 2022-04-07 13:08:21 +08:00
Zongjun Lan 1f86f1d409 * fix bug #21427 2022-04-07 08:54:21 +08:00
Zongjun Lan 84879b6230 * fix bug add install lite version text 2022-04-06 15:22:45 +08:00
tanghucheng dd2460d8ed * Fix bug for edit project. 2022-04-06 13:40:32 +08:00
朱金勇 b376b08cbd Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest

See merge request easycorp/zentaopms!2746
2022-04-02 08:23:16 +00:00
王怡栋 adb3a7ea72 Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/project/model.php
2022-04-02 07:33:24 +00:00
tanghucheng ab074962cc * Fix bug of project session. 2022-04-02 15:06:17 +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
tanghucheng 1d168b0468 * Fix bug #21408,21406,20199. 2022-04-02 14:06:41 +08:00
Zongjun Lan 8c09028685 * fix bug #21422 2022-04-02 13:13:35 +08:00
王怡栋 0c669263ba Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #18722#19905#21424

See merge request easycorp/zentaopms!2708
2022-04-02 02:59:57 +00:00
Zongjun Lan f61cdef8d0 * fix bug #21424 2022-04-02 10:56:10 +08:00
zhujinyong 9a97e8d11d + Add submodule qucheng. 2022-04-02 10:53:40 +08:00
Zongjun Lan a1d7d71246 * fix bug gantt 2022-04-02 10:16:44 +08:00
Zongjun Lan c104b06739 * fix bug #21077 2022-04-02 10:16:44 +08:00
Zongjun Lan 875db6213f * fix bug #19905 2022-04-02 09:45:58 +08:00
Zongjun Lan 7773a8a530 * fix bug kanban prev 2022-04-01 15:32:36 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
Zongjun Lan 66b3c26824 * fix bug add install lite version text 2022-03-31 11:07:12 +08:00
王怡栋 d02b555d87 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #20165

See merge request easycorp/zentaopms!2647
2022-03-31 02:41:12 +00:00
Zongjun Lan 8ff464a02c * fix bug add install lite version text 2022-03-31 10:34:12 +08:00
王怡栋 1f0d9ffae3 Merge branch 'sprint/master_fixbug' 2022-03-30 16:02:18 +08:00
tanghucheng f1449d3b6b * Fix bug. 2022-03-30 09:09:04 +08:00
Zongjun Lan 97ddf11ecd * fix bug gantt 2022-03-29 17:42:44 +08:00