Commit Graph
51876 Commits
Author SHA1 Message Date
caoyanyi ac2891ac41 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 13:53:09 +08:00
caoyanyi c38ea2b672 * Add test case. 2023-02-28 13:45:42 +08:00
孙广明 86a113c8ec Merge branch 'tsj_ui' into 'master'
Tsj ui

See merge request easycorp/zentaopms!7084
2023-02-28 05:29:37 +00:00
caoyanyi d6fe7e5e79 * Fix bug #32453. 2023-02-28 13:27:47 +08:00
孙广明 260c4c0528 Merge branch 'zenops_62' into 'master'
Zenops 62

See merge request easycorp/zentaopms!7087
2023-02-28 05:22:00 +00:00
zhaoke 0e5b0bedfa * Format code. 2023-02-28 13:19:36 +08:00
zhaoke 497618313b * Update zanode lang. 2023-02-28 13:14:06 +08:00
tianshujie c82f1a02a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui 2023-02-28 13:13:13 +08:00
zhujinyong 39822c34a6 * Fix bug: orderBy is not defined. 2023-02-28 13:07:35 +08:00
tianshujie b8e6b2fae0 * Modify desc for create user. 2023-02-28 13:05:38 +08:00
caoyanyi 218f57e0e3 * Modify icon name. 2023-02-28 12:31:08 +08:00
caoyanyi ef0c77d611 * Modify tutorial tip. 2023-02-28 12:28:15 +08:00
tianshujie cd595dc605 * Code for fix bug #32461. 2023-02-28 11:03:02 +08:00
tianshujie 573b2ef793 * Modify the holiday list style. 2023-02-28 10:36:01 +08:00
tianshujie f6a573a51f * Code for fix bug #32458. 2023-02-28 10:32:13 +08:00
zhujinyong 07f2c4520e * Fix bug: hide bug in tree view. 2023-02-28 10:18:51 +08:00
zhujinyong 60198497ba * Fix bug: hidden story or bug in kanban or sprint. 2023-02-28 10:10:37 +08:00
caoyanyi 8d6459f66f * Modify branch name. 2023-02-28 09:57:03 +08:00
Yagami 445c93b4a9 * Remove unused sql. 2023-02-28 09:47:06 +08:00
tianshujie 9ba8629107 * Skip repetitive navigation. 2023-02-28 09:36:22 +08:00
tianshujie 2a003865f4 * Code for finish task #84526. 2023-02-28 09:09:16 +08:00
tianshujie 5fe4075ef1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 08:26:03 +08:00
孙广明 7c88a66ae9 Merge branch 'sprint/fixbug_liumengyi_32444' into 'master'
* Fix bug 32444 32445.

See merge request easycorp/zentaopms!7082
2023-02-27 08:51:29 +00:00
tianshujie eb04e06f11 * Modify tip for system block. 2023-02-27 16:49:20 +08:00
tianshujie 28b40db1de * Modify helper url for admin block. 2023-02-27 16:48:56 +08:00
tianshujie 1fb329fd8d * Optimize the display of grey blocksOptimize the display of grey blocks. 2023-02-27 16:42:54 +08:00
tianshujie 8898dd6f9c * Code for fix bug #32447. 2023-02-27 16:38:18 +08:00
liumengyi 1d0e0aa68c * Fix bug #32445. 2023-02-27 08:38:16 +00:00
liumengyi 8cad561792 * Fix bug #32444. 2023-02-27 08:37:57 +00:00
胡方舟 fa77c297e9 Merge branch 'Fix_zanode_lang' into 'master'
* Fix zanode lang file.

See merge request easycorp/zentaopms!7078
2023-02-27 08:23:16 +00:00
caoyanyi f20d64e70b * Update test case. 2023-02-27 16:23:11 +08:00
wangyidong 71f0edcb20 * add new priv for custom-hours. 2023-02-27 16:20:06 +08:00
wangyidong 11507ffff2 * fix bug #32277. 2023-02-27 16:16:04 +08:00
caoyanyi 1753a65dc3 * Modify page reload. 2023-02-27 16:10:53 +08:00
tianshujie fc99d01af9 * Fixed Save labels clearing other labels. 2023-02-27 16:09:06 +08:00
hufangzhou 6399f9dff7 * Format the output. 2023-02-27 07:41:38 +00:00
tianshujie 9f013dea5f Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-27 15:29:33 +08:00
tianshujie cf4c9931e2 * Code for finish task #84527. 2023-02-27 15:29:02 +08:00
caoyanyi f2441f7197 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-27 15:28:14 +08:00
王怡栋 ef2b5b2461 Merge branch 'dev/gfl_85502' into 'master'
Dev/gfl 85502

See merge request easycorp/zentaopms!7080
2023-02-27 07:26:37 +00:00
guofeilong 60716280fd * ZUI: zui/min.js refactors . 2023-02-27 15:21:20 +08:00
guofeilong 1f88b86fda * Code for update zui/min.js . 2023-02-27 15:13:03 +08:00
zhaoke 1bf386225a * Fix zanode lang file. 2023-02-27 15:09:26 +08:00
孙广明 167539f822 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Modify menu name.

See merge request easycorp/zentaopms!7076
2023-02-27 06:59:14 +00:00
王怡栋 8b56c39297 Merge branch 'sprint/hufangzhou_package' into 'master'
Sprint/hufangzhou package

See merge request easycorp/zentaopms!7077
2023-02-27 06:58:39 +00:00
liumengyi 599150da94 * Fix bug #32442. 2023-02-27 06:58:37 +00:00
hufangzhou f41f2cfb9b * Add the lang item. 2023-02-27 06:57:19 +00:00
hufangzhou 42769d3425 * Add the new version. 2023-02-27 06:51:34 +00:00
liumengyi a26a5c5860 * Fix sql error. 2023-02-27 06:41:48 +00:00
liugang c9115f7a21 * Revert menus, privileges and pages of report. 2023-02-27 06:39:37 +00:00