Commit Graph
29349 Commits
Author SHA1 Message Date
孙广明 c3c1351400 * Fix bug #20238. 2022-03-02 10:53:30 +08:00
王怡栋 ff80c70ad1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-02 10:35:00 +08:00
王怡栋 f71f500755 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-03-02 10:34:40 +08:00
孙广明 f7078f64b7 Merge branch 'sprint/186_liumengyi_20117' into 'master'
* Fix bug #20117.

See merge request easycorp/zentaopms!2040
2022-03-02 02:29:26 +00:00
liumengyi fcc37d1ab0 * Fix code for productplan getPairs. 2022-03-02 10:28:22 +08:00
liumengyi bf6d9c2e3a * Fix bug #20117. 2022-03-02 10:15:38 +08:00
李玉春 227db2b158 Merge branch 'sprint/186_tianshujie_20228' into 'master'
Sprint/186 tianshujie 20228

See merge request easycorp/zentaopms!2039
2022-03-02 02:13:36 +00:00
王怡栋 76eea1f5d9 * adjust for global create. 2022-03-02 10:06:19 +08:00
tianshujie 391d9cc18b * Fix bug #20090. 2022-03-02 10:02:27 +08:00
王怡栋 b7bcd483ab Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug 20022

See merge request easycorp/zentaopms!2033
2022-03-02 01:58:48 +00: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
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
朱金勇 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
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
Zongjun Lan f4970f502d * fix bug 20023 2022-03-01 16:34:34 +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
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
王怡栋 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
王怡栋 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
王怡栋 36a36bd96c Merge branch 'sgm_fixbug' into 'master'
* Rename var.

See merge request easycorp/zentaopms!2015
2022-03-01 00:29:48 +00:00
孙广明 04b8ba2360 * Rename var. 2022-03-01 08:26:01 +08:00
王怡栋 19c8398090 Merge branch 'sprint/master_tanghucheng_lite' into 'master'
* Hide preference and tutorial.

See merge request easycorp/zentaopms!2010
2022-02-28 07:25:24 +00:00
孙广明 b6f0ad9ed2 Merge branch 'sprint/186_liumengyi_20103' into 'master'
* Fix bug #20103.

See merge request easycorp/zentaopms!2006
2022-02-28 07:18:58 +00:00
tanghucheng ccc11c4e4b * Hide preference and tutorial. 2022-02-28 15:18:57 +08:00
liumengyi 54fe05a303 * Fix bug #20103. 2022-02-28 15:16:36 +08:00
孙广明 5109d0a946 Merge branch 'sprint/186_hufangzhou_20119' into 'master'
* Fix bug #20119.

See merge request easycorp/zentaopms!2008
2022-02-28 06:53:58 +00:00
zhujinyong 9fd0e4c3ed * Fix xuan extension. 2022-02-28 14:52:46 +08:00
hufangzhou b79cd2db12 * Fix bug #20119. 2022-02-28 14:27:46 +08:00