[midPoint-git] [Evolveum/midpoint] 28fcb6: some fixes for reigstration process..
Katarina Valalikova
k.valalikova at evolveum.com
Thu Nov 17 16:04:36 CET 2016
Branch: refs/heads/master
Home: https://github.com/Evolveum/midpoint
Commit: 28fcb680e413b0165eb25e42050bc1c903b28ff6
https://github.com/Evolveum/midpoint/commit/28fcb680e413b0165eb25e42050bc1c903b28ff6
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-07 (Mon, 07 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
some fixes for reigstration process..
Commit: 9121f5b6fe3c5ae5aa38b84f51cd1977c709a3ae
https://github.com/Evolveum/midpoint/commit/9121f5b6fe3c5ae5aa38b84f51cd1977c709a3ae
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-07 (Mon, 07 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
Log Message:
-----------
smal improvements for self registration - preregistered user.
Commit: cf9e3f887d901db68a6cd5c02dda819fbe018e31
https://github.com/Evolveum/midpoint/commit/cf9e3f887d901db68a6cd5c02dda819fbe018e31
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-08 (Tue, 08 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/security/AuthenticationEvaluatorImpl.java
Log Message:
-----------
fixing npe while authenticating user with nonce
Commit: bf422b1a6f7466151ee658a61dc28ebece29a720
https://github.com/Evolveum/midpoint/commit/bf422b1a6f7466151ee658a61dc28ebece29a720
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageRegistrationConfirmation.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
imrpoving logging for self registration page and confirmation page
Commit: 3209fd658732d256f07e49a9428ed697cc177ed0
https://github.com/Evolveum/midpoint/commit/3209fd658732d256f07e49a9428ed697cc177ed0
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
Log Message:
-----------
new search items - effective status and lifecycle state
Commit: ad52e8e8ab709d34046bca160baca061d15be78e
https://github.com/Evolveum/midpoint/commit/ad52e8e8ab709d34046bca160baca061d15be78e
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/captcha/CaptchaPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
Log Message:
-----------
changing captcha generation - using numbers
refreshing captcha after validation failure.
Commit: 34e1a3d0f73c66135501b6130f239187d859fcad
https://github.com/Evolveum/midpoint/commit/34e1a3d0f73c66135501b6130f239187d859fcad
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
Log Message:
-----------
captcha validation behaviour improvement - don't remove password if captcha validation failed
Commit: f6e9931897d3e7c596f4d10486f2790c42f5f157
https://github.com/Evolveum/midpoint/commit/f6e9931897d3e7c596f4d10486f2790c42f5f157
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-09 (Wed, 09 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
additional property for additional text on registration page, tooltip for password
Commit: ca1b179921c6502af8951b6dc8e3e96342daccc1
https://github.com/Evolveum/midpoint/commit/ca1b179921c6502af8951b6dc8e3e96342daccc1
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
Log Message:
-----------
schema for reset password
Commit: 7e1d6522fd325d80483c7ded9bb7e50568413402
https://github.com/Evolveum/midpoint/commit/7e1d6522fd325d80483c7ded9bb7e50568413402
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/page/PageBase.java
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.html
R gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgetPassword.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageSecurityQuestions.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/ResetPolicyDto.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/login/PageRegistrationBase.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/PageSelfRegistration.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/login/SelfRegistrationDto.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfCredentials.html
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/resources/localization/Midpoint.properties
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
A infra/schema/src/main/java/com/evolveum/midpoint/schema/util/SecurityPolicyUtil.java
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
Log Message:
-----------
resret password implementation.
Commit: d3ac9a5a2792b7c5bd7e49438600083eb811cccb
https://github.com/Evolveum/midpoint/commit/d3ac9a5a2792b7c5bd7e49438600083eb811cccb
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
Log Message:
-----------
resret password channel
Commit: 58a172bf9996f4bc7d7f21e27c1e24c5cbca512b
https://github.com/Evolveum/midpoint/commit/58a172bf9996f4bc7d7f21e27c1e24c5cbca512b
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/ResetPolicyDto.java
Log Message:
-----------
fixing typo
Commit: 4d1758d1575e7d3b39bd451d2e357d274a3613dd
https://github.com/Evolveum/midpoint/commit/4d1758d1575e7d3b39bd451d2e357d274a3613dd
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageForgotPassword.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageAbstractSelfCredentials.java
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
Log Message:
-----------
fixing npe, improving erroir handling. added validator for emails..
Commit: 2f189c536aed9b1a58432ef05889b43e5592bce0
https://github.com/Evolveum/midpoint/commit/2f189c536aed9b1a58432ef05889b43e5592bce0
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-11 (Fri, 11 Nov 2016)
Changed paths:
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPassword.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/forgetpassword/PageResetPasswordConfirmation.java
Log Message:
-----------
authz for reset passwrod
Commit: 8f7d1b335dcbaa086bbf161d5061028f27b84b02
https://github.com/Evolveum/midpoint/commit/8f7d1b335dcbaa086bbf161d5061028f27b84b02
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-17 (Thu, 17 Nov 2016)
Changed paths:
M build-system/pom.xml
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/ComponentConstants.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDtoType.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentTablePanel.java
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.html
A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/DelegationEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/dialog/MainPopupDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/objectdetails/AbstractObjectMainPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/show/ScenePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminFocus.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/PageAdminObjectDetails.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionBasicPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagePanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/DefinitionStagesPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinition.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/StageEditorPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCampaignListItemDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseDtoProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertCaseOrDecisionDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDecisionDtoProvider.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/dto/CertDefinitionDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageMergeObjects.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/PageUser.java
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/AssignmentPreviewDialog.html
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentPreviewDialog.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/AssignmentsPreviewDto.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/MergeObjectsPanel.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/security/MidPointGuiAuthorizationEvaluator.java
A gui/admin-gui/src/main/resources/initial-objects/043-role-delegator.xml
M gui/admin-gui/src/main/resources/localization/Midpoint.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ar.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_cs.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_de.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_es_AR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_et.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hi.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_hu.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_pt_BR.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_ru.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_sk.properties
M gui/admin-gui/src/main/resources/localization/Midpoint_tr.properties
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/JsonLexicalProcessor.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/PolyStringDeserializer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/lex/json/XmlGregorianCalendarSerializer.java
M infra/prism/src/main/java/com/evolveum/midpoint/prism/marshaller/BeanUnmarshaller.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/AbstractLexicalProcessorTest.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestDomParser.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestJsonParser.java
M infra/prism/src/test/java/com/evolveum/midpoint/prism/lex/TestYamlParser.java
M infra/prism/src/test/resources/common/json/user-jack-adhoc.json
M infra/prism/src/test/resources/common/json/user-jack-modified.json
M infra/prism/src/test/resources/common/json/user-jack-no-ns.json
M infra/prism/src/test/resources/common/json/user-jack-object.json
M infra/prism/src/test/resources/common/json/user-jack-old.json
M infra/prism/src/test/resources/common/json/user-jack-v1.json
M infra/prism/src/test/resources/common/json/user-jack.json
M infra/prism/src/test/resources/common/json/user-will.json
M infra/prism/src/test/resources/common/yaml/user-jack-adhoc.yaml
M infra/prism/src/test/resources/common/yaml/user-jack-modified.yaml
M infra/prism/src/test/resources/common/yaml/user-jack-no-ns.yaml
M infra/prism/src/test/resources/common/yaml/user-jack-object.yaml
M infra/prism/src/test/resources/common/yaml/user-jack.yaml
M infra/prism/src/test/resources/common/yaml/user-will.yaml
M infra/prism/testng-unit.xml
M infra/schema/src/main/java/com/evolveum/midpoint/schema/constants/SchemaConstants.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/FocusTypeUtil.java
M infra/schema/src/main/java/com/evolveum/midpoint/schema/util/MiscSchemaUtil.java
M infra/schema/src/main/resources/localization/schema.properties
M infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
M infra/schema/src/test/java/com/evolveum/midpoint/schema/util/SchemaTestUtil.java
M infra/test-util/src/main/java/com/evolveum/midpoint/test/util/TestUtil.java
M infra/util/src/main/java/com/evolveum/midpoint/util/DebugUtil.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/ModelAuthorizationAction.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedAssignment.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRule.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/EvaluatedPolicyRuleTrigger.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/ModelElementContext.java
A model/model-api/src/main/java/com/evolveum/midpoint/model/api/context/PredefinedPolicySituaion.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/hooks/ChangeHook.java
M model/model-api/src/main/java/com/evolveum/midpoint/model/api/util/MergeDeltas.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/hooks/PolicyRuleEnforcerHook.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentEvaluator.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/AssignmentPathSegment.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/Clockwork.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedAssignmentTargetImpl.java
A model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluatedPolicyRuleImpl.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/EvaluationOrder.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensElementContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensFocusContext.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/LensUtil.java
M model/model-impl/src/main/java/com/evolveum/midpoint/model/impl/lens/projector/ActivationProcessor.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/lens/projector/FocusProcessor.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/AbstractConfiguredModelIntegrationTest.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestCaseIgnore.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestConnectorMultiInstance.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestDeputy.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestMultiResource.java
R model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestRbac.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSchemalessResource.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/TestSecurity.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStruct.java
M model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/orgstruct/TestOrgStructCaribbean.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbac.java
A model/model-intest/src/test/java/com/evolveum/midpoint/model/intest/rbac/TestRbacDeprecated.java
M model/model-intest/src/test/resources/common/role-cyan-sailor.xml
A model/model-intest/src/test/resources/common/role-drinker.xml
M model/model-intest/src/test/resources/common/role-judge-deprecated.xml
M model/model-intest/src/test/resources/common/role-judge.xml
M model/model-intest/src/test/resources/common/role-red-sailor.xml
M model/model-intest/src/test/resources/common/role-sailor.xml
M model/model-intest/src/test/resources/logback-test.xml
A model/model-intest/src/test/resources/rbac/role-cannibal-deprecated.xml
M model/model-intest/src/test/resources/rbac/role-cannibal.xml
A model/model-intest/src/test/resources/rbac/role-governor-deprecated.xml
M model/model-intest/src/test/resources/rbac/role-governor.xml
A model/model-intest/src/test/resources/rbac/role-immutable.xml
A model/model-intest/src/test/resources/rbac/role-non-assignable.xml
A model/model-intest/src/test/resources/security/role-delegator.xml
M model/model-intest/testng-integration.xml
M model/model-test/src/main/java/com/evolveum/midpoint/model/test/AbstractModelIntegrationTest.java
M repo/repo-test-util/src/main/java/com/evolveum/midpoint/test/AbstractIntegrationTest.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/SecurityEnforcer.java
M repo/security-impl/src/main/java/com/evolveum/midpoint/security/impl/SecurityEnforcerImpl.java
M testing/conntest/src/test/resources/ad-ldap-multidomain/resource-chimera.xml
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into registration
Conflicts:
gui/admin-gui/src/main/resources/localization/Midpoint.properties
Commit: 4627172610ffdc624bef145528aae52ee8046995
https://github.com/Evolveum/midpoint/commit/4627172610ffdc624bef145528aae52ee8046995
Author: Katarina Valalikova <k.valalikova at evolveum.com>
Date: 2016-11-17 (Thu, 17 Nov 2016)
Changed paths:
M config/sql/midpoint/3.5/h2/h2-3.5.sql
M config/sql/midpoint/3.5/h2/h2-upgrade-3.4-3.5.sql
M config/sql/midpoint/3.5/mysql/mysql-3.5.sql
M config/sql/midpoint/3.5/mysql/mysql-upgrade-3.4-3.5.sql
M config/sql/midpoint/3.5/oracle/oracle-3.5.sql
M config/sql/midpoint/3.5/oracle/oracle-upgrade-3.4-3.5.sql
M config/sql/midpoint/3.5/postgresql/postgresql-3.5.sql
M config/sql/midpoint/3.5/postgresql/postgresql-upgrade-3.4-3.5.sql
M config/sql/midpoint/3.5/sqlserver/sqlserver-3.5.sql
M config/sql/midpoint/3.5/sqlserver/sqlserver-upgrade-3.4-3.5.sql
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/Search.java
M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/search/SearchFactory.java
M repo/repo-sql-impl-test/src/test/resources/basic/objects.xml
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/RFocus.java
M repo/repo-sql-impl/src/main/java/com/evolveum/midpoint/repo/sql/data/common/container/RAssignment.java
Log Message:
-----------
Merge remote-tracking branch 'origin/master' into registration
Compare: https://github.com/Evolveum/midpoint/compare/cc6bf3ef37fb...4627172610ff
More information about the midPoint-svn
mailing list