Commits · develop · Hagauer, Valentin / EmojiClassificationKDDM1

May 06, 2020
- s · fe21ba66
  Hagauer, Valentin authored 4 years ago
  
  fe21ba66
- c · f35233b3
  Hagauer, Valentin authored 4 years ago
  
  f35233b3
May 05, 2020
- Merge remote-tracking branch 'upstream/develop' into develop · 70988903
  Hagauer, Valentin authored 4 years ago
  
  70988903
Apr 29, 2020
- Merge pull request #46 from sw20-tug/LANG_013 · 28e94c1b
  afissel authored 4 years ago
  
  LANG_013 implemented studyOverview [RL, FA, IA]
  28e94c1b
- LANG_013 implemented studyOverview [RL, FA, IA] · afbd384f
  Radl, Lukas Sebastian authored 4 years ago
  
  afbd384f
- Merge pull request #45 from A-Postl/ailiskovic-LANG_004 · 7a7544da
  Momas007 authored 4 years ago
  
  Ailiskovic lang 004
  7a7544da
- Merge branch 'develop' into ailiskovic-LANG_004 · d83bcd17
  A-Postl authored 4 years ago
  
  d83bcd17
- LANG_004 some more merge issues · 79c9433e
  Postl, Anton Maximilian authored 4 years ago
  
  79c9433e
- LANG_004 fixed merge · 806ad76f
  Postl, Anton Maximilian authored 4 years ago
  
  806ad76f
- Merge pull request #44 from sw20-tug/LANG_013 · e1462525
  Momas007 authored 4 years ago
  
  LANG_013 implmented VocabularyOverview in menuStrip [RL]
  e1462525
- LANG_013 implmented VocabularyOverview in menuStrip [RL] · 6c6e4cb7
  Radl, Lukas Sebastian authored 4 years ago
  
  6c6e4cb7
- Merge github.com:sw20-tug/ASD-Morning-3 into develop · 1c52d794
  Hagauer, Valentin authored 4 years ago
  
  1c52d794
- Merge pull request #42 from sw20-tug/LANG_013 · b9c928ba
  Momas007 authored 4 years ago
  
  Lang 013
  b9c928ba
- LANG_013 merged with new menuStrip[RL] · e464c36a
  Radl, Lukas Sebastian authored 4 years ago
  
  e464c36a
- Merge remote-tracking branch 'origin/develop' into LANG_003 · f000ac84
  Radl, Lukas Sebastian authored 4 years ago
  
  # Conflicts: # main_module/src/main/java/com/asdmorning3/basic/GUI.java # main_module/src/main/resources/de.conf # main_module/src/main/resources/en.conf # main_module/src/main/resources/fr.conf
  f000ac84
- Merge pull request #41 from A-Postl/LANG_013 · 7f67a922
  Lukas Sebastian Radl authored 4 years ago
  
  LANG_013 [PA, HV]
  7f67a922
- LANG_013 [PA, HV] · 7ab699de
  Postl, Anton Maximilian authored 4 years ago
  
  7ab699de
- Merge pull request #39 from A-Postl/LANG_002 · cba8f162
  Lukas Sebastian Radl authored 4 years ago
  
  LANG_002 [HV, PA], fixed the last problems
  cba8f162
- Merge github.com:sw20-tug/ASD-Morning-3 into LANG_002 · 9cd45544
  Postl, Anton Maximilian authored 4 years ago
  
  9cd45544
- LANG_003 preparation for merging [RL] · 16ef14d5
  Radl, Lukas Sebastian authored 4 years ago
  
  16ef14d5
- Merge branch 'A-Postl-LANG_002' into develop · edac13e6
  Hagauer, Valentin authored 4 years ago
  
  edac13e6
- LANG_002 [HV, PA], fixed the last problems · 652498b5
  Postl, Anton Maximilian authored 4 years ago
  
  652498b5
- Merge pull request #37 from sw20-tug/LANG_003 · ebe341cc
  valihagi authored 4 years ago
  
  Lang_003
  ebe341cc
- Merge branch 'develop' into LANG_003 · b969b992
  Lukas Sebastian Radl authored 4 years ago
  
  b969b992
- LANG_003 finished, editing translations now works, not implemented with frontend yet · b153970f
  Radl, Lukas Sebastian authored 4 years ago
  
  b153970f
Apr 22, 2020
- LANG_003 gui is designed, still needs test and code [RL, MB] · 778543c0
  Radl, Lukas Sebastian authored 4 years ago
  
  778543c0
- Merge pull request #32 from valihagi/LANG_002 · d45cd220
  Lukas Sebastian Radl authored 4 years ago
  
  LANG_002
  d45cd220
- Delete .gitignore · 3e16f477
  Lukas Sebastian Radl authored 4 years ago
  
  3e16f477
- Delete modules.xml · 7ad41394
  Lukas Sebastian Radl authored 4 years ago
  
  7ad41394
- Delete misc.xml · cfff2d22
  Lukas Sebastian Radl authored 4 years ago
  
  cfff2d22
- Delete fr.conf · 50b8dd25
  Lukas Sebastian Radl authored 4 years ago
  
  50b8dd25
- Delete main_module.iml · 4137a625
  Lukas Sebastian Radl authored 4 years ago
  
  4137a625
- Delete de.conf · 37a853e5
  Lukas Sebastian Radl authored 4 years ago
  
  37a853e5
- Delete en.conf · 5f73f577
  Lukas Sebastian Radl authored 4 years ago
  
  5f73f577
- Delete en.conf · ba54563c
  Lukas Sebastian Radl authored 4 years ago
  
  ba54563c
- Delete Maven__junit_junit_4_12.xml · c0091275
  Lukas Sebastian Radl authored 4 years ago
  
  c0091275
- Delete de.conf · 90d39e0c
  Lukas Sebastian Radl authored 4 years ago
  
  90d39e0c
- Delete pom.xml · cf1ce0ad
  Lukas Sebastian Radl authored 4 years ago
  
  cf1ce0ad
- Delete fr.conf · d45a4485
  Lukas Sebastian Radl authored 4 years ago
  
  d45a4485
- Delete start.sh · 16909a75
  Lukas Sebastian Radl authored 4 years ago
  
  16909a75