Commit Graph
3946 Commits
Author SHA1 Message Date
朱金勇 a56b1a77c9 Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest

See merge request easycorp/zentaopms!2813
2022-04-08 06:06:55 +00: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
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
孙广明 a8f6e27359 * Code for project. 2022-04-07 14:36:42 +08:00
tianshujie 2017a13bc8 * Fix bug #14961. 2022-04-07 08:19:04 +08:00
tianshujie 1dc225aecf Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_bug19813 2022-04-07 08:14:08 +08:00
朱金勇 ecbbc59166 Merge branch 'sgm_projecttest' into 'master'
Sgm projecttest

See merge request easycorp/zentaopms!2775
2022-04-06 09:09:27 +00:00
zenggang 790932d79d * Fix bug#20909 2022-04-06 08:43:29 +00:00
孙广明 bd895ca244 * Add project test and fix bug. 2022-04-06 16:01:06 +08:00
tianshujie 8aa61bfc0e * Fix bug #14961. 2022-04-06 13:31:56 +08:00
王怡栋 4f5529867b * code for bug #20933. 2022-04-06 13:13:29 +08:00
王怡栋 3f74884813 * fix bug #21411. 2022-04-02 15:53:38 +08:00
王怡栋 adb3a7ea72 Merge branch 'master' into 'sprint/master_fixbug'
# Conflicts:
#   module/project/model.php
2022-04-02 07:33:24 +00:00
tanghucheng 5b2f81b688 * Fix bug . 2022-04-02 15:11:20 +08:00
tanghucheng ab074962cc * Fix bug of project session. 2022-04-02 15:06:17 +08:00
王怡栋 031076a570 Merge branch 'sprint/fixbug_hufangzhou_projectsession' into 'master'
* Fix bug of project session.

See merge request easycorp/zentaopms!2735
2022-04-02 07:06:08 +00:00
李玉春 8da183c51b Merge branch 'fixbug_sunjun_20719' into 'master'
Fixbug sunjun 20719

See merge request easycorp/zentaopms!2726
2022-04-02 06:12:59 +00:00
tanghucheng 1d168b0468 * Fix bug #21408,21406,20199. 2022-04-02 14:06:41 +08:00
hufangzhou 1703c7f5bd * Fix bug of project session. 2022-04-02 13:55:33 +08:00
xieqiyu cdd7396261 * Add space line. 2022-04-02 09:56:31 +08:00
xieqiyu 979fb8b587 * Fix bug#20719. 2022-04-02 09:54:43 +08:00
tianshujie 4503f0b9d8 * Fix bug #12208. 2022-04-01 15:50:34 +08:00
王怡栋 4fa721b0bb Merge branch '165_package' 2022-04-01 15:30:36 +08:00
sunjun 9cccd7ec3b *Fixbug #20719 2022-04-01 15:10:54 +08:00
孙广明 8f7c929c4a Merge branch 'fixbugs_zhouxin_20288' into 'master'
* Fix bug #20288.

See merge request easycorp/zentaopms!2709
2022-04-01 06:36:42 +00:00
zhouxin b980998c42 * Fix bug 20288. 2022-04-01 06:35:26 +00:00
tianshujie 7407aabc00 * Fix bug #19104. 2022-04-01 14:32:00 +08:00
zhouxin 4f195dceba * Fix bug #20288. 2022-04-01 06:31:52 +00:00
zhouxin 52f8024543 * Fix bug #20288. 2022-04-01 06:17:30 +00:00
tianshujie f8981467e4 * Fix bug #19714. 2022-03-31 16:44:45 +08:00
tianshujie 1d91f13687 * Fix bug #17551. 2022-03-31 14:22:35 +08:00
王怡栋 6c078665da Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2636
2022-03-30 08:00:01 +00:00
tianshujie b452680fb3 * Fix bug #14841. 2022-03-30 14:48:34 +08:00
zhouxin a8d3ff2801 * Fix bug #17322. 2022-03-30 05:11:32 +00:00
zhouxin cd5ac50b6f * Fix bug #17322. 2022-03-30 03:30:02 +00:00
zhouxin 1d21f7f62d * Fix bug #17322. 2022-03-30 03:23:48 +00:00
tianshujie 317ff297b1 * Fix Kanban related issues. 2022-03-30 11:02:29 +08:00
tianshujie 0e3779ca1b * Fix Kanban related issues. 2022-03-30 10:45:01 +08:00
tianshujie 04316599a4 * Modify the error. 2022-03-30 10:26:17 +08:00
tianshujie a0c4457a95 * Fix bug #16101. 2022-03-29 13:59:16 +08:00
tianshujie 93d7e2dd1d * Fix bug #14873. 2022-03-29 11:27:25 +08:00
李玉春 9b388cc312 Merge branch 'fixbug_sunjun_13852' into 'master'
Fixbug sunjun 13852

See merge request easycorp/zentaopms!2576
2022-03-29 00:50:37 +00:00
sunjun b411be89ec *Fixbug #13852 2022-03-29 08:44:48 +08:00
sunjun 0ce312f107 *Fixbug #13852 2022-03-28 17:02:25 +08:00
tianshujie 6617f8747c * Fix bug #19397. 2022-03-28 16:46:15 +08:00
tianshujie 7680057485 * Fix bug #18755. 2022-03-28 15:32:41 +08:00
sunjun 487c2a6694 *Fixbug #13852 2022-03-28 13:43:53 +08:00
李玉春 d726d5bfbb Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2574
2022-03-28 05:10:26 +00:00