Build #131

Plan branch:

Build: #131 was successful Changes by 3 people

Stages & jobs

  1. Default Stage

  2. Release

    Requires a user to start manually

Code commits

Git

  • Kamil Madej

    Kamil Madej b069abc7665cc219ce0554374cca04ec8afdfefa

    Merge pull request #128 from areklalo/SYNCT-261
    SYNCT-261: Move load configuration view

  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 627936bbc563f17d67da4ee683cdda591f1386e3

    SYNCT-261: Changes after review

    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ConfigurationController.java (version 627936bbc563f17d67da4ee683cdda591f1386e3)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 3aa3c73ca7cef46e81e07256da38a86320aff326

    SYNCT-261: Moved alert message template to separate fragment

    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 3aa3c73ca7cef46e81e07256da38a86320aff326)
    • omod/src/main/webapp/resources/styles/alertMessage.css (version 3aa3c73ca7cef46e81e07256da38a86320aff326)
    • omod/src/main/webapp/resources/styles/sync2.css (version 3aa3c73ca7cef46e81e07256da38a86320aff326)
    • omod/src/main/webapp/sync2.jsp (version 3aa3c73ca7cef46e81e07256da38a86320aff326)
    • omod/src/main/webapp/sync2Configuration.jsp (version 3aa3c73ca7cef46e81e07256da38a86320aff326)
    • omod/src/main/webapp/template/alertMessage.jsp (version 3aa3c73ca7cef46e81e07256da38a86320aff326)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 1e3fdca1986312abfd0d3b464eb4cd4ff80f5056

    SYNCT-261: Fixed issue with blocking the pull/ push buttons when the parent instance URI is not valid

    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ConfigurationController.java (version 1e3fdca1986312abfd0d3b464eb4cd4ff80f5056)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 1e3fdca1986312abfd0d3b464eb4cd4ff80f5056)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> b10cf84c97d93360d8806587c29fc675ae8848e2

    SYNCT-261: Fixed issue with the Sync 2 page

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

    areklalo <alalo@soldevelo.com> bba861bc187321dbf3970358201f210cd8caab7c

    SYNCT-261: Added the Javadocs to the sync2 controller

    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version bba861bc187321dbf3970358201f210cd8caab7c)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 54659b4ac5bff46cdd81d6c5fc7657ab5eed125b

    SYNCT-261: Added the Javadocs to the configuration controller

    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ConfigurationController.java (version 54659b4ac5bff46cdd81d6c5fc7657ab5eed125b)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 8d0bc00915fa2b625029c1113b27fa30c8e2f549

    SYNCT-261: Added support of importing configuration from a file and the JSON validation. Extra fixes some issues with the Sync2 page.

    • omod/src/main/java/org/openmrs/module/sync2/SyncMessageUtils.java (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ConfigurationController.java (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549)
    • omod/src/main/webapp/resources/scripts/sync2.js (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549)
    • omod/src/main/webapp/resources/styles/sync2.css (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549)
    • omod/src/main/webapp/sync2.jsp (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549)
    • omod/src/main/webapp/sync2Configuration.jsp (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549)
    • omod/src/main/webapp/template/localHeader.jsp (version 8d0bc00915fa2b625029c1113b27fa30c8e2f549)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 1020fb687b49f07213e59ce50d5d8305648d2d2c

    Renamed the Spring bean of the default conflict merge behavior

    • api/src/main/java/org/openmrs/module/sync2/SyncConstants.java (version 1020fb687b49f07213e59ce50d5d8305648d2d2c)
    • api/src/main/java/org/openmrs/module/sync2/api/conflict/impl/RestrictConflictMergeBehaviourImpl.java (version 1020fb687b49f07213e59ce50d5d8305648d2d2c)
    • omod/src/main/resources/config.xml (version 1020fb687b49f07213e59ce50d5d8305648d2d2c)
  • areklalo <alalo@soldevelo.com>

    areklalo <alalo@soldevelo.com> 42ff4e58bbef30405cbedf68b732f9507d709e8b

    SYNCT-261: Added page to the admin list and fixed issue with the subpages links

    • omod/src/main/java/org/openmrs/module/sync2/extension/html/AdminList.java (version 42ff4e58bbef30405cbedf68b732f9507d709e8b)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ConfigurationController.java (version 42ff4e58bbef30405cbedf68b732f9507d709e8b)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version 42ff4e58bbef30405cbedf68b732f9507d709e8b)
    • omod/src/main/webapp/sync2Configuration.jsp (version 42ff4e58bbef30405cbedf68b732f9507d709e8b)
    • omod/src/main/webapp/template/localHeader.jsp (version 42ff4e58bbef30405cbedf68b732f9507d709e8b)
  • rstencel <rstencel@soldevelo.com>

    rstencel <rstencel@soldevelo.com> bad8015711cbc18c26baa0c948594e995f955af7

    Saving and importing JSON working

    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ConfigurationController.java (version bad8015711cbc18c26baa0c948594e995f955af7)
    • omod/src/main/java/org/openmrs/module/sync2/web/controller/Sync2ModuleController.java (version bad8015711cbc18c26baa0c948594e995f955af7)
    • omod/src/main/webapp/sync2Configuration.jsp (version bad8015711cbc18c26baa0c948594e995f955af7)