Commits · 1cad86dbe6c1c1052c5d877e12ec3e857b8222fd · open-source / MetaGer

Sep 28, 2018
- URL-Verkürzer Erwähnungen entfernt · 1cad86db
  Karl Hasselbring authored 6 years ago
  
  1cad86db
- Merge branch '778-datenschutz' into 'development' · d49a9a85
  Phil Höfer authored 6 years ago
  
  Resolve "Datenschutz" Closes #778 See merge request !1315
  d49a9a85
- Added new German privacy policy · 8cbc9061
  Phil Höfer authored 6 years ago
  
  8cbc9061
- Merge branch 'revert-348778c0 ' into 'development' · df946518
  Dominik Hebeler authored 6 years ago
  
  Revert "Revert "Merge branch '804-quicktip-server-auf-lokal-umstellen' into 'development'"" See merge request !1317
  df946518
- Revert "Revert "Merge branch '804-quicktip-server-auf-lokal-umstellen' into 'development'"" · b796ab8f
  Dominik Hebeler authored 6 years ago
  
  This reverts commit 348778c0
  b796ab8f
- Merge branch 'revert-89e90ac2 ' into 'development' · 4cbbfff0
  Dominik Hebeler authored 6 years ago
  
  Revert "Merge branch '804-quicktip-server-auf-lokal-umstellen' into 'development'" See merge request !1316
  4cbbfff0
- Revert "Merge branch '804-quicktip-server-auf-lokal-umstellen' into 'development'" · 04b15565
  Dominik Hebeler authored 6 years ago
  
  This reverts merge request !1313
  04b15565
Sep 27, 2018
- Merge branch '804-quicktip-server-auf-lokal-umstellen' into 'development' · fff9accf
  Dominik Hebeler authored 6 years ago
  
  Resolve "Quicktip server auf lokal umstellen" Closes #804 See merge request !1313
  fff9accf
- Fix Typo · c5471ff5
  Phil Höfer authored 6 years ago
  
  c5471ff5
- quicktips werden jetzt lokal abgerufen · 3372a326
  Karl Hasselbring authored 6 years ago
  
  3372a326
Sep 26, 2018
- Merge branch 'development' of https://gitlab.metager3.de/open-source/MetaGer into development · 30f701a0
  Dominik Hebeler authored 6 years ago
  
  30f701a0
- Impressum aktualisiert · 197c0c16
  Dominik Hebeler authored 6 years ago
  
  197c0c16
- Merge branch '799-metager-in-docker' into 'development' · 3b39febf
  Phil Höfer authored 6 years ago
  
  Resolve "MetaGer in Docker" Closes #799 See merge request !1310
  3b39febf
- add preliminary shell script to start a dev environment · ca47c4d3
  Phil Höfer authored 6 years ago
  
  ca47c4d3
- Merge remote-tracking branch 'origin/development' into 799-metager-in-docker · 939a2d19
  Phil Höfer authored 6 years ago
  
  939a2d19
- Merge branch '798-redesign-the-assoziator' into 'development' · eded8940
  Dominik Hebeler authored 6 years ago
  
  Resolve "Redesign the Assoziator" Closes #798 See merge request !1308
  eded8940
- First Version of our new Associator · d003d64c
  Dominik Hebeler authored 6 years ago
  
  d003d64c
Sep 21, 2018
- Added the Resultpage for associations · d76ca35c
  Dominik Hebeler authored 6 years ago
  
  d76ca35c
- Merge branch 'development' into 798-redesign-the-assoziator · 4f07df0d
  Dominik Hebeler authored 6 years ago
  
  4f07df0d
- Human Verification won't throw an error anymore with no database connection · 9349f092
  Dominik Hebeler authored 6 years ago
  
  9349f092
- We now catch the error in case of Database connection issues so that MetaGer works anyways · c1cf1208
  Dominik Hebeler authored 6 years ago
  
  c1cf1208
- Merge branch '801-schriftgrossen-in-quicktips-fur-fett-und-kursiv-anpassen' into 'development' · 58c80d4a
  Phil Höfer authored 6 years ago
  
  Resolve "Schriftgrößen in Quicktips für fett und kursiv anpassen" Closes #801 See merge request !1311
  58c80d4a
- Fix database error when using Docker · d2c91461
  Phil Höfer authored 6 years ago
  
  d2c91461
- Allgemeine Styles laufen jetzt über Vererbung · 660a1298
  Karl Hasselbring authored 6 years ago
  
  660a1298
- Added preliminary Dockerfile · 2ced0b6e
  Phil Höfer authored 6 years ago
  
  2ced0b6e
Sep 20, 2018
- List of words for the assoziator is getting generated · 37585753
  Dominik Hebeler authored 6 years ago
  
  37585753
Sep 19, 2018
- Removed unused libs and defered Javascript execution · d0085ca1
  Dominik Hebeler authored 6 years ago
  
  d0085ca1
Sep 18, 2018
- Anzeigelink weiter optimiert · c046a6ca
  Dominik Hebeler authored 6 years ago
  
  c046a6ca
- Autofocus is applied to the startpage again · 4f08b3c5
  Dominik Hebeler authored 6 years ago
  
  4f08b3c5
- The label for the langcode now isn't shown anymore if it's the default (all) · d732c3a5
  Dominik Hebeler authored 6 years ago
  
  d732c3a5
Sep 17, 2018
- Merge branch '796-ergebnisse-lesbarer-machen' into 'development' · 80de1618
  Dominik Hebeler authored 6 years ago
  
  Resolve "Ergebnisse lesbarer machen" Closes #796 See merge request !1306
  80de1618
- Changed Font Size in Quicktips · fff582b4
  Dominik Hebeler authored 6 years ago
  
  fff582b4
- Changed color of advertisement · 5d4297d1
  Dominik Hebeler authored 6 years ago
  
  5d4297d1
- Search Results should now be a bit more readable · 89b0adc8
  Dominik Hebeler authored 6 years ago
  
  89b0adc8
- Merge branch '795-scopia-einbauen' into 'development' · 21e4b6bc
  Dominik Hebeler authored 6 years ago
  
  Resolve "Scopia einbauen" Closes #795 See merge request !1305
  21e4b6bc
- The english version doesn't need to remove ads anymore · 7854aa46
  Dominik Hebeler authored 6 years ago
  
  7854aa46
- English version now uses Scopia · 73af4340
  Dominik Hebeler authored 6 years ago
  
  73af4340
- Scopia eingebaut · ac9abf35
  Dominik Hebeler authored 6 years ago
  
  ac9abf35
- Merge branch '794-botschutz-uberarbeiten' into 'development' · 6b6a1566
  Dominik Hebeler authored 6 years ago
  
  Resolve "Botschutz überarbeiten" Closes #794 See merge request !1304
  6b6a1566
- New Version of Botprotection · 215e509e
  Dominik Hebeler authored 6 years ago
  
  215e509e