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: 52North/javaPS
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: develop
Choose a base ref
...
head repository: 52North/javaPS
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: feature/selfdescribingalgorithm
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 7 files changed
  • 1 contributor

Commits on Jan 17, 2019

  1. First version of self describing algorithm

    @bpross-52n
    bpross-52n committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    473a4c9 View commit details
    Browse the repository at this point in the history

  2. Add bounding box input

    @bpross-52n
    bpross-52n committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    410a5e5 View commit details
    Browse the repository at this point in the history

  3. tmp

    @bpross-52n
    bpross-52n committed Jan 17, 2019
    Configuration menu
    Copy the full SHA
    8a2ed7d View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2019

  1. Merge branch 'develop' into feature/selfdescribingalgorithm 

    # Conflicts:
#	pom.xml
    @bpross-52n
    bpross-52n committed Jan 21, 2019
    Configuration menu
    Copy the full SHA
    3e3f7c9 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2019

  1. Merge branch 'develop' into feature/selfdescribingalgorithm 

    # Conflicts:
#	engine/src/main/java/org/n52/javaps/algorithm/annotation/BoundingBoxInputAnnotationParser.java
    @bpross-52n
    bpross-52n committed Jan 25, 2019
    Configuration menu
    Copy the full SHA
    b30cedb View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2019

  1. Merge branch 'develop' into feature/selfdescribingalgorithm

    @bpross-52n
    bpross-52n committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    9c32e4d View commit details
    Browse the repository at this point in the history

  2. Remove warnings

    @bpross-52n
    bpross-52n committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    d3da4bb View commit details
    Browse the repository at this point in the history
Loading