[midPoint-git] [Evolveum/midpoint] c1c284: draft for poly string panel

[Radovan Semancik]

  Branch: refs/heads/feature/groovy-sandbox
  Home:   https://github.com/Evolveum/midpoint
  Commit: c1c2846373fc882481a353c372b11c95cf54ad43
      https://github.com/Evolveum/midpoint/commit/c1c2846373fc882481a353c372b11c95cf54ad43
  Author: kate <honchar at evolveum.com>
  Date:   2019-03-20 (Wed, 20 Mar 2019)

  Changed paths:
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PolyStringEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PolyStringEditorPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties

  Log Message:
  -----------
  draft for poly string panel


  Commit: a8d915b86b426224c6268e7e9efc6672ce46a0d8
      https://github.com/Evolveum/midpoint/commit/a8d915b86b426224c6268e7e9efc6672ce46a0d8
  Author: skublik <lskublik at evolveum.com>
  Date:   2019-03-20 (Wed, 20 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java

  Log Message:
  -----------
  MID-5216


  Commit: ba377e1d439504c3f2b5bebccc794d01499ee27a
      https://github.com/Evolveum/midpoint/commit/ba377e1d439504c3f2b5bebccc794d01499ee27a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2019-03-20 (Wed, 20 Mar 2019)

  Changed paths:
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    A infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringLangType.java
    M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java
    M infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
    M infra/prism-impl/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism-impl/src/test/resources/common/json/user-jack-modified.json
    M infra/prism-impl/src/test/resources/common/json/user-jack-no-ns.json
    M infra/prism-impl/src/test/resources/common/json/user-jack.json
    M infra/prism-impl/src/test/resources/common/xml/user-jack-adhoc.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack-modified.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack-no-ns.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack.xml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-no-ns.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack.yaml

  Log Message:
  -----------
  PolyString support for lang


  Commit: a323bbca2dcea6bd47c95ea2853802f5938bc699
      https://github.com/Evolveum/midpoint/commit/a323bbca2dcea6bd47c95ea2853802f5938bc699
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2019-03-20 (Wed, 20 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java

  Log Message:
  -----------
  Merge branch 'master' of github.com:Evolveum/midpoint


  Commit: 366299c65882593fb15f2c02eab5ea5fc12d911a
      https://github.com/Evolveum/midpoint/commit/366299c65882593fb15f2c02eab5ea5fc12d911a
  Author: Radovan Semancik <radovan.semancik at evolveum.com>
  Date:   2019-03-20 (Wed, 20 Mar 2019)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/web/boot/WebSecurityConfig.java
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PolyStringEditorPanel.html
    A gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PolyStringEditorPanel.java
    M gui/admin-gui/src/main/resources/localization/Midpoint.properties
    M infra/prism-api/src/main/java/com/evolveum/midpoint/prism/polystring/PolyString.java
    A infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringLangType.java
    M infra/prism-api/src/main/java/com/evolveum/prism/xml/ns/_public/types_3/PolyStringType.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/BeanUnmarshaller.java
    M infra/prism-impl/src/main/java/com/evolveum/midpoint/prism/impl/marshaller/PrismMarshaller.java
    M infra/prism-impl/src/main/resources/xml/ns/public/types-3.xsd
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/PrismInternalTestUtil.java
    M infra/prism-impl/src/test/java/com/evolveum/midpoint/prism/TestPrismParsingXml.java
    M infra/prism-impl/src/test/resources/common/json/user-jack-adhoc.json
    M infra/prism-impl/src/test/resources/common/json/user-jack-modified.json
    M infra/prism-impl/src/test/resources/common/json/user-jack-no-ns.json
    M infra/prism-impl/src/test/resources/common/json/user-jack.json
    M infra/prism-impl/src/test/resources/common/xml/user-jack-adhoc.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack-modified.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack-no-ns.xml
    M infra/prism-impl/src/test/resources/common/xml/user-jack.xml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-adhoc.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-modified.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack-no-ns.yaml
    M infra/prism-impl/src/test/resources/common/yaml/user-jack.yaml

  Log Message:
  -----------
  Merge branch 'master' into feature/groovy-sandbox


Compare: https://github.com/Evolveum/midpoint/compare/f5a06f0d0477...366299c65882