Merge up to 10305
This commit is contained in:
parent
fa2e5c2c90
commit
1edaca4ed2
65 changed files with 1300 additions and 477 deletions
|
|
@ -345,6 +345,13 @@
|
|||
"title" : "^International(manage graphics,Graphics);",
|
||||
"groupSetting" : "groupIdAdminGraphics"
|
||||
},
|
||||
"passiveAnalytics" : {
|
||||
"icon" : "passiveAnalytics.png",
|
||||
"uiLevel" : 1,
|
||||
"url" : "^PageUrl(\"\",op=passiveAnalytics;func=editRuleflow);",
|
||||
"title" : "^International(Passive Analytics,PassiveAnalytics);",
|
||||
"groupSetting" : "3"
|
||||
},
|
||||
"shop" : {
|
||||
"icon" : "shop.gif",
|
||||
"uiLevel" : 5,
|
||||
|
|
@ -827,7 +834,9 @@
|
|||
"WebGUI::Workflow::Activity::SummarizePassiveProfileLog",
|
||||
"WebGUI::Workflow::Activity::SyncProfilesToLdap",
|
||||
"WebGUI::Workflow::Activity::TrashClipboard",
|
||||
"WebGUI::Workflow::Activity::TrashExpiredEvents"
|
||||
"WebGUI::Workflow::Activity::TrashExpiredEvents",
|
||||
"WebGUI::Workflow::Activity::SummarizePassiveAnalytics",
|
||||
"WebGUI::Workflow::Activity::BucketPassiveAnalytics"
|
||||
],
|
||||
"WebGUI::Asset::Wobject::Thingy" : [
|
||||
"WebGUI::Workflow::Activity::NotifyAboutThing"
|
||||
|
|
@ -912,6 +921,7 @@
|
|||
"WebGUI::Content::Referral",
|
||||
"WebGUI::Content::AssetManager",
|
||||
"WebGUI::Content::AssetDiscovery",
|
||||
"WebGUI::Content::PassiveAnalytics",
|
||||
"WebGUI::Content::AjaxI18N",
|
||||
"WebGUI::Content::Account",
|
||||
"WebGUI::Content::AssetHistory",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue