1. 28 Nov, 2018 1 commit
  2. 23 Oct, 2018 3 commits
    • Andrea Cascallar Fuentes's avatar
      Merge remote-tracking branch 'origin/master' · 5f565c1e
      Andrea Cascallar Fuentes authored
      # Conflicts:
      #	pom.xml
      #	src/main/java/simplenlg/aggregation/AggregationRule.java
      #	src/main/java/simplenlg/aggregation/ClauseCoordinationRule.java
      #	src/main/java/simplenlg/framework/CoordinatedPhraseElement.java
      #	src/main/java/simplenlg/framework/NLGFactory.java
      #	src/main/java/simplenlg/lexicon/Lexicon.java
      #	src/main/java/simplenlg/realiser/Realiser.java
      #	src/main/resources/default-galician-lexicon.xml
      #	src/test/java/simplenlg/external/english/ExternalTest.java
      #	src/test/java/simplenlg/external/galician/ExternalTest.java
      #	src/test/java/simplenlg/realiser/english/RealiserTest.java
      #	src/test/java/simplenlg/syntax/english/AdjectivePhraseTest.java
      #	src/test/java/simplenlg/syntax/english/ClauseTest.java
      #	src/test/java/simplenlg/syntax/english/FeatureTest.java
      #	src/test/java/simplenlg/syntax/english/InterrogativeTest.java
      #	src/test/java/simplenlg/syntax/english/NounPhraseTest.java
      #	src/test/java/simplenlg/syntax/english/PremodifierTest.java
      #	src/test/java/simplenlg/syntax/english/PrepositionalPhraseTest.java
      #	src/test/java/simplenlg/syntax/english/StringElementTest.java
      #	src/test/java/simplenlg/syntax/english/TutorialTest.java
      #	src/test/java/simplenlg/syntax/galician/InterrogativeTest2.java
      #	src/test/java/simplenlg/syntax/spanish/InterrogativeTest.java
      5f565c1e
    • Andrea Cascallar Fuentes's avatar
      e45e88aa
    • Andrea Cascallar Fuentes's avatar
      Merge remote-tracking branch 'origin/master' · 2b9194f4
      Andrea Cascallar Fuentes authored
      # Conflicts:
      #	pom.xml
      #	src/main/java/simplenlg/aggregation/AggregationRule.java
      #	src/main/java/simplenlg/aggregation/ClauseCoordinationRule.java
      #	src/main/java/simplenlg/framework/CoordinatedPhraseElement.java
      #	src/main/java/simplenlg/framework/NLGFactory.java
      #	src/main/java/simplenlg/lexicon/Lexicon.java
      #	src/main/java/simplenlg/realiser/Realiser.java
      #	src/main/resources/default-galician-lexicon.xml
      #	src/test/java/simplenlg/external/english/ExternalTest.java
      #	src/test/java/simplenlg/external/galician/ExternalTest.java
      #	src/test/java/simplenlg/realiser/english/RealiserTest.java
      #	src/test/java/simplenlg/syntax/english/AdjectivePhraseTest.java
      #	src/test/java/simplenlg/syntax/english/ClauseTest.java
      #	src/test/java/simplenlg/syntax/english/FeatureTest.java
      #	src/test/java/simplenlg/syntax/english/InterrogativeTest.java
      #	src/test/java/simplenlg/syntax/english/NounPhraseTest.java
      #	src/test/java/simplenlg/syntax/english/PremodifierTest.java
      #	src/test/java/simplenlg/syntax/english/PrepositionalPhraseTest.java
      #	src/test/java/simplenlg/syntax/english/StringElementTest.java
      #	src/test/java/simplenlg/syntax/english/TutorialTest.java
      #	src/test/java/simplenlg/syntax/galician/InterrogativeTest2.java
      #	src/test/java/simplenlg/syntax/spanish/InterrogativeTest.java
      2b9194f4
  3. 22 Oct, 2018 1 commit
  4. 04 Oct, 2018 5 commits
  5. 27 Sep, 2018 1 commit
  6. 25 Sep, 2018 2 commits
  7. 11 Jun, 2018 8 commits
  8. 08 Jun, 2018 2 commits
  9. 07 Jun, 2018 2 commits
  10. 04 Jun, 2018 2 commits
  11. 31 May, 2018 6 commits
  12. 29 May, 2018 7 commits