Commit Graph
34664 Commits
Author SHA1 Message Date
王怡栋 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
王怡栋 36a36bd96c Merge branch 'sgm_fixbug' into 'master'
* Rename var.

See merge request easycorp/zentaopms!2015
2022-03-01 00:29:48 +00:00
李玉春 e70d9ea819 Merge branch 'devops22_zenggang_unit' into 'master'
修改sonarqube 8个方法为新的代码风格

See merge request easycorp/zentaopms!1968
2022-03-01 00:26:03 +00:00
孙广明 04b8ba2360 * Rename var. 2022-03-01 08:26:01 +08:00
王怡栋 94b35a01a2 Merge branch 'sgm_version' into 'master'
* Fix version.

See merge request easycorp/zentaopms!2011
2022-02-28 07:27:59 +00:00
孙广明 576c1d9872 * Fix version. 2022-02-28 15:26:26 +08:00
王怡栋 f4e212e93f Merge branch 'sprint/185_lanzongjun_49340' into 'master'
* fix task 49340

See merge request easycorp/zentaopms!2005
2022-02-28 07:26:07 +00: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
zhujinyong 994cb810ef * Fix xuan extension. 2022-02-28 14:41:44 +08:00
hufangzhou b79cd2db12 * Fix bug #20119. 2022-02-28 14:27:46 +08:00
王怡栋 4f6834011c * fix bug for revert team when edit project. 2022-02-28 14:21:45 +08:00
liumengyi 1ccbf30716 * Fix bug #20103. 2022-02-28 14:09:57 +08:00
Zongjun Lan 449b45b918 * fix task 49340 2022-02-28 13:25:34 +08:00
zhujinyong 974528bfbd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-02-28 13:01:38 +08:00
zhujinyong 851cf70593 * Fix error of api demo. 2022-02-28 13:01:06 +08:00
孙广明 4228a5e690 Merge branch 'sprint/186_tianshujie_19834' into 'master'
* Fix bug #19834.

See merge request easycorp/zentaopms!2004
2022-02-28 03:25:52 +00:00
tianshujie 9071214c7f * Fix bug #19834. 2022-02-28 11:23:52 +08:00
朱金勇 b6810e0b24 Merge branch 'sgm_upgrade' into 'master'
* Remove unused code.

See merge request easycorp/zentaopms!2003
2022-02-28 03:17:09 +00:00
孙广明 cc7e29e208 * Remove unused code. 2022-02-28 11:14:49 +08:00
王怡栋 a6aebb723c Merge branch 'sprint/185_lanzongjun_49335' into 'master'
* fix task 49335

See merge request easycorp/zentaopms!2001
2022-02-28 03:13:32 +00:00
zhujinyong 4409ae1978 * Fix api of editing execution. 2022-02-28 11:12:32 +08:00
王怡栋 811af8aeaa Merge branch 'sprint/master_tanghucheng_49384' into 'master'
* Finish task #49384.

See merge request easycorp/zentaopms!1998
2022-02-28 03:07:25 +00:00
王怡栋 52550f9bee Merge branch 'sgm_upgrade' into 'master'
* Add upgrade sql to install.

See merge request easycorp/zentaopms!2000
2022-02-28 03:06:45 +00:00
孙广明 77c462d397 Merge branch 'sprint/186_liumengyi_19982' into 'master'
* Modify xuanxuan inlcude.

See merge request easycorp/zentaopms!2002
2022-02-28 03:05:52 +00:00