[midPoint-git] [Evolveum/midpoint] 077038: Sync with transifex. Work by Andreas Kustner, Jaso...

Radovan Semancik radovan.semancik at evolveum.com
Thu Nov 5 10:16:30 CET 2015


  Branch: refs/heads/transifex
  Home:   https://github.com/Evolveum/midpoint
  Commit: 077038c6603c3e9d0b2deb35e24d91f52c04a2eb
      https://github.com/Evolveum/midpoint/commit/077038c6603c3e9d0b2deb35e24d91f52c04a2eb
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint_cs_CZ.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_de_DE.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_es_ES.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_hi_IN.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_sk_SK.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_tr_TR.properties

  Log Message:
  -----------
  Sync with transifex. Work by Andreas Kustner, Jason Everling, Laszlo Pentek. Thanks.


  Commit: 69cc60eb9dbe826b06c7e21569e09755f8aee7a7
      https://github.com/Evolveum/midpoint/commit/69cc60eb9dbe826b06c7e21569e09755f8aee7a7
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  Copy of default properties file.


  Commit: a107b2fa262a3d4ed9c1ddda57d4ed6965215478
      https://github.com/Evolveum/midpoint/commit/a107b2fa262a3d4ed9c1ddda57d4ed6965215478
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2015-11-05 (Thu, 05 Nov 2015)

  Changed paths:
    M build-system/pom.xml
    M config/initial-objects/100-report-reconciliation.xml
    M config/initial-objects/110-report-user-list.xml
    M dist/midpoint-api/pom.xml
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/BasicSearchPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BaseSortableDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/ObjectDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/org/OrgTreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/util/LookupPropertyModel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/wizard/resource/dto/SynchronizationActionTypeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/BaseFocusPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageImportObject.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/home/PageMyPasswordQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceWizard.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/content/dto/AccountContentDataProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageOrgTree.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUsers.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractAssignableSelectionPanel.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AbstractTreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableOrgSelectionPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableOrgSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignableSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/ResourcesSelectionPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/dto/OrgTreeDto.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageLogin.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/component/ChangePasswordPanel.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointApplication.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
    M gui/admin-gui/src/main/resources/initial-objects/100-report-reconciliation.xml
    M gui/admin-gui/src/main/resources/initial-objects/110-report-user-list.xml
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties
    M infra/prism/src/main/java/com/evolveum/midpoint/prism/query/TypeFilter.java
    M infra/prism/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/ItemDeltaType.java
    M infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/Expression.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/ExpressionUtil.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/functions/BasicExpressionFunctions.java
    M model/model-common/src/main/java/com/evolveum/midpoint/model/common/expression/script/jsr223/Jsr223ScriptEvaluator.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/controller/SchemaTransformer.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ChangeExecutor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/ContextFactory.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/AssignmentProcessor.java
    M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/UserProfileServiceImpl.java
    M model/model-impl/src/test/java/com/evolveum/midpoint/model/impl/expr/TestFilterExpression.java
    A model/model-impl/src/test/resources/expr/expression-employeeType-all-filter.xml
    A model/model-impl/src/test/resources/expr/expression-employeeType-empty-filter.xml
    A model/model-impl/src/test/resources/expr/expression-employeeType-error.xml
    A model/model-impl/src/test/resources/expr/expression-employeeType-filter-defaults.xml
    A model/model-impl/src/test/resources/expr/expression-employeeType-none-filter.xml
    A model/model-impl/src/test/resources/expr/expression-employeeType-undefined-filter.xml
    A model/model-impl/src/test/resources/expr/expression-linkref-filter-defaults.xml
    A model/model-impl/src/test/resources/expr/expression-linkref-object-reference-type-filter-defaults.xml
    R model/model-impl/src/test/resources/expr/expression-to-empty-filter-allowed-null.xml
    R model/model-impl/src/test/resources/expr/expression-to-empty-filter.xml
    R model/model-impl/src/test/resources/expr/expression-to-undefined-filter-allowed-false.xml
    M model/model-impl/src/test/resources/logback-test.xml
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestModelServiceContract.java
    M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/sync/AbstractSynchronizationStoryTest.java
    M model/model-intest/src/test/resources/sync/resource-dummy-lime-deprecated.xml
    M model/model-intest/src/test/resources/sync/resource-dummy-lime.xml
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/ConnectorInstanceIcfImpl.java
    M provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/query/ValueOperation.java
    M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/query/restriction/ReferenceRestriction.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/AuthorizationConstants.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/MidPointPrincipal.java
    M repo/security-api/src/main/java/com/evolveum/midpoint/security/api/SecurityUtil.java
    M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
    M testing/minipoint/pom.xml
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/AbstractSelenideTest.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/account/ResourceUserAccountTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/CsvAccountTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/EndUserTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/LoginTest.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/OrganizationTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/RoleTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/basictests/SimpleUserTests.java
    M testing/selenidetest/src/test/java/com/evolveum/midpoint/testing/selenide/tests/organization/OrganizationStructureTests.java
    A testing/selenidetest/src/test/resources/mp-resources/midpoint-flatfile-orig.csv
    M testing/selenidetest/testng-integration.xml
    M testing/story/src/test/resources/village/role-basic.xml
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/AbstractWebserviceTest.java
    M testing/wstest/src/test/java/com/evolveum/midpoint/testing/wstest/TestWSSanity.java
    M testing/wstest/src/test/resources/common/resource-opendj.xml

  Log Message:
  -----------
  Merge branch 'master' into transifex

Conflicts:
	gui/admin-gui/src/main/resources/localization/Midpoint_en_US.properties


Compare: https://github.com/Evolveum/midpoint/compare/077038c6603c^...a107b2fa262a


More information about the midPoint-svn mailing list