1. 29 Jan, 2018 1 commit
  2. 28 Jan, 2018 2 commits
  3. 27 Jan, 2018 1 commit
  4. 25 Jan, 2018 3 commits
  5. 22 Jan, 2018 1 commit
  6. 16 Jan, 2018 1 commit
  7. 12 Jan, 2018 1 commit
  8. 02 Jan, 2018 3 commits
  9. 06 Dec, 2017 1 commit
  10. 05 Dec, 2017 1 commit
  11. 04 Dec, 2017 1 commit
  12. 15 Nov, 2017 4 commits
    • Dorinela Dascalu's avatar
      Merge branch 'master' into sentimentAnalysis_Florea · 6500519d
      Dorinela Dascalu authored
      # Conflicts:
      #	pom.xml
      #	src/main/java/data/AbstractDocument.java
      #	src/main/java/runtime/cscl/CreativityTest.java
      #	src/main/java/services/discourse/dialogism/DialogismComputations.java
      #	src/main/java/services/nlp/parsing/Parsing.java
      #	src/main/java/view/widgets/ReaderBenchView.java
      #	src/main/java/view/widgets/cscl/ChatView.java
      #	src/main/java/view/widgets/cscl/ChatVoiceInterAnimationView.java
      #	src/main/java/view/widgets/cscl/CollaborationVoiceView.java
      #	src/main/java/view/widgets/cscl/VoiceSynergyView.java
      #	src/main/java/view/widgets/document/SentenceLevelInterAnimationView.java
      6500519d
    • Dorinela Dascalu's avatar
      Merged with master. Resolved conflicts. · 13defd49
      Dorinela Dascalu authored
      13defd49
    • Dorinela Dascalu's avatar
      Merge branch 'master' into sentimentAnalysis_Florea · e9004daa
      Dorinela Dascalu authored
      # Conflicts:
      #	pom.xml
      #	src/main/java/data/AbstractDocument.java
      #	src/main/java/runtime/cscl/CreativityTest.java
      #	src/main/java/services/discourse/dialogism/DialogismComputations.java
      #	src/main/java/services/nlp/parsing/Parsing.java
      #	src/main/java/view/widgets/ReaderBenchView.java
      #	src/main/java/view/widgets/cscl/ChatView.java
      #	src/main/java/view/widgets/cscl/ChatVoiceInterAnimationView.java
      #	src/main/java/view/widgets/cscl/CollaborationVoiceView.java
      #	src/main/java/view/widgets/cscl/VoiceSynergyView.java
      #	src/main/java/view/widgets/document/SentenceLevelInterAnimationView.java
      e9004daa
    • Dorinela Dascalu's avatar
      Merged with master. Resolved conflicts. · 6f7ae3b8
      Dorinela Dascalu authored
      6f7ae3b8
  13. 14 Nov, 2017 5 commits
  14. 13 Nov, 2017 8 commits
  15. 12 Nov, 2017 4 commits
  16. 10 Nov, 2017 2 commits
  17. 09 Nov, 2017 1 commit