Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
KaterynaHonchar committed Apr 1, 2019
2 parents 2347712 + 8d5b6b2 commit 8800dd1
Show file tree
Hide file tree
Showing 33 changed files with 72 additions and 72 deletions.
Expand Up @@ -155,7 +155,7 @@ protected void configure(HttpSecurity http) throws Exception {
}

http.headers().disable();
http.headers().frameOptions().deny();
http.headers().frameOptions().sameOrigin();

if (Arrays.stream(environment.getActiveProfiles()).anyMatch(p -> p.equalsIgnoreCase("cas"))) {
http.addFilterAt(casFilter(), CasAuthenticationFilter.class);
Expand Down
Expand Up @@ -2099,7 +2099,7 @@ pageSystemConfiguration.adminGui.title=Administrátorské rozhraní
pageSystemConfiguration.system.title=Systém
pageSystemConfiguration.objectPolicy.title=Politika objektů
pageSystemConfiguration.globalPolicyRule.title=Globální pravidlo politiky
pageSystemConfiguration.globalAccountSynchronization.title=Globální synchronizace účtů
pageSystemConfiguration.globalAccountSynchronization.title=Globální politika projekce
pageSystemConfiguration.cleanupPolicy.title=Zásady vyčištění
pageSystemConfiguration.roleManagement.title=Správa rolí
pageSystemConfiguration.internals.title=Interní konfigurace
Expand Down Expand Up @@ -3178,7 +3178,7 @@ SystemConfigPanel.mail.username=Uživatel
SystemConfigPanel.misc.enableExperimentalCode=Povolit experimentální kód pro model
SystemConfigPanel.notification.redirectToFile.placeholder=Soubor
SystemConfigPanel.notification.redirectToFile=Přesměrovat do souboru
SystemConfigPanel.title.accountSynchronization=Nastavení globální synchronizace účtů
SystemConfigPanel.title.accountSynchronization=Globální politika projekce
SystemConfigPanel.title.basic=Základní
SystemConfigPanel.title.connectorFramework=Konfigurace frameworku konektorů
SystemConfigPanel.title.misc=Různé
Expand Down
Expand Up @@ -2099,7 +2099,7 @@ pageSystemConfiguration.adminGui.title=Administrationsoberfläche
pageSystemConfiguration.system.title=System
pageSystemConfiguration.objectPolicy.title=Objektrichtlinie
pageSystemConfiguration.globalPolicyRule.title=globale Richtlinie
pageSystemConfiguration.globalAccountSynchronization.title=globale Account-Synchronisation
pageSystemConfiguration.globalAccountSynchronization.title=Global projection policy
pageSystemConfiguration.cleanupPolicy.title=Vorgabe zur Bereinigung
pageSystemConfiguration.roleManagement.title=Rollen bearbeiten
pageSystemConfiguration.internals.title=Interne Konfigurationen
Expand Down Expand Up @@ -3178,7 +3178,7 @@ SystemConfigPanel.mail.username=Benutzername
SystemConfigPanel.misc.enableExperimentalCode=Enable MODEL experimental code
SystemConfigPanel.notification.redirectToFile.placeholder=Dateiname
SystemConfigPanel.notification.redirectToFile=in Datei umleiten
SystemConfigPanel.title.accountSynchronization=Global account synchronization settings
SystemConfigPanel.title.accountSynchronization=Global projection policy
SystemConfigPanel.title.basic=grundlegend
SystemConfigPanel.title.connectorFramework=Konnektor Framework Konfiguration
SystemConfigPanel.title.misc=Miscellaneous
Expand Down
Expand Up @@ -2099,7 +2099,7 @@ pageSystemConfiguration.adminGui.title=Admin GUI
pageSystemConfiguration.system.title=Sistema
pageSystemConfiguration.objectPolicy.title=Política de objeto
pageSystemConfiguration.globalPolicyRule.title=Política global
pageSystemConfiguration.globalAccountSynchronization.title=Sincronización global de cuentas
pageSystemConfiguration.globalAccountSynchronization.title=Global projection policy
pageSystemConfiguration.cleanupPolicy.title=Política de limpieza
pageSystemConfiguration.roleManagement.title=Administración de roles
pageSystemConfiguration.internals.title=Configuraciones Internas
Expand Down Expand Up @@ -3178,7 +3178,7 @@ SystemConfigPanel.mail.username=Nombre de usuario
SystemConfigPanel.misc.enableExperimentalCode=Enable MODEL experimental code
SystemConfigPanel.notification.redirectToFile.placeholder=Nombre del archivo
SystemConfigPanel.notification.redirectToFile=Redirigir a fichero
SystemConfigPanel.title.accountSynchronization=Configuraciones globales de sincronización de cuentas
SystemConfigPanel.title.accountSynchronization=Global projection policy
SystemConfigPanel.title.basic=Básico
SystemConfigPanel.title.connectorFramework=Configuración de framework de conectores
SystemConfigPanel.title.misc=Miscellaneous
Expand Down
Expand Up @@ -2099,7 +2099,7 @@ pageSystemConfiguration.adminGui.title=Admin GUI
pageSystemConfiguration.system.title=Süsteem
pageSystemConfiguration.objectPolicy.title=Object policy
pageSystemConfiguration.globalPolicyRule.title=Global policy rule
pageSystemConfiguration.globalAccountSynchronization.title=Global account synchronization
pageSystemConfiguration.globalAccountSynchronization.title=Global projection policy
pageSystemConfiguration.cleanupPolicy.title=Cleanup policy
pageSystemConfiguration.roleManagement.title=Role management
pageSystemConfiguration.internals.title=Sisemine konfiguratsioon
Expand Down Expand Up @@ -3178,7 +3178,7 @@ SystemConfigPanel.mail.username=Kasutajanimi
SystemConfigPanel.misc.enableExperimentalCode=Enable MODEL experimental code
SystemConfigPanel.notification.redirectToFile.placeholder=Faili nimi
SystemConfigPanel.notification.redirectToFile=Suuna faili
SystemConfigPanel.title.accountSynchronization=Üldised konto sünkimise sätted
SystemConfigPanel.title.accountSynchronization=Global projection policy
SystemConfigPanel.title.basic=Põhiteave
SystemConfigPanel.title.connectorFramework=Konnektori raamistike konfiguratsioon
SystemConfigPanel.title.misc=Muu
Expand Down
Expand Up @@ -2099,7 +2099,7 @@ pageSystemConfiguration.adminGui.title=Järjestelmänvalvoja GUI
pageSystemConfiguration.system.title=Järjestelmä
pageSystemConfiguration.objectPolicy.title=Object policy
pageSystemConfiguration.globalPolicyRule.title=Global policy rule
pageSystemConfiguration.globalAccountSynchronization.title=Global account synchronization
pageSystemConfiguration.globalAccountSynchronization.title=Global projection policy
pageSystemConfiguration.cleanupPolicy.title=Cleanup policy
pageSystemConfiguration.roleManagement.title=Role management
pageSystemConfiguration.internals.title=Sisäisten asetukset
Expand Down Expand Up @@ -3178,7 +3178,7 @@ SystemConfigPanel.mail.username=Käyttänimi
SystemConfigPanel.misc.enableExperimentalCode=Enable MODEL experimental code
SystemConfigPanel.notification.redirectToFile.placeholder=Tiedoston nimi
SystemConfigPanel.notification.redirectToFile=Ohjaa eteenpäin tiedostoon
SystemConfigPanel.title.accountSynchronization=Globaalin tilin synkronointi asetukset
SystemConfigPanel.title.accountSynchronization=Global projection policy
SystemConfigPanel.title.basic=Perus
SystemConfigPanel.title.connectorFramework=Liittimen viitekehyksen asetus
SystemConfigPanel.title.misc=Sekalaiset
Expand Down
Expand Up @@ -1106,8 +1106,8 @@ PageAdmin.menu.top.configuration.expressionEvaluator=Évaluateur d'expression
PageAdmin.menu.top.configuration.importObject=Importer un objet
PageAdmin.menu.top.configuration.internals=Configuration interne
PageAdmin.menu.top.configuration.objectPolicy=Politique des objets
PageAdmin.menu.top.configuration.globalPolicyRule=Global policy rules
PageAdmin.menu.top.configuration.globalAccountSynchronization=Global projection policy
PageAdmin.menu.top.configuration.globalPolicyRule=Règles globales de politique
PageAdmin.menu.top.configuration.globalAccountSynchronization=Politique globale de projection
PageAdmin.menu.top.configuration.cleanupPolicy=Politique de nettoyage
PageAdmin.menu.top.configuration.workflow=Configuration de flux de travaux
PageAdmin.menu.top.configuration.roleManagement=Gestion des rôles
Expand Down Expand Up @@ -2099,7 +2099,7 @@ pageSystemConfiguration.adminGui.title=Interface graphique d'admin.
pageSystemConfiguration.system.title=Système
pageSystemConfiguration.objectPolicy.title=Politique des objets
pageSystemConfiguration.globalPolicyRule.title=Règles de politique globale
pageSystemConfiguration.globalAccountSynchronization.title=Synchronisation globale des comptes
pageSystemConfiguration.globalAccountSynchronization.title=Politique globale de projection
pageSystemConfiguration.cleanupPolicy.title=Politique de nettoyage
pageSystemConfiguration.roleManagement.title=Gestion des rôles
pageSystemConfiguration.internals.title=Configuration interne
Expand Down Expand Up @@ -3178,7 +3178,7 @@ SystemConfigPanel.mail.username=Identifiant
SystemConfigPanel.misc.enableExperimentalCode=Activer le code expérimental MODEL
SystemConfigPanel.notification.redirectToFile.placeholder=Nom de fichier
SystemConfigPanel.notification.redirectToFile=Rediriger vers un fichier
SystemConfigPanel.title.accountSynchronization=Paramètres globaux de synchronisation des comptes
SystemConfigPanel.title.accountSynchronization=Politique globale de projection
SystemConfigPanel.title.basic=Base
SystemConfigPanel.title.connectorFramework=Configuration des cadres applicatifs de connecteurs
SystemConfigPanel.title.misc=Divers
Expand Down Expand Up @@ -4160,7 +4160,7 @@ PolicyConstraintsType.objectMaxAssigneesViolation=Violation du nombre maximal d'
PolicyConstraintsType.modification=Modification
PolicyConstraintsType.assignment=Attribution
PolicyConstraintsType.objectTimeValidity=Durée de validité de l'objet
PolicyConstraintsType.assignmentTimeValidity=Durée de validité des attributions
PolicyConstraintsType.assignmentTimeValidity=Durée de validité de l'attribution
PolicyConstraintsType.situation=Situation
PolicyConstraintsType.transition=Transition
PolicyConstraintsType.ref=Réf
Expand Down Expand Up @@ -4236,7 +4236,7 @@ ReferencePopupPanel.targetType=Type :
ReferencePopupPanel.relation=Relation:
chooseFocusTypeAndRelationDialogPanel.relation=Relation :
chooseFocusTypeAndRelationDialogPanel.type=Type
chooseFocusTypeAndRelationDialogPanel.tooltip.type=Assignment holder/target object type
chooseFocusTypeAndRelationDialogPanel.tooltip.type=Type de l'objet cible de l'attribution
abstractRoleMemberPanel.menu.assign=Attribuer
abstractRoleMemberPanel.menu.assignMember=Attribuer un membre
abstractRoleMemberPanel.menu.unassign=Retirer l'attribution
Expand All @@ -4261,28 +4261,28 @@ relationDropDownChoicePanel.relation=Relation
relationDropDownChoicePanel.tooltip.relation=Relation de la référence, par exemple défaut, validateur, responsable...
ItemPathPanel.button.reset=Réinitialiser le chemin
ApprovalPolicyActionType.details.newValue=Nouvelle action de politique de validation
LifecycleStateType.details.newValue=État du nouveau cycle de vie
LifecycleStateType.details.newValue=Nouvel état du cycle de vie
NotificationPolicyActionType.details.newValue=Nouvelle action de politique de notification
PropertyConstraintType.details.newValue=Nouvelle contrainte sur une propriété
objectState.details.newValue=New 'object state' constraint
assignmentState.details.newValue=New 'assignment state' constraint
hasAssignment.details.newValue=New 'has assignment' constraint
hasNoAssignment.details.newValue=New 'has no assignment' constraint
exclusion.details.newValue=New 'exclusion' constraint
minAssignees.details.newValue=New 'minimum assignees' constraint
maxAssignees.details.newValue=New 'maximum assignees' constraint
modification.details.newValue=New 'modification' constraint
assignment.details.newValue=New 'assignment' constraint
objectTimeValidity.details.newValue=New 'object time validity' constraint
assignmentTimeValidity.details.newValue=New 'assignment time validity' constraint
situation.details.newValue=New 'situation' constraint
transition.details.newValue=New 'transition' constraint
objectState.details.newValue=Nouvelle contrainte « État d'un objet »
assignmentState.details.newValue=Nouvelle contrainte « État d'une attribution »
hasAssignment.details.newValue=Nouvelle contrainte « A une attribution »
hasNoAssignment.details.newValue=Nouvelle contrainte « N'a pas d'attribution »
exclusion.details.newValue=Nouvelle contrainte « Exclusion »
minAssignees.details.newValue=Nouvelle contrainte « Nombre minimum d'attributaires »
maxAssignees.details.newValue=Nouvelle contrainte « Nombre maximum d'attributaires »
modification.details.newValue=Nouvelle contrainte « Modification »
assignment.details.newValue=Nouvelle contrainte « Attribution »
objectTimeValidity.details.newValue=Nouvelle contrainte « Durée de validité de l'objet »
assignmentTimeValidity.details.newValue=Nouvelle contrainte « Durée de validité de l'attribution »
situation.details.newValue=Nouvelle contrainte « Situation »
transition.details.newValue=Nouvelle contrainte « Transition »
ref.details.newValue=Nouvelle référence
objectMaxAssigneesViolation.details.newValue=Violation du nombre maximal d'attributaires du nouvel objet
objectMinAssigneesViolation.details.newValue=Violation du nombre minimal d'attributaires du nouvel objet
PolicyConstraintReferenceType.details.newValue=Nouvelle référence à une contrainte de politique
RichHyperlinkType.details.newValue=New rich hyperlink
UserInterfaceFeatureType.details.newValue=New user interface feature
UserInterfaceFeatureType.details.newValue=Nouvelle fonctionnalité d'interface utilisateur
GuiObjectDetailsPageType.details.newValue=Page de détails du nouvel objet gui
ObjectFormType.details.newValue=Nouveau formulaire d'objet
GuiObjectColumnType.details.newValue=Colonne du nouvel objet gui
Expand All @@ -4307,7 +4307,7 @@ maxAssignees.details=Nombre maximal d'attributaires
modification.details=Modification
assignment.details=Attribution
objectTimeValidity.details=Durée de validité de l'objet
assignmentTimeValidity.details=Durée de validité des attributions
assignmentTimeValidity.details=Durée de validité de l'attribution
situation.details=Situation de politique
transition.details=Transition
ref.details=Référence
Expand Down Expand Up @@ -4342,4 +4342,4 @@ PolyStringEditorPanel.defaultLabel=défaut
PolyStringEditorPanel.keyLabel=clé
PolyStringEditorPanel.showLanguages=Montrer les langues
PolyStringEditorPanel.hideLanguages=Cacher les langues
PolyStringEditorPanel.addLanguage=Add language
PolyStringEditorPanel.addLanguage=Ajouter une langue
Expand Up @@ -2099,7 +2099,7 @@ pageSystemConfiguration.adminGui.title=Admin GUI
pageSystemConfiguration.system.title=Rendszer
pageSystemConfiguration.objectPolicy.title=Object policy
pageSystemConfiguration.globalPolicyRule.title=Global policy rule
pageSystemConfiguration.globalAccountSynchronization.title=Global account synchronization
pageSystemConfiguration.globalAccountSynchronization.title=Global projection policy
pageSystemConfiguration.cleanupPolicy.title=Cleanup policy
pageSystemConfiguration.roleManagement.title=Role management
pageSystemConfiguration.internals.title=Internals configuration
Expand Down Expand Up @@ -3178,7 +3178,7 @@ SystemConfigPanel.mail.username=Felhasználónév
SystemConfigPanel.misc.enableExperimentalCode=Enable MODEL experimental code
SystemConfigPanel.notification.redirectToFile.placeholder=Fájlnév
SystemConfigPanel.notification.redirectToFile=Átirányítás fájlba
SystemConfigPanel.title.accountSynchronization=Global account synchronization settings
SystemConfigPanel.title.accountSynchronization=Global projection policy
SystemConfigPanel.title.basic=Basic
SystemConfigPanel.title.connectorFramework=Connector frameworks configuration
SystemConfigPanel.title.misc=Miscellaneous
Expand Down
Expand Up @@ -2099,7 +2099,7 @@ pageSystemConfiguration.adminGui.title=Admin GUI
pageSystemConfiguration.system.title=Sistema
pageSystemConfiguration.objectPolicy.title=Policy dell'oggetto
pageSystemConfiguration.globalPolicyRule.title=Regola globale della policy
pageSystemConfiguration.globalAccountSynchronization.title=Sincronizzazione globale degli account
pageSystemConfiguration.globalAccountSynchronization.title=Policy di proiezione globale
pageSystemConfiguration.cleanupPolicy.title=Policy di pulizia
pageSystemConfiguration.roleManagement.title=Gestione Ruoli
pageSystemConfiguration.internals.title=Configurazione interna
Expand Down Expand Up @@ -3178,7 +3178,7 @@ SystemConfigPanel.mail.username=Username
SystemConfigPanel.misc.enableExperimentalCode=Abilita codice sperimentale del MODELLO
SystemConfigPanel.notification.redirectToFile.placeholder=Nome file
SystemConfigPanel.notification.redirectToFile=Reindirizza al file
SystemConfigPanel.title.accountSynchronization=Impostazioni globali di sincronizzazione dell'account
SystemConfigPanel.title.accountSynchronization=Policy di proiezione globale
SystemConfigPanel.title.basic=Di base
SystemConfigPanel.title.connectorFramework=Configurazione framework dei connettori
SystemConfigPanel.title.misc=Vari
Expand Down
Expand Up @@ -2099,7 +2099,7 @@ pageSystemConfiguration.adminGui.title=管理GUI
pageSystemConfiguration.system.title=システム
pageSystemConfiguration.objectPolicy.title=オブジェクトポリシー
pageSystemConfiguration.globalPolicyRule.title=グローバル・ポリシールール
pageSystemConfiguration.globalAccountSynchronization.title=グローバル・アカウント同期
pageSystemConfiguration.globalAccountSynchronization.title=グローバル・プロジェクション・ポリシー
pageSystemConfiguration.cleanupPolicy.title=クリーンアップ・ポリシー
pageSystemConfiguration.roleManagement.title=ロール管理
pageSystemConfiguration.internals.title=内部設定
Expand Down Expand Up @@ -3178,7 +3178,7 @@ SystemConfigPanel.mail.username=ユーザー名
SystemConfigPanel.misc.enableExperimentalCode=実験的モデルコードを有効化
SystemConfigPanel.notification.redirectToFile.placeholder=ファイル名
SystemConfigPanel.notification.redirectToFile=ファイルにリダイレクト
SystemConfigPanel.title.accountSynchronization=グローバル・アカウント同期設定
SystemConfigPanel.title.accountSynchronization=グローバル・プロジェクション・ポリシー
SystemConfigPanel.title.basic=基本情報
SystemConfigPanel.title.connectorFramework=コネクター・フレームワークの設定
SystemConfigPanel.title.misc=その他
Expand Down Expand Up @@ -3770,7 +3770,7 @@ operation.com.evolveum.midpoint.web.page.admin.certification.PageCertCampaign.cl
operation.com.evolveum.midpoint.web.page.admin.certification.PageCertCampaign.closeCampaign=キャンペーンのクローズ
operation.com.evolveum.midpoint.web.page.admin.certification.PageCertCampaign.startRemediation=修復の開始
operation.com.evolveum.midpoint.web.page.admin.cases.PageCaseWorkItem.closeCaseWorkItem=ケースを閉じる
operation.com.evolveum.midpoint.web.page.admin.cases.PageCase.saveCase=Case saved
operation.com.evolveum.midpoint.web.page.admin.cases.PageCase.saveCase=ケースが保存された

operation.com.evolveum.midpoint.certification.api.CertificationManager.openNextStage=次のステージをオープン
operation.com.evolveum.midpoint.certification.api.CertificationManager.closeCampaign=キャンペーンのクローズ
Expand Down Expand Up @@ -4342,4 +4342,4 @@ PolyStringEditorPanel.defaultLabel=デフォルト
PolyStringEditorPanel.keyLabel=キー
PolyStringEditorPanel.showLanguages=言語の表示
PolyStringEditorPanel.hideLanguages=言語を隠す
PolyStringEditorPanel.addLanguage=Add language
PolyStringEditorPanel.addLanguage=言語の追加
Expand Up @@ -2099,7 +2099,7 @@ pageSystemConfiguration.adminGui.title=Administravimo GUI
pageSystemConfiguration.system.title=Sistema
pageSystemConfiguration.objectPolicy.title=Objekto politika
pageSystemConfiguration.globalPolicyRule.title=Globali politikos taisyklė
pageSystemConfiguration.globalAccountSynchronization.title=Globalus paskyros sinchronizavimas
pageSystemConfiguration.globalAccountSynchronization.title=Global projection policy
pageSystemConfiguration.cleanupPolicy.title=Išvalymo politika
pageSystemConfiguration.roleManagement.title=Rolių valdymas
pageSystemConfiguration.internals.title=Vidinė konfigūracija
Expand Down Expand Up @@ -3178,7 +3178,7 @@ SystemConfigPanel.mail.username=Prisijungimo vardas
SystemConfigPanel.misc.enableExperimentalCode=Įjungti MODEL eksperimentinį kodą
SystemConfigPanel.notification.redirectToFile.placeholder=Failo pavadinimas
SystemConfigPanel.notification.redirectToFile=Peradresuoti į failą
SystemConfigPanel.title.accountSynchronization=Globalūs paskyros sinchronizavimo nustatymai
SystemConfigPanel.title.accountSynchronization=Global projection policy
SystemConfigPanel.title.basic=Pagrindinė informacija
SystemConfigPanel.title.connectorFramework=Sąsajos konfigūracija
SystemConfigPanel.title.misc=Kita
Expand Down

0 comments on commit 8800dd1

Please sign in to comment.