Skip to content
  1. Feb 21, 2022
  2. Feb 08, 2022
  3. Feb 07, 2022
  4. Nov 26, 2021
  5. Nov 24, 2021
  6. Nov 19, 2021
  7. Nov 17, 2021
  8. Oct 19, 2021
  9. Oct 15, 2021
  10. Oct 14, 2021
  11. Sep 29, 2021
  12. Sep 28, 2021
  13. Sep 24, 2021
  14. Sep 23, 2021
  15. Sep 20, 2021
  16. Sep 11, 2021
  17. Sep 10, 2021
  18. Sep 09, 2021
    • Marta Różańska's avatar
      fix for ProcessController · cc3134f6
      Marta Różańska authored
      cc3134f6
    • Marta Różańska's avatar
      Merge remote-tracking branch 'origin/morphemic-rc1.5' into proactive-dev-2 · ace739cf
      Marta Różańska authored
      # Conflicts:
      #	adapter/pom.xml
      #	adapter/src/main/java/eu/melodic/upperware/adapter/communication/proactive/ProactiveClientServiceForAdapterImpl.java
      #	adapter/src/main/java/eu/melodic/upperware/adapter/planexecutor/colosseum/NodeTaskExecutor.java
      #	cp_generator/pom.xml
      #	event-management/.gitignore
      #	event-management/bin/rest/1_new_camel.bat
      #	event-management/bin/rest/2_update_solution.bat
      #	event-management/bin/rest/2b_update_solution.bat
      #	event-management/bin/rest/3_install_ems_client.bat
      #	event-management/broker-client/src/main/java/eu/melodic/event/brokerclient/BrokerClient.java
      #	event-management/control-service/src/main/java/eu/melodic/event/control/webconf/WebSecurityConfig.java
      #	event-management/control-service/src/main/resources/public/index.html
      #	gui-backend/pom.xml
      #	gui-backend/src/main/java/eu/melodic/upperware/guibackend/ApplicationContext.java
      #	gui-backend/src/main/java/eu/melodic/upperware/guibackend/controller/process/ProcessController.java
      #	gui-backend/src/main/java/eu/melodic/upperware/guibackend/service/byon/ByonMapper.java
      #	melodic-cache/pom.xml
      ace739cf
Loading