[midPoint-git] [Evolveum/midpoint] 475f4a: fix panel id on VerticalFormPasswordPropertyPanel

[Viliam Repan]

  Branch: refs/heads/feature/merge
  Home:   https://github.com/Evolveum/midpoint
  Commit: 475f4a71ca274f34ad342f8d1e086f4c0f44348c
      https://github.com/Evolveum/midpoint/commit/475f4a71ca274f34ad342f8d1e086f4c0f44348c
  Author: skublik <lukas.skublik at gmail.com>
  Date:   2024-03-25 (Mon, 25 Mar 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPasswordPropertyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPasswordPropertyPanel.java

  Log Message:
  -----------
  fix panel id on VerticalFormPasswordPropertyPanel


  Commit: 6d164dd59940624905e0e05a02bbfe2bdc0deff7
      https://github.com/Evolveum/midpoint/commit/6d164dd59940624905e0e05a02bbfe2bdc0deff7
  Author: skublik <lukas.skublik at gmail.com>
  Date:   2024-03-25 (Mon, 25 Mar 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusPreviewChanges.java

  Log Message:
  -----------
  hide save button on preview changes page when development configuration is used


  Commit: 9b4fee10d83dd1f492fbd1f6286e0123e1f75db3
      https://github.com/Evolveum/midpoint/commit/9b4fee10d83dd1f492fbd1f6286e0123e1f75db3
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-03-25 (Mon, 25 Mar 2024)

  Changed paths:
    M tools/jenkins/midpoint-quick-pipeline

  Log Message:
  -----------
  Increase pod RAM to 8gb for quick pipeline

This could help with strange "exit code 137" failures.


  Commit: 87e7e514dfd8bcc7608324f3d8770dd021822546
      https://github.com/Evolveum/midpoint/commit/87e7e514dfd8bcc7608324f3d8770dd021822546
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-03-25 (Mon, 25 Mar 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusPreviewChanges.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPasswordPropertyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPasswordPropertyPanel.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master'


  Commit: ec10e52ecadc5568ce76a230b4fe98205149d23c
      https://github.com/Evolveum/midpoint/commit/ec10e52ecadc5568ce76a230b4fe98205149d23c
  Author: Pavol Mederly <mederly at evolveum.com>
  Date:   2024-03-25 (Mon, 25 Mar 2024)

  Changed paths:
    M tools/jenkins/midpoint-quick-pipeline

  Log Message:
  -----------
  Increase pod idle time for quick pipeline

This should help with the troubleshooting.


  Commit: 85f96cc390149d041e32e4d5d467ff955da1da76
      https://github.com/Evolveum/midpoint/commit/85f96cc390149d041e32e4d5d467ff955da1da76
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2024-03-26 (Tue, 26 Mar 2024)

  Changed paths:
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/FragmentSide.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/MergeFragment.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/MergeResult.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/SingleModification.java
    A infra/schema/src/main/java/com/evolveum/midpoint/schema/merger/threeway/ThreeWayMerger.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/AssertMergeFragment.java
    M infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/TestMerger.java
    A infra/schema/src/test/java/com/evolveum/midpoint/schema/merger/ThreeWayMergerTest.java
    A infra/schema/src/test/resources/merger/3way/role-base.xml
    A infra/schema/src/test/resources/merger/3way/role-left.xml
    A infra/schema/src/test/resources/merger/3way/role-right.xml
    M infra/schema/testng-unit.xml

  Log Message:
  -----------
  merge: first attempt to implement 3-way merge


  Commit: b4453f6fc50bc65c5aa3161fa846aadcb92a9701
      https://github.com/Evolveum/midpoint/commit/b4453f6fc50bc65c5aa3161fa846aadcb92a9701
  Author: Viliam Repan <vilo.repan at evolveum.com>
  Date:   2024-03-26 (Tue, 26 Mar 2024)

  Changed paths:
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusDetails.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/focus/PageFocusPreviewChanges.java
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPasswordPropertyPanel.html
    M gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/prism/panel/vertical/form/VerticalFormPasswordPropertyPanel.java
    M tools/jenkins/midpoint-quick-pipeline

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into feature/merge


Compare: https://github.com/Evolveum/midpoint/compare/73c8b6b37375...b4453f6fc50b

To unsubscribe from these emails, change your notification settings at https://github.com/Evolveum/midpoint/settings/notifications