Commit Graph
53319 Commits
Author SHA1 Message Date
王怡栋 8db2bb9bde Merge branch 'dev/gfl_zui_files_refactors' into 'master'
* ZUI: files refactors .

See merge request easycorp/zentaopms!7301
2023-04-04 01:49:49 +00:00
孙广明 f8163a7155 Merge branch 'sprint/scx_dimension2pms' into 'master'
* Move createDimension to pms.

See merge request easycorp/zentaopms!7300
2023-04-04 01:45:51 +00:00
宋辰轩 3502de4b7b * Move createDimension to pms. 2023-04-04 09:42:52 +08:00
guofeilong 2b0f6ad5f2 * ZUI: files refactors . 2023-04-04 09:32:17 +08:00
liugang 07a3a4c3da * Remove annualData privilege. 2023-04-04 01:12:11 +00:00
孙广明 9175f890e9 Merge branch 'sprint/scx_add-default-dimension' into 'master'
* Create default dimension no matter zentao version.

See merge request easycorp/zentaopms!7295
2023-04-04 01:11:22 +00:00
王怡栋 65c87cf5b6 Merge branch 'release/zentaopms_18.3' into 'master'
* Fixing SQL problems

See merge request easycorp/zentaopms!7299
2023-04-04 00:34:27 +00:00
王怡栋 fdad7cdd73 Merge branch 'zentaobiz37_bi_wangyuting' into 'master'
* Finish task #90147.

See merge request easycorp/zentaopms!7297
2023-04-04 00:33:53 +00:00
tianshujie 2d28c823d2 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 18:31:24 +08:00
tianshujie 5ada3019fe * Fixing SQL problems. 2023-04-03 18:31:03 +08:00
liugang 7d919baf3c * Sort the privileges of pivot module, finish task #90073. 2023-04-03 09:27:29 +00:00
王怡栋 aa919a2021 Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7298
2023-04-03 09:16:18 +00:00
caoyanyi ec2e0276de * Optimize api page style. 2023-04-03 17:11:27 +08:00
guofeilong 489ae36491 * Adjust code . 2023-04-03 17:06:54 +08:00
liugang 4b5b9bd85a * Assign dimension ID to the view page. 2023-04-03 08:58:29 +00:00
wangyuting2 8ca58ff327 * Finish task #90147. 2023-04-03 16:52:58 +08:00
王怡栋 a3b7c7fe0b Merge branch 'dev/gfl_add_class_checkbox-indeterminate-block' into 'master'
Dev/gfl add class checkbox indeterminate block

See merge request easycorp/zentaopms!7296
2023-04-03 08:41:58 +00:00
郭飞龙 2200faa625 * Adjust code . 2023-04-03 08:41:12 +00:00
guofeilong e2328f2051 * Adjust code . 2023-04-03 16:21:04 +08:00
liugang 63d41661b8 * Add dimension module, finish task #90072. 2023-04-03 08:14:46 +00:00
tianshujie b61e3d1e90 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 16:13:08 +08:00
tianshujie 978ded6788 * Code for task #89927. 2023-04-03 16:12:48 +08:00
guofeilong d5c48a1e9c * Adjust code . 2023-04-03 16:05:52 +08:00
caoyanyi adae814406 * Add page for dev module api. 2023-04-03 16:01:36 +08:00
guofeilong 42af40bcef + add title to td in releases.html.php. 2023-04-03 15:51:09 +08:00
guofeilong 3bb9bd377c * Adjust right: 4px to left: 4px; 2023-04-03 15:37:10 +08:00
guofeilong a92dc1327e * Adjust code . 2023-04-03 15:31:54 +08:00
宋辰轩 41d60db39f * Create default dimension no matter zentao version. 2023-04-03 15:24:12 +08:00
guofeilong 0040359ad4 * Adjust code for bug #33643 . 2023-04-03 14:53:06 +08:00
王怡栋 bf2ab751c6 Merge branch 'release/zentaopms_18.3' into 'master'
* Adjust code .

See merge request easycorp/zentaopms!7294
2023-04-03 06:43:49 +00:00
guofeilong 1bf63e84c0 * Adjust code . 2023-04-03 14:42:56 +08:00
王怡栋 6147360f3b Merge branch 'daitingting_task_#89952' into 'master'
* Finish task #89952.

See merge request easycorp/zentaopms!7292
2023-04-03 06:35:38 +00:00
王怡栋 511a5fb0bd Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7293
2023-04-03 06:29:21 +00:00
guofeilong e41b4397f9 * Adjust code . 2023-04-03 14:27:14 +08:00
daitingting 26161924c6 * Finish task #89952. 2023-04-03 14:19:49 +08:00
tianshujie 85474574ca Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 14:13:21 +08:00
tianshujie c3b988692f * Code for task #89927. 2023-04-03 14:13:05 +08:00
guofeilong 24fe4d80ef * Adjust code . 2023-04-03 13:55:41 +08:00
tianshujie 72abd88a86 * Code for task #89927. 2023-04-03 13:51:50 +08:00
wangyidong 28feaa2a2c * code for task #89524. 2023-04-03 13:41:37 +08:00
tianshujie baf5aeba2a * Code for task #89927. 2023-04-03 13:34:21 +08:00
liugang 2336997c39 * Sort the privileges of screen, finish task #90070,90071, cost 1h, left 0h. 2023-04-03 05:33:36 +00:00
guofeilong 60e176c5bc * Adjust code . 2023-04-03 13:22:26 +08:00
朱金勇 04a77a6879 Merge branch 'feishu' into 'master'
* Support markdown for feishu webhook.

See merge request easycorp/zentaopms!7289
2023-04-03 03:28:39 +00:00
鲁飞 37445a4968 * Support markdown for feishu webhook. 2023-04-03 03:28:39 +00:00
tianshujie df512b264f Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 11:26:57 +08:00
tianshujie 3f9f9fbc5b * Code for task #89927. 2023-04-03 11:26:01 +08:00
刘刚 daf117c154 Merge branch 'daitingting_revert_version' into 'master'
* Revert version.

See merge request easycorp/zentaopms!7288
2023-04-03 03:12:21 +00:00
guofeilong 2192d98ea8 * Adjust code . 2023-04-03 11:09:03 +08:00
guofeilong 19c0741b15 * Adjust code . 2023-04-03 11:03:43 +08:00