Commit Graph
50031 Commits
Author SHA1 Message Date
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
wangyidong 2f03f91cf4 * adjust code. 2023-01-04 13:31:58 +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
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
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
liugang 68dc8d2fc7 * Replace the english semicolon with chinese one. 2023-01-03 15:04:04 +08:00
hufangzhou b78f98e0e8 * Add the desc of new version. 2023-01-03 14:50:55 +08:00
孙广明 71db414b19 Merge branch 'zenops_46' into 'master'
Merge zenops_46  into  'master'

See merge request easycorp/zentaopms!6669
2023-01-03 06:18:50 +00:00
tanghucheng bf4a0d1bd7 Merge branch 'master' into zenops_46 2023-01-03 14:17:40 +08:00
tanghucheng bb166715ce Merge remote-tracking branch 'origin/master' into zenops_46 2023-01-03 14:11:38 +08:00
王怡栋 62d60df7bd Merge branch 'sprint/hufangzhou_newVersion' into 'master'
* Add the new version.

See merge request easycorp/zentaopms!6668
2023-01-03 06:09:21 +00:00
hufangzhou b5859c7dc3 * Add the new version. 2023-01-03 13:56:27 +08:00
孙广明 c29776bbfe Merge branch 'sprint/tsj_fixbug' into 'master'
Sprint/tsj fixbug

See merge request easycorp/zentaopms!6667
2023-01-03 05:54:09 +00:00
tanghucheng 0d4ae4ba95 * Fix language. 2023-01-03 13:42:04 +08:00
王怡栋 0a41c01b88 Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!6666
2023-01-03 05:35:16 +00:00
王怡栋 08bc53afb5 Merge branch 'zenops_46' into 'master'
Merge branch 'zenops_46' into master

See merge request easycorp/zentaopms!6662
2023-01-03 05:34:51 +00:00
caoyanyi 3b5531b694 * Modify chosen. 2023-01-03 13:32:10 +08:00
caoyanyi 32fd823243 * Modify tutorial error. 2023-01-03 13:31:53 +08:00
caoyanyi b9e1381d11 * Fix bug #31375. 2023-01-03 13:31:19 +08:00
zhaoke 0fbdc3ca87 Merge branch 'zenops_46' of https://gitlab.zcorp.cc/easycorp/zentaopms into zenops_46 2023-01-03 05:26:25 +00:00
zhaoke f8a69684b4 * Fix bug 31348. 2023-01-03 05:26:19 +00:00
tanghucheng f05e53043b * Fix code style. 2023-01-03 13:03:25 +08:00
tanghucheng 584754a7f8 Merge branch 'master' into zenops_46 2023-01-03 11:04:33 +08:00
tanghucheng 6374437b91 * Fix bug #31360. 2023-01-03 11:02:00 +08:00
孙广明 47964d675f Merge branch 'lyk_feedback_1322' into 'master'
* Reslve feedback #1322.

See merge request easycorp/zentaopms!6663
2023-01-03 02:50:42 +00:00
liuyongkai d0db3a7e88 * Reslve feedback #1322. 2023-01-03 10:43:24 +08:00
tanghucheng 4887616389 * Fix issue for zanode. 2023-01-03 09:56:15 +08:00
王怡栋 f0e21c3f74 Merge branch 'cyy_bug' into 'master'
Cyy bug

See merge request easycorp/zentaopms!6661
2023-01-03 01:54:41 +00:00
王怡栋 aef16e3c83 Merge branch 'sprint/gfl_task_40825' into 'master'
* code for task #40827

See merge request easycorp/zentaopms!6659
2023-01-03 01:54:28 +00:00
tianshujie b2142bed14 * Fix bug #30169. 2023-01-03 09:45:11 +08:00