Build #134

Plan branch:

Build: #134 was successful

Job: Default Job was successful

Stages & jobs

  1. Default Stage

  2. Release

    Requires a user to start manually

Code commits

Git

  • Kamil Madej

    Kamil Madej 8f2bab97c91fffbc8c589454b35354681dc4db43

    Merge pull request #131 from areklalo/SYNCT-262
    SYNCT-262: Move audit log view

  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 009fa38856bdf835c67f0845c0e587715900095c

    SYNCT-262: Changes after review

    • api/src/main/java/org/openmrs/module/sync2/api/utils/SyncUtils.java (version 009fa38856bdf835c67f0845c0e587715900095c)
    • api/src/main/java/org/openmrs/module/sync2/api/validator/impl/SyncConfigurationInstanceIdValidator.java (version 009fa38856bdf835c67f0845c0e587715900095c)
    • omod/src/main/java/org/openmrs/module/sync2/page/controller/RetryPageController.java (version 009fa38856bdf835c67f0845c0e587715900095c)
    • omod/src/main/java/org/openmrs/module/sync2/page/controller/Sync2PageController.java (version 009fa38856bdf835c67f0845c0e587715900095c)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2AuditListController.java (version 009fa38856bdf835c67f0845c0e587715900095c)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 009fa38856bdf835c67f0845c0e587715900095c)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2RetryController.java (version 009fa38856bdf835c67f0845c0e587715900095c)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/rest/SyncConflictRestController.java (version 009fa38856bdf835c67f0845c0e587715900095c)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> d49a1b4402fd1be5c00aa1cc9c9b3567ab7fdffa

    SYNCT-262: Fixed issue with the button color

    • omod/src/main/webapp/sync2Configuration.jsp (version d49a1b4402fd1be5c00aa1cc9c9b3567ab7fdffa)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 7a3f90e35b89e1e9b6e98fb75edff537273e5132

    SYNCT-262: Fixed issues with the "retry" functionality

    • omod/src/main/java/org/openmrs/module/sync2/fragment/controller/AuditDetailsFragmentController.java (version 7a3f90e35b89e1e9b6e98fb75edff537273e5132)
    • omod/src/main/java/org/openmrs/module/sync2/page/controller/RetryPageController.java (version 7a3f90e35b89e1e9b6e98fb75edff537273e5132)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2AuditDetailsController.java (version 7a3f90e35b89e1e9b6e98fb75edff537273e5132)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2AuditListController.java (version 7a3f90e35b89e1e9b6e98fb75edff537273e5132)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2RetryController.java (version 7a3f90e35b89e1e9b6e98fb75edff537273e5132)
    • omod/src/main/webapp/fragments/auditDetails.gsp (version 7a3f90e35b89e1e9b6e98fb75edff537273e5132)
    • omod/src/main/webapp/resources/scripts/sync2.audit.retry.js (version 7a3f90e35b89e1e9b6e98fb75edff537273e5132)
    • omod/src/main/webapp/sync2AuditDetails.jsp (version 7a3f90e35b89e1e9b6e98fb75edff537273e5132)
    • omod/src/main/webapp/sync2AuditList.jsp (version 7a3f90e35b89e1e9b6e98fb75edff537273e5132)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> a95d4b3c8f1fd722a2591261c63f1a3cc151c924

    SYNCT-262: Fixed issues with the "conflict resolving" functionality

    • omod/src/main/java/org/openmrs/module/sync2/fragment/controller/AuditDetailsFragmentController.java (version a95d4b3c8f1fd722a2591261c63f1a3cc151c924)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/ConflictResolutionController.java (version a95d4b3c8f1fd722a2591261c63f1a3cc151c924)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/rest/SyncConflictRestController.java (version a95d4b3c8f1fd722a2591261c63f1a3cc151c924)
    • omod/src/main/webapp/conflictResolution.jsp (version a95d4b3c8f1fd722a2591261c63f1a3cc151c924)
    • omod/src/main/webapp/fragments/auditDetails.gsp (version a95d4b3c8f1fd722a2591261c63f1a3cc151c924)
    • omod/src/main/webapp/resources/scripts/sync2.conflict.js (version a95d4b3c8f1fd722a2591261c63f1a3cc151c924)
    • omod/src/main/webapp/sync2AuditDetails.jsp (version a95d4b3c8f1fd722a2591261c63f1a3cc151c924)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> b641b16c88cc2fcd8edd89bf0c0057ffc0bdbd32

    SYNCT-262: Improved the "go back" functionality

    • omod/src/main/java/org/openmrs/module/sync2/fragment/controller/AuditDetailsFragmentController.java (version b641b16c88cc2fcd8edd89bf0c0057ffc0bdbd32)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/rest/SyncConflictRestController.java (version b641b16c88cc2fcd8edd89bf0c0057ffc0bdbd32)
    • omod/src/main/webapp/fragments/auditDetails.gsp (version b641b16c88cc2fcd8edd89bf0c0057ffc0bdbd32)
    • omod/src/main/webapp/pages/details.gsp (version b641b16c88cc2fcd8edd89bf0c0057ffc0bdbd32)
    • omod/src/main/webapp/resources/scripts/sync2.audit.controller.js (version b641b16c88cc2fcd8edd89bf0c0057ffc0bdbd32)
    • omod/src/main/webapp/sync2AuditDetails.jsp (version b641b16c88cc2fcd8edd89bf0c0057ffc0bdbd32)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90

    SYNCT-262: Added the audit detail page and corrected the CSS

    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2AuditDetailsController.java (version 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2AuditListController.java (version 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90)
    • omod/src/main/webapp/pages/auditList.gsp (version 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90)
    • omod/src/main/webapp/resources/scripts/sync2.audit.controller.js (version 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90)
    • omod/src/main/webapp/resources/scripts/sync2.audit.retry.js (version 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90)
    • omod/src/main/webapp/resources/scripts/sync2.conflict.js (version 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90)
    • omod/src/main/webapp/resources/styles/sync2.css (version 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90)
    • omod/src/main/webapp/sync2.jsp (version 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90)
    • omod/src/main/webapp/sync2AuditDetails.jsp (version 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90)
    • omod/src/main/webapp/sync2AuditList.jsp (version 04bae970c74eb73c8fc03e1a3ca4e31ffaeeac90)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> ea0a739d71ee06be3b6b73d208064228324ddcc0

    SYNCT-262: Added the audit list page to the admin page and the local header

    • omod/src/main/java/org/openmrs/module/sync2/extension/html/AdminList.java (version ea0a739d71ee06be3b6b73d208064228324ddcc0)
    • omod/src/main/webapp/template/localHeader.jsp (version ea0a739d71ee06be3b6b73d208064228324ddcc0)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 1311974f533ca6f8a19c8ab6838aaea1b6986530

    SYNCT-262: Created the audit list page via the legacy UI

    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2AuditListController.java (version 1311974f533ca6f8a19c8ab6838aaea1b6986530)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 1311974f533ca6f8a19c8ab6838aaea1b6986530)
    • omod/src/main/webapp/resources/scripts/jquery-1.12.4.min.js (version 1311974f533ca6f8a19c8ab6838aaea1b6986530)
    • omod/src/main/webapp/resources/scripts/sync2.audit.controller.js (version 1311974f533ca6f8a19c8ab6838aaea1b6986530)
    • omod/src/main/webapp/sync2AuditList.jsp (version 1311974f533ca6f8a19c8ab6838aaea1b6986530)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 372fe7946ade3a4df8b515af52bbcd76ead8a568

    SYNCT-262: Improved the configuration validation process

    • api/src/main/java/org/openmrs/module/sync2/api/validator/impl/SyncConfigurationInstanceIdValidator.java (version 372fe7946ade3a4df8b515af52bbcd76ead8a568)