Commit Graph
34693 Commits
Author SHA1 Message Date
tianshujie 391d9cc18b * Fix bug #20090. 2022-03-02 10:02:27 +08:00
tianshujie 2ef598afcc * Fix the problem of white screen after upgrade. 2022-03-02 09:35:34 +08:00
tianshujie 1dafa1e8dd * Fix bug #20228. 2022-03-02 09:26:39 +08:00
李玉春 a28796c991 Merge branch 'sprint/sunhao/bug20115' into 'master'
* Bug #20115, fix contextmenu sub items not show in kanban.

See merge request easycorp/zentaopms!2038
2022-03-02 01:20:39 +00:00
李玉春 1af5cf8567 Merge branch 'sprint/sunhao/bug20214' into 'master'
* Bug #20214, fix card style on dragging in kanban.

See merge request easycorp/zentaopms!2037
2022-03-02 01:19:04 +00:00
Hao Sun cc9790f774 * Bug #20115, fix contextmenu sub items not show in kanban. 2022-03-02 09:12:41 +08:00
Hao Sun 0c8171af7a * Bug #20214, fix card style on dragging in kanban. 2022-03-02 08:57:26 +08:00
zhujinyong 04b9fd749d * Fix switch vision. 2022-03-02 08:53:11 +08:00
朱金勇 56a040a2d7 Merge branch 'sprint/186_hufangzhou_makefile' into 'master'
* Adjust the makefile.

See merge request easycorp/zentaopms!2036
2022-03-02 00:40:12 +00:00
朱金勇 a59db7cd97 Merge branch 'sprint/sunhao/fix_refresh' into 'master'
* fix refresh with app param not work as expected.

See merge request easycorp/zentaopms!2034
2022-03-02 00:40:01 +00:00
朱金勇 1e576a8ad1 Merge branch 'sprint/sunhao/bug20185' into 'master'
* Bug #20185, fix request pending forever when playing video before.

See merge request easycorp/zentaopms!2035
2022-03-02 00:39:28 +00:00
孙广明 d8e9831088 Merge branch 'sprint/186_tianshujie_19786' into 'master'
Sprint/186 tianshujie 19786

See merge request easycorp/zentaopms!2032
2022-03-02 00:37:29 +00:00
hufangzhou cac648f8c8 * Adjust the makefile. 2022-03-02 08:36:32 +08:00
tianshujie 30600fb7bb * Fix bug #20200. 2022-03-01 20:37:20 +08:00
Hao Sun 875e6add75 * Add hook to app page before reload it. 2022-03-01 20:20:25 +08:00
tianshujie cfb4b274a4 * Fix bug #20170. 2022-03-01 20:06:44 +08:00
Hao Sun 101a0cea37 * Bug #20185, fix request pending forever when playing video before. 2022-03-01 17:55:26 +08:00
Hao Sun 3d2d30363f * fix refresh with app param not work as expected. 2022-03-01 17:49:47 +08:00
tianshujie cbfe4b0bd1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/186_tianshujie_19786 2022-03-01 15:51:34 +08:00
tianshujie 59ee1b9038 * Fix bug #19786. 2022-03-01 15:51:11 +08:00
李玉春 4c0a3e05f5 Merge branch 'sprint/186_liumengyi_fixbug' into 'master'
* Fix bug #20116.

See merge request easycorp/zentaopms!2027
2022-03-01 07:00:35 +00:00
liumengyi 8dd8c27d38 * Adjust code format. 2022-03-01 14:53:31 +08:00
liumengyi 02e14404c6 * Remove redundant code. 2022-03-01 14:43:15 +08:00
liumengyi 0854d8fe43 * Fix bug #20116. 2022-03-01 14:42:07 +08:00
王怡栋 5bfe2d0181 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-01 13:58:16 +08:00
王怡栋 38ed825461 * adjust for get testtask list. 2022-03-01 13:58:00 +08:00
王怡栋 2d6e1d3e50 Merge branch 'sprint/185_lanzongjun_49370' into 'master'
* fix task 49370

See merge request easycorp/zentaopms!2012
2022-03-01 05:40:54 +00:00
Zongjun Lan 09595f06ca * fix task 49370 2022-03-01 13:40:28 +08:00
王怡栋 fb1e105cbb Merge branch 'sprint/master_tanghucheng_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!2021
2022-03-01 05:38:12 +00:00
王怡栋 d9215e06c7 Merge branch 'sprint/185_lanzongjun_49340' into 'master'
* fix task 49340

See merge request easycorp/zentaopms!2024
2022-03-01 05:36:14 +00:00
Zongjun Lan 9200c8174f * fix task 49340 2022-03-01 13:33:20 +08:00
王怡栋 e83555ffd3 * adjust for php8.0 2022-03-01 13:32:31 +08:00
王怡栋 9991571bb2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-01 13:26:48 +08:00
王怡栋 bd205445ab * adjust for api for php8. 2022-03-01 13:26:30 +08:00
zhujinyong ec50bf1900 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-01 13:19:33 +08:00
zhujinyong 83164be6f8 * Refactor xuan. 2022-03-01 13:19:09 +08:00
tanghucheng 99bc2331ca * Fix bug #49398,49392. 2022-03-01 13:06:59 +08:00
王怡栋 44be255e67 * adjust task #49362 and check priv. 2022-03-01 11:23:44 +08:00
孙广明 fb48581a76 Merge branch 'sprint/186_tianshujie_fixbug' into 'master'
Sprint/186 tianshujie fixbug

See merge request easycorp/zentaopms!2022
2022-03-01 03:12:50 +00:00
liumengyi fe98c033c7 * Remove empty line. 2022-03-01 10:41:11 +08:00
孙广明 bd01479b5a * Merge code. 2022-03-01 10:40:52 +08:00
tianshujie 59c9f0dbeb * Fix bug #20164. 2022-03-01 10:33:46 +08:00
tianshujie b1afcd3a6e * Fix bug #20154. 2022-03-01 10:15:29 +08:00
王怡栋 2b08931a49 Merge branch 'sgm_fixbug' into 'master'
* Fix code detail.

See merge request easycorp/zentaopms!2016
2022-03-01 02:14:27 +00:00
tanghucheng b99e04cab3 * Fix bug. 2022-03-01 09:56:19 +08:00
孙广明 38289123a7 Merge branch 'sprint/186_hufangzhou_20155' into 'master'
* Fix bug #20155.

See merge request easycorp/zentaopms!2018
2022-03-01 01:44:20 +00:00
孙广明 3a55c67a51 Merge branch 'sprint/186_tianshujie_optimize' into 'master'
* Fix code review issues.

See merge request easycorp/zentaopms!2019
2022-03-01 01:44:10 +00:00
tianshujie 35dc1de44d * Fix code review issues. 2022-03-01 09:35:52 +08:00
hufangzhou 8a71dc32bb * Fix bug #20155. 2022-03-01 09:29:26 +08:00
孙广明 4e3f46d87a * Fix code detail. 2022-03-01 08:34:06 +08:00