Commit Graph
50056 Commits
Author SHA1 Message Date
daitingting f8df2cd571 * Finish task #82073. 2023-01-05 03:05:51 +00:00
王怡栋 a846499f92 Merge branch 'zentaopms_283_task_#82075' into 'zentaopms_283'
* Finish task #82075.

See merge request easycorp/zentaopms!6686
2023-01-04 08:39:03 +00:00
daitingting 80cce4e580 * Finish task #82075. 2023-01-04 08:08:38 +00:00
孙广明 417f56c09d Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!6684
2023-01-04 07:26:21 +00:00
孙广明 42ac91d2de Merge branch 'sprint/tsj_fixbug' into 'master'
* Fix bug #31439.

See merge request easycorp/zentaopms!6683
2023-01-04 07:25:01 +00:00
田淑杰 624ac45620 * Fix bug #31439. 2023-01-04 15:20:35 +08:00
caoyanyi 4a75eb6ee2 * Adjust code. 2023-01-04 15:14:41 +08:00
caoyanyi 6ba888ea77 * Modify sonarqube memory limit. 2023-01-04 15:12:30 +08:00
田淑杰 289005c41a * Fix bug #31439. 2023-01-04 15:11:54 +08:00
caoyanyi 64f2c5f0be * Fix bug #31430. 2023-01-04 15:11:15 +08:00
孙广明 fb56b7377c Merge branch 'sprint/282_liumengyi_screencover' into 'master'
* Add the cover of screen 6.

See merge request easycorp/zentaopms!6681
2023-01-04 06:34:26 +00:00
孙广明 7a65ef1358 Merge branch 'zenops_46' into 'master'
Merge branch 'zenops_46'  into master

See merge request easycorp/zentaopms!6678
2023-01-04 06:34:17 +00:00
孙广明 aead5a6372 Merge branch 'master_xieqiyu_fixbug' into 'master'
* Fix bug of search.

See merge request easycorp/zentaopms!6682
2023-01-04 06:33:55 +00:00
xieqiyu 99ee8a6b3f * Fix bug of search. 2023-01-04 14:28:47 +08:00
liumengyi 7b243aba8e * Add the cover of screen 6. 2023-01-04 14:15:56 +08:00
liumengyi 93306623f1 * Add the cover of screen 6. 2023-01-04 14:13:11 +08:00
孙广明 2557d6c950 Merge branch 'sprint/tsj_fixbug' into 'master'
* Add upgrade delete file configuration.

See merge request easycorp/zentaopms!6680
2023-01-04 06:11:12 +00:00
tianshujie 5eeb79f0cf * Add upgrade delete file configuration. 2023-01-04 14:00:23 +08:00
tanghucheng b56690bd77 * Fix bug #31424. 2023-01-04 13:45:00 +08:00
wangyidong 2f03f91cf4 * adjust code. 2023-01-04 13:31:58 +08:00
tanghucheng 0c526f942f * Change image list icon. 2023-01-04 12:46:05 +08:00
tanghucheng 93b2d7aa07 * Fix bug #31216. 2023-01-04 12:39:41 +08:00
tanghucheng 992c28684d * Fix bug #31412. 2023-01-04 12:16:33 +08:00
wangyidong 9d013b80c5 * fix bug for compute weekly. 2023-01-04 10:28:52 +08:00
王怡栋 5eb1b82ea0 Merge branch 'cyy_bug' into 'master'
* Fix bug #31381.

See merge request easycorp/zentaopms!6675
2023-01-04 02:21:36 +00:00
caoyanyi b72143a535 * Modify cookie set. 2023-01-04 10:20:25 +08:00
caoyanyi cd17b6d3b2 * Adjust code. 2023-01-04 10:12:22 +08:00
王怡栋 0914d265f7 Merge branch 'sprint/wangzemei/kanban' into 'master'
* fix kanban css

See merge request easycorp/zentaopms!6673
2023-01-04 02:09:10 +00:00
zhaoke 5a49e1e579 * Fix bug 31329. 2023-01-04 01:47:37 +00:00
caoyanyi 8ac4dc8fd4 Merge branch 'master' into cyy_bug 2023-01-04 09:34:04 +08:00
caoyanyi c853331163 * Modify admin user check. 2023-01-04 09:33:08 +08:00
zhaoke 81a1bbe039 * Fix bug 31405. 2023-01-04 01:14:29 +00:00
zhaoke 677594648f Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2023-01-04 00:44:46 +00:00
zhaoke 2615cfc431 * Fix bug 31406. 2023-01-04 00:44:44 +00:00
caoyanyi c3f8d4873f * Fix bug #31397. 2023-01-03 17:09:58 +08:00
Yagami d9da8b3f91 * Rewrite module file. 2023-01-03 16:52:28 +08:00
朱金勇 ff9864a40c Merge branch 'sprint/lyk_fixtitle' into 'master'
* Splice project name for the execution name.

See merge request easycorp/zentaopms!6674
2023-01-03 08:51:26 +00:00
caoyanyi d2ccc61ab1 * Fix bug #31381. 2023-01-03 16:34:00 +08:00
liuyongkai dccdb6e255 * Splice project name for the execution name. 2023-01-03 16:06:59 +08:00
wangzemei 4f2b9530d0 * fix kanban css 2023-01-03 15:59:18 +08:00
liuyongkai 734346e9bc * Splice project name for the execution name. 2023-01-03 15:57:31 +08:00
孙广明 70ff62c564 Merge branch 'sprint/scx_xuanxuan' into 'master'
* Fix xuanxuan bug.

See merge request easycorp/zentaopms!6672
2023-01-03 07:53:39 +00:00
宋辰轩 dfd4ca483e * Fix xuanxuan bug. 2023-01-03 15:47:21 +08:00
王怡栋 99a5a7cfaf Merge branch 'sprint/hufangzhou_misclang' into 'master'
* Add the desc of new version.

See merge request easycorp/zentaopms!6670
2023-01-03 07:42:31 +00:00
王怡栋 a17823fe7e Merge branch 'sprint/wangzemei/css_kanban' into 'master'
* fix css of kanban

See merge request easycorp/zentaopms!6671
2023-01-03 07:42:16 +00:00
wangzemei c70d4da58a * fix css of kanban 2023-01-03 15:39:49 +08:00
liugang 9a0237930f * Fix bug #31237. 2023-01-03 15:37:47 +08:00
tanghucheng 3b6e194bd5 * Fix loading style. 2023-01-03 15:07:38 +08:00
zhaoke 20ecbe745e * Fix bug. 2023-01-03 07:05:19 +00:00
liugang 68dc8d2fc7 * Replace the english semicolon with chinese one. 2023-01-03 15:04:04 +08:00