Commit Graph
41150 Commits
Author SHA1 Message Date
chaideqing 83c92086eb * refactor, code format 2022-07-13 13:54:21 +08:00
chaideqing c5ee9f589c * refactor code 2022-07-11 17:16:17 +08:00
chaideqing 5965752003 * adjust xuanxuan notification center logic, task #58691 2022-07-01 16:27:40 +08:00
dingyongliang d01dd34431 * electron/zentao: fix confirm. 2022-06-30 01:47:45 +00:00
chaideqing 600ac72829 * modify notify style, task #58690 2022-06-29 14:10:00 +08:00
王怡栋 08d27f8d79 Merge branch 'sprint/208_tianshujie_24365' into 'master'
* Fix bug #24365.

See merge request easycorp/zentaopms!4210
2022-06-29 05:41:36 +00:00
tianshujie 105ab0aeeb * Fix bug #24365. 2022-06-29 13:39:26 +08:00
李玉春 4b2165be06 Merge branch 'sprint/zentaoat_liyang' into 'master'
*Fix Bug for copyDB

See merge request easycorp/zentaopms!4209
2022-06-29 05:38:55 +00:00
孙广明 c266884a88 Merge branch 'cyy_gitlab' into 'master'
* Modify gitlab token check and repo create gitlab list.

See merge request easycorp/zentaopms!4204
2022-06-29 05:37:20 +00:00
liyang 618be4ce3c *Fix Bug for copyDB 2022-06-29 13:36:30 +08:00
王怡栋 19f69fa354 Merge branch 'sprint/208_liumengyi_686' into 'master'
* Fix issue #686.

See merge request easycorp/zentaopms!4208
2022-06-29 05:35:33 +00:00
孙广明 4dc9c76e9c Merge branch 'sprint209_leiyong_task_58578' into 'master'
* Finish task#58578.

See merge request easycorp/zentaopms!4200
2022-06-29 05:34:12 +00:00
liumengyi 6669ccb37a * Fix issue #686. 2022-06-29 13:34:09 +08:00
孙广明 d49c660900 Merge branch 'fixbug_24438' into 'master'
fixbug_24438

See merge request easycorp/zentaopms!4206
2022-06-29 05:33:56 +00:00
朱金勇 972449c77a Merge branch 'sprint/209_hufangzhou_package' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!4207
2022-06-29 05:29:10 +00:00
孙广明 b9f3120c8b * Fix bug #24508. 2022-06-29 13:29:03 +08:00
wangyidong 8ee7afc941 * fix bug #24104. 2022-06-29 13:26:58 +08:00
hufangzhou cb49804253 * Add the new version. 2022-06-29 13:18:20 +08:00
sunjun d0bfee6d69 fixbug_24438 2022-06-29 05:11:49 +00:00
wangyidong adedb487b5 * fix bug #24242. 2022-06-29 10:46:50 +08:00
王怡栋 bd97e4fe19 Merge branch 'sprint/208_tianshujie_24391' into 'master'
* Fix bug #24391.

See merge request easycorp/zentaopms!4205
2022-06-29 02:41:59 +00:00
tianshujie 1592cefab6 * Fix bug #24391. 2022-06-29 10:40:44 +08:00
caoyanyi 47e6e1c543 * Modify gitlab token check and repo create gitlab list. 2022-06-29 10:23:13 +08:00
孙广明 59eeeced39 Merge branch 'sprint210_zg' into 'master'
* Finish task#58772,58774,58775

See merge request easycorp/zentaopms!4184
2022-06-29 01:14:39 +00:00
管西迎 2187050810 * Update .gitlab-ci.yml for test sonar. 2022-06-29 00:56:45 +00:00
王怡栋 da5b1d560c Merge branch 'fixbug' into 'master'
* Fix bug #23354.

See merge request easycorp/zentaopms!4203
2022-06-29 00:48:57 +00:00
tanghucheng e656139643 * Fix bug . 2022-06-29 08:48:23 +08:00
王怡栋 1d0c857215 Merge branch 'sprint/208_liumengyi_24500' into 'master'
* Fix bug #24500.

See merge request easycorp/zentaopms!4201
2022-06-29 00:44:52 +00:00
王怡栋 dde3f2c087 Merge branch 'sprint/208_tianshujie_58560' into 'master'
* Finish task #58560.

See merge request easycorp/zentaopms!4202
2022-06-29 00:44:35 +00:00
tianshujie d597775c7e * Finish task #58560. 2022-06-29 08:35:21 +08:00
liumengyi a6d87c2539 * Fix bug #24500. 2022-06-29 08:13:59 +08:00
tanghucheng 26ae6a991f * Fix bug #23354. 2022-06-28 21:33:42 +08:00
tanghucheng ba0b9139b5 * Fix bug #24114. 2022-06-28 20:47:56 +08:00
tanghucheng d6722bbfbc * Fix bug #23978. 2022-06-28 20:23:40 +08:00
leiyong f888f66bf5 * Finish task#58578. 2022-06-28 09:59:34 +00:00
王怡栋 62fc297642 Merge branch 'sprint/master_zhouxudong_24398' into 'master'
* Fix bug $24398.

See merge request easycorp/zentaopms!4199
2022-06-28 09:32:34 +00:00
王怡栋 e05ac602cc Merge branch 'master_xieqiyu_58567' into 'master'
Master xieqiyu 58567

See merge request easycorp/zentaopms!4197
2022-06-28 09:31:57 +00:00
zhouxudong 7e600bf701 * Fix bug $24398. 2022-06-28 09:26:52 +00:00
xieqiyu a757ea76c1 * Code for task#58567. 2022-06-28 17:23:20 +08:00
王怡栋 11e681d2f7 Merge branch 'sprint/master_zhouxudong_58605' into 'master'
* Finish task #58605.

See merge request easycorp/zentaopms!4198
2022-06-28 09:04:34 +00:00
xieqiyu 92926fce1d * Finish task#58567. 2022-06-28 16:48:45 +08:00
王怡栋 c6a0541e58 Merge branch 'sgm_action' into 'master'
* Code for action details.

See merge request easycorp/zentaopms!4192
2022-06-28 08:45:27 +00:00
孙广明 8eec750c83 Merge branch 'sprint/210_mayue_bug#24479' into 'master'
* Fix bug #24479.

See merge request easycorp/zentaopms!4196
2022-06-28 08:40:07 +00:00
孙广明 02b10075ae Merge branch 'sprint/210_mayue_bug#24482' into 'master'
* Fix bug #24482.

See merge request easycorp/zentaopms!4195
2022-06-28 08:35:45 +00:00
mayue 6fd3657052 * Fix bug #24479. 2022-06-28 16:34:27 +08:00
mayue c1c145e4b7 * Fix bug #24482. 2022-06-28 16:27:10 +08:00
孙广明 f325c96060 Merge branch 'sprint/208_liumengyi_fixbug' into 'master'
* Fix bug #24468, #24475.

See merge request easycorp/zentaopms!4194
2022-06-28 08:23:07 +00:00
liumengyi c61cc238c0 * Fix bug #24475. 2022-06-28 16:16:51 +08:00
xieqiyu 3d7fd651db * Code for task#58567. 2022-06-28 16:11:40 +08:00
孙广明 6119092ed8 Merge branch 'sgm_fixbug' into 'master'
* Fix bug #24423.

See merge request easycorp/zentaopms!4193
2022-06-28 07:51:38 +00:00