Commit Graph
53474 Commits
Author SHA1 Message Date
liumengyi 08e4ae2e2e Code for task #89846. 2023-04-05 23:30:40 +08:00
hufangzhou bbe679c233 * Finish task #89840. 2023-04-05 13:23:24 +08:00
hufangzhou 42419e8b09 * Finish task #89843. 2023-04-05 12:47:11 +08:00
liumengyi b4a88a69f5 * Code for task #89846. 2023-04-05 12:08:58 +08:00
liumengyi a0bdcd3f52 8 Finish task #89846. 2023-04-04 17:27:44 +08:00
liumengyi 6f8390a091 * Code for manage priv. 2023-04-04 15:58:01 +08:00
liumengyi 543e719155 * Code for manage priv. 2023-04-04 14:04:17 +08:00
hufangzhou ed1e738bf0 * Adjust the function to adapt to the new database structure. 2023-04-04 13:57:31 +08:00
hufangzhou 8e866b066f * Adjust the function to adapt to the new database structure. 2023-04-04 10:42:25 +08:00
liumengyi f1362b9010 * Fix bug of getPrivManagerPairs. 2023-04-04 10:13:44 +08:00
hufangzhou c61bf7893b * Adjust the function to adapt to the new database structure. 2023-04-04 10:01:12 +08:00
liumengyi 2d24383857 + Add method to get view and module language. 2023-04-04 09:13:31 +08:00
liumengyi 12c3a03287 * Fix bug of task #89848. 2023-04-03 17:16:05 +08:00
liumengyi 25bb508e77 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-03 17:10:36 +08:00
liumengyi 3658bbe634 * Finish task #89848. 2023-04-03 17:05:36 +08:00
liugang 4b5b9bd85a * Assign dimension ID to the view page. 2023-04-03 08:58:29 +00: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
hufangzhou 932a524e8d * Init data for priv package. 2023-04-03 16:39:19 +08: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
guofeilong d5c48a1e9c * Adjust code . 2023-04-03 16:05:52 +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
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
caoyanyi 74f9b86ab8 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 10:55:01 +08:00
caoyanyi 38e85b8a9f * Code for task #89904. 2023-04-03 10:54:38 +08:00
guofeilong 22b4ceeb4f * Adjust code . 2023-04-03 10:53:08 +08:00
wangyidong e4ac679475 * code for task #89166. 2023-04-03 10:52:16 +08:00