Build #113

Plan branch:

Stages & jobs

  1. Default Stage

  2. Release

    Requires a user to start manually

Code commits

Git

  • rstencel <44087721+rstencel@users.noreply.github.com>

    rstencel <44087721+rstencel@users.noreply.github.com> 303ab4620aca75ee25b40c04dcf25ee0497e420b

    SYNCT-244: Added frontend support for conflict resolution (#115)
    * SYNCT-244: Initial commit for manual conflict resolution UI

    * SYNCT-244: Conflict resolution page created, button redirecting from audit log to conflict resolution page added

    * Object fields shown in table

    * Two compared objects displayed, differences checked, radio buttons added

    * Changed layout and CSS; changes are applied to object's JSON representation

    * Merging objects working

    * Integration with Audit Log

    * Code cleaning

    * Code cleaning

    * Fixed usage of inexistent getter

    * Removed unused link

    * Improved code readibility

    • api/src/main/java/org/openmrs/module/sync2/api/model/audit/AuditMessage.java (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • api/src/main/resources/messages.properties (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • api/src/main/resources/messages_es.properties (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • api/src/main/resources/messages_fr.properties (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • api/src/test/java/org/openmrs/module/sync2/api/service/impl/SyncAuditServiceImplTest.java (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • omod/src/main/java/org/openmrs/module/sync2/fragment/controller/AuditDetailsFragmentController.java (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/ConflictResolutionController.java (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • omod/src/main/webapp/conflictResolution.jsp (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • omod/src/main/webapp/fragments/auditDetails.gsp (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • omod/src/main/webapp/resources/scripts/sync2.conflict.js (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)
    • omod/src/main/webapp/resources/styles/conflictResolution.css (version 303ab4620aca75ee25b40c04dcf25ee0497e420b)

Release scripts

  • Daniel Kayiwa

    Daniel Kayiwa 88c804f1da6143fe9bc0737eb8de78d56ac59c2b

    Reverting my temporary change for -alpha

    • release-prepare-perform.sh (version 88c804f1da6143fe9bc0737eb8de78d56ac59c2b)
  • Daniel Kayiwa

    Daniel Kayiwa faf6c64e36e37ca6618ecfd243f36f1bb223a29d

    Changing not semver error message

    • release-prepare-perform.sh (version faf6c64e36e37ca6618ecfd243f36f1bb223a29d)
  • Daniel Kayiwa

    Daniel Kayiwa 432dd0900d9417e1addfcfdc12c03319e0d5aaa3

    Testing if my alpha version change is allowed

    • release-prepare-perform.sh (version 432dd0900d9417e1addfcfdc12c03319e0d5aaa3)