Commit Graph
37073 Commits
Author SHA1 Message Date
王怡栋 13c1c783ff Merge branch 'sprint/241_tianshujie_task' into 'master'
* Finish task #70096.

See merge request easycorp/zentaopms!5497
2022-09-23 01:20:00 +00:00
tianshujie 3d210a3666 * Finish task #70098. 2022-09-23 09:15:01 +08:00
王怡栋 3d756f3771 Merge branch 'master_xieqiyu_27797' into 'master'
* Fix bug#27797.

See merge request easycorp/zentaopms!5490
2022-09-23 01:05:45 +00:00
王怡栋 504e24ffff Merge branch 'sprint/241_dyl_70023' into 'master'
* task #70023, adjust danger label position.

See merge request easycorp/zentaopms!5482
2022-09-23 01:04:31 +00:00
tianshujie 6fd346708e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/241_tianshujie_task 2022-09-23 08:08:42 +08:00
tianshujie a6cd4e549c * Finish task #70094. 2022-09-22 18:13:50 +08:00
tianshujie 4908ead6e8 * Finish task #70098. 2022-09-22 18:03:03 +08:00
tianshujie 500078a229 * Finish task #70096. 2022-09-22 17:31:40 +08:00
孙广明 8189cba66c Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
Sprint/241 tianshujie fixbug

See merge request easycorp/zentaopms!5491
2022-09-22 09:15:44 +00:00
dingyongliang 6de9161ff0 * change kanban tabs cursor. 2022-09-22 09:15:32 +00:00
tianshujie 52fb3e71f7 * Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096.* Finish task #70096. 2022-09-22 16:58:27 +08:00
李玉春 29a4e33369 Merge branch 'sprint/cyy_70095' into 'master'
* Finish task #70095.

See merge request easycorp/zentaopms!5486
2022-09-22 08:56:33 +00:00
李玉春 749463b85b Merge branch 'sprint/241_dyl_70026' into 'master'
* task #70026, replace more icon.

See merge request easycorp/zentaopms!5481
2022-09-22 08:39:23 +00:00
曹延义 e500e05598 * Finish task #70093. 2022-09-22 16:21:56 +08:00
曹延义 b82fe4e667 * Finish task #70099. 2022-09-22 16:00:42 +08:00
xieqiyu a49b349d80 * Fix bug#27797. 2022-09-22 07:52:43 +00:00
曹延义 0ece96c860 * Finish task #70100. 2022-09-22 15:23:18 +08:00
曹延义 1d195ca297 * Finish task #70095. 2022-09-22 15:14:22 +08:00
dingyongliang 5525ee47a4 * set confirmed field center. 2022-09-22 07:03:57 +00:00
tianshujie f97e85ee2f * Fix bug #27687. 2022-09-22 14:55:34 +08:00
dingyongliang 7416757b1d * task #70023, adjust danger label position. 2022-09-22 06:40:37 +00:00
tianshujie 508c8256e3 * Adjust region tab style. 2022-09-22 14:30:32 +08:00
dingyongliang 6f8533ae78 * task #70026, replace more icon. 2022-09-22 06:17:09 +00:00
李玉春 3aefc5bee0 Merge branch 'sprint/238_wangzemei_68933' into 'master'
Sprint/238 wangzemei 68933

See merge request easycorp/zentaopms!5478
2022-09-22 06:09:46 +00:00
王怡栋 d4ed48e790 Merge branch 'sprint/241_dyl_70018' into 'master'
* task #70018, change bug confirmed color.

See merge request easycorp/zentaopms!5467
2022-09-22 06:09:26 +00:00
王怡栋 e2a3dd7344 Merge branch 'sprint/241_dyl_70025' into 'master'
* task #70025, set program title bold.

See merge request easycorp/zentaopms!5475
2022-09-22 06:08:19 +00:00
wangzemei b77ad0dff7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/238_wangzemei_68933 2022-09-22 13:50:12 +08:00
孙广明 bc4d97d825 Merge branch 'feedback_zhouxin_01' into 'master'
* Resolve feedback.

See merge request easycorp/zentaopms!5463
2022-09-22 05:21:52 +00:00
李玉春 8ba6b3f491 Merge branch 'sprint/241_tianshujie_70020' into 'master'
* Finish task #70020.

See merge request easycorp/zentaopms!5476
2022-09-22 03:13:44 +00:00
孙广明 0a2b052e43 Merge branch 'feedback_zhouxin_854' into 'master'
* Resolve feedback #854.

See merge request easycorp/zentaopms!5474
2022-09-22 03:07:13 +00:00
孙广明 86941afc2e Merge branch 'sprint/hufangzhou_moduleTree' into 'master'
* Fixed an issue where submodules could not be obtained.

See merge request easycorp/zentaopms!5424
2022-09-22 03:06:57 +00:00
tianshujie 65ce7cb599 * Finish task #70020. 2022-09-22 10:55:46 +08:00
zhouxin e095fe4384 * Resolve feedback #854. 2022-09-22 10:52:46 +08:00
dingyongliang 455aa2b0a8 * task #70025, set program title bold. 2022-09-22 01:18:01 +00:00
dingyongliang c7c4ec7429 * task #70018, change bug confirmed color. 2022-09-22 01:12:16 +00:00
王怡栋 a5f7ea7d3f Merge branch 'feedback_957' into 'master'
* Code for feedback#957

See merge request easycorp/zentaopms!5461
2022-09-21 09:16:46 +00:00
王怡栋 5c39464bc6 Merge branch 'sprint/241_dyl_70021' into 'master'
* task #70021, rm showClose btn.

See merge request easycorp/zentaopms!5457
2022-09-21 09:14:45 +00:00
王怡栋 2b39a8f8f6 Merge branch 'sprint/241_dyl_70027' into 'master'
* task #70027, rm project icon.

See merge request easycorp/zentaopms!5456
2022-09-21 09:14:24 +00:00
王怡栋 0b78b8f902 Merge branch 'master_freeback_5328' into 'master'
*Fix freeback open #5318.

See merge request easycorp/zentaopms!5454
2022-09-21 09:08:47 +00:00
王怡栋 7f4b94b66c Merge branch 'master_freeback_5317' into 'master'
Master freeback 5317

See merge request easycorp/zentaopms!5393
2022-09-21 09:08:11 +00:00
zenggang 307c4b3a5f * Code for feedback#957 2022-09-21 08:25:09 +00:00
liuhong 03e64482b9 *Fix freeback #5317. 2022-09-21 07:14:32 +00:00
李玉春 0449c8750a Merge branch 'cyy_web_outside' into 'master'
* Modify mobile qrcode get when server is offline.

See merge request easycorp/zentaopms!5448
2022-09-21 07:05:00 +00:00
dingyongliang f311f9d411 * task #70027, rm project icon. 2022-09-21 06:34:20 +00:00
liuhong 04edc9df16 *Fix freeback #5317 adjust code. 2022-09-21 05:42:15 +00:00
liuhong b9de2c36b7 *Fix freeback open #5318. 2022-09-21 05:39:15 +00:00
王怡栋 ecbb1e7b43 Merge branch 'feedback_953' into 'master'
* Code for feedback#953

See merge request easycorp/zentaopms!5441
2022-09-21 05:20:56 +00:00
王怡栋 08e1d5212d Merge branch 'feedback_933' into 'master'
* Code for feedback#933

See merge request easycorp/zentaopms!5445
2022-09-21 05:19:20 +00:00
李玉春 c53809e799 Merge branch 'sprint/241_tianshujie_68934' into 'master'
* Finish task #68934.

See merge request easycorp/zentaopms!5449
2022-09-21 05:13:34 +00:00
李玉春 a30f398bc2 Merge branch 'sprint/241_tianshujie_fixbug' into 'master'
* Fix bug #27503.

See merge request easycorp/zentaopms!5442
2022-09-21 05:12:42 +00:00