Commit Graph

45124 Commits

Author SHA1 Message Date
王怡栋
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
曹延义
dd8e746a3c * Modify mobile qrcode get when server is offline. 2022-09-21 11:24:37 +08:00
zenggang
1d92e4b166 * Code for feedback#933 2022-09-21 03:08:57 +00:00
tianshujie
23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
zenggang
943e27d41c * Code for feedback#953 2022-09-21 02:05:58 +00:00
李玉春
d7f9b703af Merge branch 'ta_liyang' into 'master'
* Add ci stage.

See merge request easycorp/zentaopms!5439
2022-09-21 01:53:28 +00:00
liyang
6d4b2a2b8d * Add ci stage. 2022-09-21 09:51:19 +08:00
hufangzhou
0dad4d834f * Handle feedback #863. 2022-09-21 09:46:38 +08:00
zhouxin
6ff8f6ba41 * Resolve feedback. 2022-09-20 17:24:37 +08:00
dingyongliang
b435a95dd7 * task #70021, rm showClose btn. 2022-09-20 08:58:13 +00:00
王怡栋
7af73dc220 Merge branch 'sprint/238_dyl_68927' into 'master'
Sprint/238 dyl 68927

See merge request easycorp/zentaopms!5431
2022-09-20 08:34:29 +00:00
hufangzhou
d64d98cb16 * Fixed an issue where submodules could not be obtained. 2022-09-20 13:40:13 +08:00
孙广明
995653a760 Merge branch 'mayue_fix_bug#27535' into 'master'
* Fix bug #27535.

See merge request easycorp/zentaopms!5406
2022-09-19 09:24:09 +00:00
孙广明
9dca9eb0e1 Merge branch 'feedback_zhouxin_254' into 'master'
* Solve feedback #254.

See merge request easycorp/zentaopms!5413
2022-09-19 09:23:18 +00:00
zhouxin
55dd069752 * Solve feedback #254. 2022-09-19 16:58:56 +08:00
李玉春
a2a62c58a7 Merge branch 'ta_liyang' into 'master'
* Fix user password.

See merge request easycorp/zentaopms!5403
2022-09-19 07:57:36 +00:00
liyang
5d61e777bd * Fix user password. 2022-09-19 07:36:19 +00:00
李玉春
b79de55fc6 Merge branch 'cyy_bug_import' into 'master'
* Modify bug import.

See merge request easycorp/zentaopms!5398
2022-09-19 06:22:19 +00:00
李玉春
e5b693af5e Merge branch 'dht_unittest' into 'master'
* Fix set null qusetion.

See merge request easycorp/zentaopms!5386
2022-09-19 06:21:47 +00:00
曹延义
4b5987fd29 * Modify bug import. 2022-09-19 14:17:13 +08:00
mayue
f206391ee6 * Fix bug #27535. 2022-09-19 13:54:34 +08:00
wangyidong
47a855e35f Merge branch 'sprint/wangyidong_bug' 2022-09-19 13:48:27 +08:00
王怡栋
a86c5da4fe Merge branch 'feedback_835' into 'master'
* Code for feedback#835

See merge request easycorp/zentaopms!5355
2022-09-19 05:43:09 +00:00
liuhong
bb639d5b8b *Fix freeback #5317 adjust the code format 2022-09-19 05:40:03 +00:00
王怡栋
e067e74363 Merge branch 'feedback_878' into 'master'
* Code for feedback#878

See merge request easycorp/zentaopms!5316
2022-09-19 05:38:18 +00:00
王怡栋
fea946a6d0 Merge branch 'master_xieqiyu_27528' into 'master'
* Fix bug#27528.

See merge request easycorp/zentaopms!5384
2022-09-19 05:37:47 +00:00
王怡栋
ecdce29687 Merge branch 'master_liuhong_27291' into 'master'
Master liuhong 27291

See merge request easycorp/zentaopms!5385
2022-09-19 05:37:25 +00:00
王怡栋
0801b4a668 Merge branch 'master_liuhong_27183' into 'master'
Master liuhong 27183

See merge request easycorp/zentaopms!5388
2022-09-19 05:36:46 +00:00
liuhong
624c000f7d *Fix bug #27183 for newline when kanban create task. 2022-09-19 02:15:34 +00:00
tianshujie
6f9364520e * Fix bug #27503. 2022-09-19 09:21:09 +08:00
denghongtao
86f4412952 * Fix set null qusetion. 2022-09-19 00:57:08 +00:00
liuhong
c3a1bedeef *Fix bug #27291. 2022-09-19 00:27:43 +00:00
xieqiyu
104787503b * Fix bug#27528. 2022-09-19 00:19:56 +00:00
liuhong
3c27ea607f *Fix bug #27291 for show duplicate requirements. 2022-09-18 13:21:03 +00:00
liuhong
bb9c39479d *Finish freeback #5317. 2022-09-17 01:57:22 +00:00
dingyongliang
6c2d51f30a * fix swipeRegionNavTabs. 2022-09-16 07:01:40 +00:00
wangyidong
494db5c359 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-09-16 15:00:51 +08:00
wangyidong
d6f395cc1b * fix bug #27012. 2022-09-16 15:00:21 +08:00
孙广明
2a55eacdb3 Merge branch 'lyk_37132' into 'master'
* Finish story #37132.

See merge request easycorp/zentaopms!5378
2022-09-16 06:32:22 +00:00
dingyongliang
a52b6135af * adjust the button position. 2022-09-16 06:27:49 +00:00