Commit Graph
4034 Commits
Author SHA1 Message Date
Yagami a75976fa94 * Fix bug #35363. 2023-05-18 16:38:14 +08:00
Yagami 3d80c2e547 * Fix bug #35240. 2023-05-17 09:57:41 +08:00
Yagami ffd2b525c8 * Change judgment condition. 2023-05-04 17:05:52 +08:00
Yagami 1f00f62914 * Change ipd to or. 2023-05-04 15:23:33 +08:00
tanghucheng 45321653ca Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-28 13:10:24 +08:00
caoyanyi d02b3f1946 * Modify qrcode imgae. 2023-04-27 10:48:11 +08:00
caoyanyi a83cb3fc39 * Modify download qrcode. 2023-04-27 09:16:36 +08:00
caoyanyi 365e76bbe3 * Adjust code. 2023-04-26 19:00:29 +08:00
caoyanyi 5d4ce7e138 * Modify app download qrcode. 2023-04-26 17:43:01 +08:00
wangyidong 75e4b26c52 * fix bug #34717. 2023-04-24 19:07:05 +08:00
liumengyi 8d6cc429af * Fix bug #34711. 2023-04-24 16:43:00 +08:00
liumengyi f8b23f567c * Fix bug #34711. 2023-04-24 16:21:42 +08:00
tanghucheng c8a626480d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-21 13:49:46 +08:00
tanghucheng 36c17cb88a * Fix bug #34092. 2023-04-20 17:18:01 +08:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
tianshujie 2059a74de0 * Fix bug #34461. 2023-04-20 11:32:34 +08:00
tanghucheng 8bf4bbccf0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-20 09:50:22 +08:00
tianshujie 0f2a2b7bc3 * Fixed the interface details style problem. 2023-04-19 17:14:32 +08:00
caoyanyi 658b918897 * Modify api view page style. 2023-04-19 16:16:30 +08:00
liumengyi 7fe3662ea7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 14:09:20 +08:00
hufangzhou 577fc81216 * Move the holidayseason from biz to open edition. 2023-04-19 10:20:41 +08:00
朱金勇 72155fc3b8 * Fix bug for dmdb. 2023-04-19 01:41:34 +00:00
tanghucheng 5667eeab9d * Adjust for common::buildIconButton. 2023-04-18 09:46:46 +08:00
tanghucheng 93ffc06caa * Code for task #91093. 2023-04-17 17:13:30 +08:00
tanghucheng 0a944b7e11 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-14 16:38:09 +08:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
tianshujie f954e7935c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_issue 2023-04-14 13:31:12 +08:00
liugang 700c80534a + Init navGroup of report module. 2023-04-14 05:22:52 +00:00
朱金勇 e6b2ea4a04 Merge branch 'zenops_69' 2023-04-14 04:41:28 +00:00
liugang 16431eee37 + Init bi common lang. 2023-04-14 02:19:24 +00:00
liugang f3a6a26f67 * Rename report of mainNav to bi. 2023-04-14 02:18:36 +00:00
liugang 55fb03a3ee * Change report common lang from bi to report. 2023-04-14 01:49:18 +00:00
tianshujie 313949280d * Resolve issue #771. 2023-04-14 09:00:42 +08:00
tianshujie d2782dc46a * Resolve issue #775. 2023-04-13 16:37:20 +08:00
tianshujie e279e91070 * Resolve issue #775. 2023-04-13 16:22:45 +08:00
liumengyi bd6ada9429 - Delete the privilege of project-manageRepo. 2023-04-13 14:47:06 +08:00
zhaoke a64bc7d5ab * Move xmind functions to lib. 2023-04-13 13:51:34 +08:00
tanghucheng 0af9b86b70 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-13 10:23:19 +08:00
zhaoke eb833be4e5 Merge branch 'zenops_66' into zenops_69 2023-04-13 09:31:12 +08:00
zhaoke 70013fa98e Merge remote-tracking branch 'origin/master' into zenops_66 2023-04-13 09:24:52 +08:00
zhaoke d401a87812 Merge branch 'master' into zenops_69 2023-04-13 09:09:49 +08:00
zhaoke 2b1ee45b2b Merge branch 'master' into zenops_66 2023-04-13 09:06:59 +08:00
liumengyi df1a0f283d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-13 08:39:57 +08:00
朱金勇 cecf04b069 Fix bug: show tables and desc table. 2023-04-12 16:40:08 +00:00
hufangzhou 79a6ed9da4 * Revert the lang item. 2023-04-12 17:04:32 +08:00
liumengyi ca9c565982 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-12 16:39:44 +08:00
wangyidong a3715fa226 * fix bug. 2023-04-12 16:20:53 +08:00
hufangzhou 71898e32ae * Handle conflict. 2023-04-12 14:05:29 +08:00
liumengyi 2397c644f5 * Finish task #91011. 2023-04-11 15:30:05 +08:00
liumengyi 9fadd45264 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-11 14:19:00 +08:00