Build #137

Plan branch:

Build: #137 was successful Changes by Kamil Madej and areklalo <alalo@soldevelo.com>

Stages & jobs

  1. Default Stage

  2. Release

    Requires a user to start manually

Code commits

Git

  • Kamil Madej

    Kamil Madej 2ad121ba4eca32f11134ef4677d602719446fb64

    Merge pull request #134 from areklalo/SYNCT-294-2
    SYNCT-294: Sync 2 - support of OpenMRS 1.x

  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> c614900840665030ebf3bee9b5d654573eb9d95c

    SYNCT-294: Improved the code readability.

    • api/src/main/java/org/openmrs/module/sync2/api/service/impl/AbstractSynchronizationService.java (version c614900840665030ebf3bee9b5d654573eb9d95c)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> bbdaf73a8e69ac704183bb7c70881b04e4e7f5ab

    SYNCT-294: Fixed issue with the synchronization of delete action

    • api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/ConflictDetectionImpl.java (version bbdaf73a8e69ac704183bb7c70881b04e4e7f5ab)
    • api/src/main/java/org/openmrs/module/sync2/api/service/impl/AbstractSynchronizationService.java (version bbdaf73a8e69ac704183bb7c70881b04e4e7f5ab)
    • api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPullServiceImpl.java (version bbdaf73a8e69ac704183bb7c70881b04e4e7f5ab)
    • api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPushServiceImpl.java (version bbdaf73a8e69ac704183bb7c70881b04e4e7f5ab)
    • api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncRequestWrapperServiceImpl.java (version bbdaf73a8e69ac704183bb7c70881b04e4e7f5ab)
    • api/src/main/java/org/openmrs/module/sync2/api/sync/SyncClient.java (version bbdaf73a8e69ac704183bb7c70881b04e4e7f5ab)
    • api/src/main/java/org/openmrs/module/sync2/api/utils/SyncUtils.java (version bbdaf73a8e69ac704183bb7c70881b04e4e7f5ab)
    • api/src/test/java/org/openmrs/module/sync2/api/service/impl/AbstractSynchronizationServiceTest.java (version bbdaf73a8e69ac704183bb7c70881b04e4e7f5ab)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 209380b76d584cbf9fa95a2b4e7ccd0fff097fc0

    SYNCT-294: Added missing message property

    • api/src/main/resources/messages.properties (version 209380b76d584cbf9fa95a2b4e7ccd0fff097fc0)
    • api/src/main/resources/messages_es.properties (version 209380b76d584cbf9fa95a2b4e7ccd0fff097fc0)
    • api/src/main/resources/messages_fr.properties (version 209380b76d584cbf9fa95a2b4e7ccd0fff097fc0)
    • omod/src/main/webapp/pages/loadSyncConfig.gsp (version 209380b76d584cbf9fa95a2b4e7ccd0fff097fc0)
    • omod/src/main/webapp/sync2Configuration.jsp (version 209380b76d584cbf9fa95a2b4e7ccd0fff097fc0)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> aec8b81303f625b0a8a10f822bd394c5ce54b151

    SYNCT-294: Fixed issue with the page redirect

    • omod/src/main/java/org/openmrs/module/sync2/web/controller/ConflictResolutionController.java (version aec8b81303f625b0a8a10f822bd394c5ce54b151)
    • omod/src/main/webapp/conflictResolution.jsp (version aec8b81303f625b0a8a10f822bd394c5ce54b151)
    • omod/src/main/webapp/sync2.jsp (version aec8b81303f625b0a8a10f822bd394c5ce54b151)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> a171448816fcfabb646937cb974ef61d8462d327

    SYNCT-194: Changed position of buttons on the configuration page

    • omod/src/main/webapp/sync2Configuration.jsp (version a171448816fcfabb646937cb974ef61d8462d327)