Commit Graph
391 Commits
Author SHA1 Message Date
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
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +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
hufangzhou 577fc81216 * Move the holidayseason from biz to open edition. 2023-04-19 10:20:41 +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
liugang 700c80534a + Init navGroup of report module. 2023-04-14 05:22:52 +00:00
liugang f3a6a26f67 * Rename report of mainNav to bi. 2023-04-14 02:18:36 +00: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 2b1ee45b2b Merge branch 'master' into zenops_66 2023-04-13 09:06:59 +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
刘刚 aa9212c821 Merge branch 'sprint/biz37_task90074' into 'master'
Add chart module.

See merge request easycorp/zentaopms!7326
2023-04-07 02:34:33 +00:00
liumengyi b32eda7548 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-07 08:59:14 +08:00
tianshujie bb84c7a731 * Change the name of my spatial function. 2023-04-06 16:57:14 +08:00
liugang 95e217b661 + Add chart menu. 2023-04-06 06:24:16 +00:00
tianshujie 0e813c1ea3 * Refactoring list page. 2023-04-06 13:07:36 +08:00
hufangzhou 3c83d94e09 * Merge code. 2023-04-06 09:01:30 +08:00
tianshujie e90d2c0d66 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-04 20:52:39 +08:00
tianshujie b87a68b349 * Code for task #89906. 2023-04-04 17:29:13 +08:00
liugang 4a1be481d9 * Format code. 2023-04-04 07:53:03 +00:00
tianshujie 978ded6788 * Code for task #89927. 2023-04-03 16:12:48 +08:00
liumengyi d3cf4b54f4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_295 2023-04-03 09:58:23 +08:00
zhaoke e7119d4217 Merge remote-tracking branch 'origin/master' into zenops_66 2023-04-03 09:36:20 +08:00
caoyanyi d477203aa7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 08:30:03 +08:00
liugang 19fe082665 * Replace the subNavbar of pivot with mainMenu. 2023-03-29 07:31:15 +00:00
liugang f6430b6050 * Replace report with pivot. 2023-03-29 00:46:16 +00:00
caoyanyi 58c2ca3a27 * Modify api doc style. 2023-03-28 16:09:56 +08:00
liugang 54876704c6 * Add pivot module. 2023-03-28 07:25:50 +00:00
hufangzhou bcab3266ac * Move the effort to my view. 2023-03-24 06:08:01 +00:00
hufangzhou 4592245949 * Add modules. 2023-03-24 05:19:11 +00:00
zenggang e9a8544bc0 * Fix bug#33298,33196 adjust style 2023-03-24 02:58:00 +00:00
hufangzhou 8d9abf2861 * Add the project review module. 2023-03-24 02:36:19 +00:00
hufangzhou 45123c526a * Add modules. 2023-03-24 00:49:19 +00:00
hufangzhou dff25040c8 * Add modules and change the other module to general module. 2023-03-23 09:10:21 +00:00
qixinzhi 511240d0fa Merge branch 'master' into sprint/biz17 2023-03-22 17:15:46 +08:00
caoyanyi c7cb7e96c2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-21 17:00:05 +08:00
caoyanyi 597131cd71 * Code for bug #33089, modify second menu active. 2023-03-20 15:14:23 +08:00
田淑杰 e223267649 * Code for finish task #87420. 2023-03-20 11:23:57 +08:00
hufangzhou e31c42d0be * Add the module for priv packages. 2023-03-15 14:42:52 +00:00
liumengyi 9b545e9ab2 * Add priv module. 2023-03-15 10:06:08 +00:00
hufangzhou 01fe1b42f8 * Add the module for priv package. 2023-03-15 09:08:48 +00:00
tianshujie fd209a3167 * Finish task 87399. 2023-03-14 15:53:03 +08:00
liumengyi 3f63404953 * Finish task #86258. 2023-03-06 06:09:13 +00:00
qixinzhi b4e8de97e5 Merge branch 'master' into sprint/biz17 2023-03-06 09:04:52 +08:00
wangyidong 01bb8130dd Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:50:31 +08:00
wangyidong 1a352410a6 * code for task #85503. 2023-03-01 08:49:44 +08:00
tianshujie eef2c1c356 * Change the order of the custom navigation. 2023-02-28 15:36:04 +08:00