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

docs(excel2json): use rosetta as example data (DEV-1478) #254

Merged
merged 9 commits into from Nov 16, 2022
Merged

docs(excel2json): use rosetta as example data (DEV-1478) #254

merged 9 commits into from Nov 16, 2022

Commits on Nov 10, 2022

  1. improve docs

    @jnussbaum
    jnussbaum committed Nov 10, 2022
    Copy the full SHA
    ec6fa8f View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2022

  1. excel2json: use rosetta as template data

    @jnussbaum
    jnussbaum committed Nov 11, 2022
    Copy the full SHA
    78d0a2b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into wip/dev-1478-improve-docs-2

    @jnussbaum
    jnussbaum committed Nov 11, 2022
    Copy the full SHA
    a3e4ae0 View commit details
    Browse the repository at this point in the history

  3. pull submodule knora/dsplib/import_scripts with 'git submodule update… 

    … --recursive --remote', then add it and commit it
    @jnussbaum
    jnussbaum committed Nov 11, 2022
    Copy the full SHA
    6642d26 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2022

  1. Merge branch 'wip/dev-1478-improve-docs-2' of github.com:dasch-swiss/… 

    …dsp-tools into wip/dev-1478-improve-docs-2

Upstream was deconnected for unknown reasons. Upstream was updated without knowing that downstream, I had important changes that I want to keep. Now I have to pull first, and then push my local work.
    @jnussbaum
    jnussbaum committed Nov 16, 2022
    Copy the full SHA
    7b9f90b View commit details
    Browse the repository at this point in the history

  2. improve wording in the docs

    @jnussbaum
    jnussbaum committed Nov 16, 2022
    Copy the full SHA
    8be3280 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into wip/dev-1478-improve-docs-2

    @jnussbaum
    jnussbaum committed Nov 16, 2022
    Copy the full SHA
    e843339 View commit details
    Browse the repository at this point in the history

  4. improve docs

    @jnussbaum
    jnussbaum committed Nov 16, 2022
    Copy the full SHA
    9693fde View commit details
    Browse the repository at this point in the history

  5. commit the submodule changes that were already pushed to 0123-import-… 

    …scripts
    @jnussbaum
    jnussbaum committed Nov 16, 2022
    Copy the full SHA
    34ca9f9 View commit details
    Browse the repository at this point in the history