Build #114

Plan branch:

Build: #114 was successful Changes by wojtekbu <wojtekbu@users.noreply.github.com>

Stages & jobs

  1. Default Stage

  2. Release

    Requires a user to start manually

Code commits

Git

  • wojtekbu <wojtekbu@users.noreply.github.com>

    wojtekbu <wojtekbu@users.noreply.github.com> 517dd38154bc8dbdd734237669ebc0f1cf47f9f0

    SYNCT-278 Fetch real objects and send merged object (#116)
    * SYNCT-278: Added fetching end sending merged object

    * SYNCT-278: Added handling merged conflict sync

    * SYNCT-278: Added redirection on success

    * SYNCT-278: Refactoring of conflict audit message handling

    • api/src/main/java/org/openmrs/module/sync2/SyncConstants.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • api/src/main/java/org/openmrs/module/sync2/api/dao/SyncAuditDao.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • api/src/main/java/org/openmrs/module/sync2/api/dao/impl/SyncAuditDaoImpl.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • api/src/main/java/org/openmrs/module/sync2/api/service/SyncAuditService.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • api/src/main/java/org/openmrs/module/sync2/api/service/SyncPushService.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncAuditServiceImpl.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • api/src/main/java/org/openmrs/module/sync2/api/service/impl/SyncPushServiceImpl.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • omod/src/main/java/org/openmrs/module/sync2/fragment/controller/AuditDetailsFragmentController.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/ConflictResolutionController.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/rest/SyncConflictRestController.java (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • omod/src/main/webapp/conflictResolution.jsp (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)
    • omod/src/main/webapp/fragments/auditDetails.gsp (version 517dd38154bc8dbdd734237669ebc0f1cf47f9f0)