Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow to keep linking rule draft of possibly invalid linking rules #403

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
Open

Allow to keep linking rule draft of possibly invalid linking rules #403

wants to merge 7 commits into from

Commits on Apr 30, 2020

  1. Added applicationData field to Linking Tasks

    @robertisele
    robertisele committed Apr 30, 2020
    Configuration menu
    Copy the full SHA
    eb6f287 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2020

  1. Merge branch 'develop' into feature/CMEM-2610 

    # Conflicts:
#	silk-plugins/silk-serialization-json/src/main/scala/org/silkframework/serialization/json/JsonSerializers.scala
#	silk-rules/src/main/scala/org/silkframework/rule/LinkSpec.scala
#	silk-workbench/silk-workbench-workspace/test/controllers/workspace/TaskApiTest.scala
#	silk-workspace/src/test/scala/org/silkframework/workspace/WorkspaceProviderTestTrait.scala
    Andreas Schultz committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    3ebd228 View commit details
    Browse the repository at this point in the history

  2. Resolve merge conflicts

    Andreas Schultz committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    93a6f2f View commit details
    Browse the repository at this point in the history

  3. Fix JSON serialization of link spec

    Andreas Schultz committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    c961bd0 View commit details
    Browse the repository at this point in the history

  4. Resolve merge conflicts

    Andreas Schultz committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    4f4d403 View commit details
    Browse the repository at this point in the history

  5. Fix applicationData parameter type

    Andreas Schultz committed Nov 9, 2020
    Configuration menu
    Copy the full SHA
    8e03665 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2021

  1. Merge branch 'develop' into feature/CMEM-2610 

    # Conflicts:
#	silk-core/src/main/scala/org/silkframework/runtime/plugin/ParameterType.scala
#	silk-workspace/src/test/scala/org/silkframework/workspace/WorkspaceProviderTestTrait.scala
    @andreas-schultz
    andreas-schultz committed Aug 4, 2021
    Configuration menu
    Copy the full SHA
    a45c11e View commit details
    Browse the repository at this point in the history