Commit Graph
34635 Commits
Author SHA1 Message Date
王怡栋 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
liumengyi 76c7fe894a * Modify xuanxuan inlcude. 2022-02-28 11:03:59 +08:00
Zongjun Lan 8dd88cb766 * fix task 49335 2022-02-28 11:02:52 +08:00
孙广明 725f4abbae * Add upgrade sql to install. 2022-02-28 11:00:43 +08:00
孙广明 cca8c4eada Merge branch 'sprint/186_tianshujie_include' into 'master'
* Modify the noise loading path.

See merge request easycorp/zentaopms!1999
2022-02-28 02:59:10 +00:00
tianshujie 1ca1c52bd3 * Modify the noise loading path. 2022-02-28 10:57:31 +08:00
tanghucheng df928ab107 * Finish task #49384. 2022-02-28 10:47:02 +08:00
王怡栋 e937ed6183 Merge branch 'sgm_upgrade' into 'master'
* Fix upgrade lang.

See merge request easycorp/zentaopms!1997
2022-02-28 02:35:22 +00:00
孙广明 6b1c882cac * Fix upgrade lang. 2022-02-28 10:16:30 +08:00
王怡栋 f025447b5a Merge branch 'sprint/master_tanghucheng_lang' into 'master'
* Add en lang.

See merge request easycorp/zentaopms!1996
2022-02-28 02:07:21 +00:00
tanghucheng 954c8335dc * Fix lang. 2022-02-28 10:00:31 +08:00
tanghucheng c6571a7b27 * Fix en lang. 2022-02-28 09:56:56 +08:00
tanghucheng 5fb33055bc * Fix en lang. 2022-02-28 09:53:57 +08:00
孙广明 931d6ddc48 Merge branch 'sprint/186_tianshujie_lang' into 'master'
* Add English language item.

See merge request easycorp/zentaopms!1995
2022-02-28 01:52:59 +00:00
孙广明 a52e6774f8 Merge branch 'sprint/186_liumengyi_19982' into 'master'
* Fix bug #19982 and add English language items.

See merge request easycorp/zentaopms!1994
2022-02-28 01:52:24 +00:00
tianshujie 941bba2658 * Modify the repeated upgrade problem. 2022-02-28 09:51:53 +08:00
liumengyi 6f3585ea91 * Remove extra spaces. 2022-02-28 09:51:45 +08:00
tianshujie d2ca0c89bc * Add English language item. 2022-02-28 09:50:32 +08:00
王怡栋 c4e3559a95 Merge branch 'sgm_lang' into 'master'
* Add en lang.

See merge request easycorp/zentaopms!1993
2022-02-28 01:43:48 +00:00
孙广明 42869fb2ce * Remove space. 2022-02-28 09:42:26 +08:00
liumengyi d537b0f71c * Fix bug #19982 and add English language items. 2022-02-28 09:40:30 +08:00
孙广明 fd83d9cf41 * Add en lang. 2022-02-28 09:39:33 +08:00
孙广明 df55b0af1b Merge branch '185' 2022-02-28 08:58:20 +08:00
王怡栋 f3f91716c6 Merge branch 'sgm_upgrade' into 'sprint/185'
* Fix upgrade bug.

See merge request easycorp/zentaopms!1992
2022-02-28 00:49:56 +00:00
孙广明 ec16236bb5 * Fix upgrade bug. 2022-02-28 08:45:04 +08:00
zhujinyong 3f7ff4ee25 Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185 2022-02-25 17:37:29 +08:00
zhujinyong 08ea97263f * Fix hook files of xuan. 2022-02-25 17:37:10 +08:00
王怡栋 115d80f557 Merge branch 'sgm_fixbug' into sprint/185 2022-02-25 17:22:04 +08:00