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: udapi/udapi-python
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: udapi/udapi-python
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: zellig-harris-transformations
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 14 files changed
  • 2 contributors

Commits on Jan 8, 2017

  1. I added a new rule for obtaining effective children (using modal verbs)

    Vincent Kriz committed Jan 8, 2017
    Configuration menu
    Copy the full SHA
    de49479 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2017

  1. New method eparents() instead of eparent(). Improved debugging messages.

    Vincent Kriz committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    48e1bc9 View commit details
    Browse the repository at this point in the history

Commits on Feb 15, 2017

  1. Functions en_finite_verbform, en_passive_verbform 

     Please check, Vincent!
    @cinkova
    cinkova committed Feb 15, 2017
    1 Configuration menu
    Copy the full SHA
    1471309 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2017

  1. Merge branch 'master' into zellig-harris-transformations

    Vincent Kriz committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    1110166 View commit details
    Browse the repository at this point in the history

  2. Fixed changes in API that came from master.

    Vincent Kriz committed Feb 19, 2017
    Configuration menu
    Copy the full SHA
    a0dc0a6 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2017

  1. friday

    @cinkova
    cinkova committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    4aa6cdf View commit details
    Browse the repository at this point in the history

  2. Merge branch 'zellig-harris-transformations' of https://github.com/ud… 

    …api/udapi-python into zellig-harris-transformations

# Conflicts:
#	udapi/block/zellig_harris/enhancedeps.py
#	udapi/block/zellig_harris/morphotests.py
#	udapi/block/zellig_harris/queries.py
    @cinkova
    cinkova committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    a191760 View commit details
    Browse the repository at this point in the history

  3. New versions of eparents, echildren, schildren methods.

    Vincent Kriz committed Feb 20, 2017
    Configuration menu
    Copy the full SHA
    862e2d0 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2017

  1. první den s Ivetou

    @cinkova
    cinkova committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    f4607c1 View commit details
    Browse the repository at this point in the history

  2. small error in en_verb_has_dobj_is_relclPassive corrected

    @cinkova
    cinkova committed Apr 14, 2017
    Configuration menu
    Copy the full SHA
    c1bad8a View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2017

  1. relative clauses

    @cinkova
    cinkova committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    e62204c View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2017

  1. from Iveta

    @cinkova
    cinkova committed Sep 21, 2017
    Configuration menu
    Copy the full SHA
    112ea23 View commit details
    Browse the repository at this point in the history

  2. od Ivety znovu

    @cinkova
    cinkova committed Sep 21, 2017
    Configuration menu
    Copy the full SHA
    ca171ed View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2017

  1. Zellig Harris: Iveta's works.

    Vincent Kríž committed Sep 25, 2017
    Configuration menu
    Copy the full SHA
    6387385 View commit details
    Browse the repository at this point in the history
Loading