Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: proteinevolution/Toolkit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: proteinevolution/Toolkit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: docker
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 3 files changed
  • 3 contributors

Commits on Dec 14, 2018

  1. try to fix file not found error 

    - remove blank lines which were causing issues because of windows file endings
- simplify environment.sh
=> file can now be run in shell inside docker
    @felixgabler Felix Gabler
    felixgabler authored and Felix Gabler committed Dec 14, 2018
    Configuration menu
    Copy the full SHA
    d7eeb01 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2018

  1. fix envirnonment path for both, development and production

    Seung-Zin Nam
    Seung-Zin Nam committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    7e4110f View commit details
    Browse the repository at this point in the history

  2. ignore values in application-ext

    Seung-Zin Nam
    Seung-Zin Nam committed Dec 23, 2018
    Configuration menu
    Copy the full SHA
    979a26e View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2018

  1. Merge branch 'develop' of https://github.com/proteinevolution/Toolkit … 

    …into develop

# Conflicts:
#	docker-compose.yml
    @felixgabler
    felixgabler committed Dec 24, 2018
    Configuration menu
    Copy the full SHA
    1c7ccaf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fixenvironmentpath' of https://github.com/proteinevolut… 

    …ion/Toolkit into docker

# Conflicts:
#	modules/tel/src/main/scala/de/proteinevolution/tel/env/EnvFile.scala
    @felixgabler
    felixgabler committed Dec 24, 2018
    Configuration menu
    Copy the full SHA
    983d81b View commit details
    Browse the repository at this point in the history

  3. scalafmt

    @felixgabler
    felixgabler committed Dec 24, 2018
    Configuration menu
    Copy the full SHA
    ec33667 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2020

  1. Merge branch 'develop' into docker 

    # Conflicts:
#	app/modules/TELEnvProvider.scala
#	conf/application.conf
#	modules/results/src/main/scala/de/proteinevolution/results/services/ProcessFactory.scala
#	modules/results/src/main/scala/de/proteinevolution/results/services/ProcessService.scala
#	modules/tel/src/main/scala/de/proteinevolution/tel/env/EnvFile.scala
#	tel/env/environment.sh
    @joeldomke
    joeldomke committed Aug 1, 2020
    Configuration menu
    Copy the full SHA
    551a759 View commit details
    Browse the repository at this point in the history
Loading