Commits · d4cb7b61f15e03e06c742c85b93958de15d4ad5d · open-source / MetaGer

28 Sep, 2018 13 commits
- Versionsnummern um letzte Stelle gekürzt · d4cb7b61
  Karl Hasselbring authored Sep 28, 2018
  
  d4cb7b61
- Merge branch 'development' of https://gitlab.metager3.de/open-source/MetaGer into development · 1db619b1
  Dominik Hebeler authored Sep 28, 2018
  
  1db619b1
- Merge branch '754-url-verkurzer-nicht-nutzbar' into 'development' · e2a4f2e1
  Phil Höfer authored Sep 28, 2018
```
Resolve "URL-Verkürzer nicht nutzbar"

Closes #754

See merge request !1319
```
  e2a4f2e1
- Fixed Link to the privacy page · de7cad58
  Dominik Hebeler authored Sep 28, 2018
  
  de7cad58
- Merge branch '800-atom-api-reparieren' into 'development' · 682bfef3
  Phil Höfer authored Sep 28, 2018
```
Resolve "Atom-API reparieren"

Closes #800

See merge request !1312
```
  682bfef3
- Fix Atom 1.0 output · e63dae67
  Phil Höfer authored Sep 28, 2018
  
  e63dae67
- URL-Verkürzer Erwähnungen entfernt · 1cad86db
  Karl Hasselbring authored Sep 28, 2018
  
  1cad86db
- Merge branch '778-datenschutz' into 'development' · d49a9a85
  Phil Höfer authored Sep 28, 2018
```
Resolve "Datenschutz"

Closes #778

See merge request !1315
```
  d49a9a85
- Added new German privacy policy · 8cbc9061
  Phil Höfer authored Sep 28, 2018
  
  8cbc9061
- Merge branch 'revert-348778c0' into 'development' · df946518
  Dominik Hebeler authored Sep 28, 2018
```
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 Sep 28, 2018
```
This reverts commit 348778c0
```
  b796ab8f
- Merge branch 'revert-89e90ac2' into 'development' · 4cbbfff0
  Dominik Hebeler authored Sep 28, 2018
```
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 Sep 28, 2018
```
This reverts merge request !1313
```
  04b15565
27 Sep, 2018 3 commits
- Merge branch '804-quicktip-server-auf-lokal-umstellen' into 'development' · fff9accf
  Dominik Hebeler authored Sep 27, 2018
```
Resolve "Quicktip server auf lokal umstellen"

Closes #804

See merge request !1313
```
  fff9accf
- Fix Typo · c5471ff5
  Phil Höfer authored Sep 27, 2018
  
  c5471ff5
- quicktips werden jetzt lokal abgerufen · 3372a326
  Karl Hasselbring authored Sep 27, 2018
  
  3372a326
26 Sep, 2018 7 commits
- Merge branch 'development' of https://gitlab.metager3.de/open-source/MetaGer into development · 30f701a0
  Dominik Hebeler authored Sep 26, 2018
  
  30f701a0
- Impressum aktualisiert · 197c0c16
  Dominik Hebeler authored Sep 26, 2018
  
  197c0c16
- Merge branch '799-metager-in-docker' into 'development' · 3b39febf
  Phil Höfer authored Sep 26, 2018
```
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 Sep 26, 2018
  
  ca47c4d3
- Merge remote-tracking branch 'origin/development' into 799-metager-in-docker · 939a2d19
  Phil Höfer authored Sep 26, 2018
  
  939a2d19
- Merge branch '798-redesign-the-assoziator' into 'development' · eded8940
  Dominik Hebeler authored Sep 26, 2018
```
Resolve "Redesign the Assoziator"

Closes #798

See merge request !1308
```
  eded8940
- First Version of our new Associator · d003d64c
  Dominik Hebeler authored Sep 26, 2018
  
  d003d64c
21 Sep, 2018 8 commits
- Added the Resultpage for associations · d76ca35c
  Dominik Hebeler authored Sep 21, 2018
  
  d76ca35c
- Merge branch 'development' into 798-redesign-the-assoziator · 4f07df0d
  Dominik Hebeler authored Sep 21, 2018
  
  4f07df0d
- Human Verification won't throw an error anymore with no database connection · 9349f092
  Dominik Hebeler authored Sep 21, 2018
  
  9349f092
- We now catch the error in case of Database connection issues so that MetaGer works anyways · c1cf1208
  Dominik Hebeler authored Sep 21, 2018
  
  c1cf1208
- Merge branch '801-schriftgrossen-in-quicktips-fur-fett-und-kursiv-anpassen' into 'development' · 58c80d4a
  Phil Höfer authored Sep 21, 2018
```
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 Sep 21, 2018
  
  d2c91461
- Allgemeine Styles laufen jetzt über Vererbung · 660a1298
  Karl Hasselbring authored Sep 21, 2018
  
  660a1298
- Added preliminary Dockerfile · 2ced0b6e
  Phil Höfer authored Sep 21, 2018
  
  2ced0b6e
20 Sep, 2018 1 commit
- List of words for the assoziator is getting generated · 37585753
  Dominik Hebeler authored Sep 20, 2018
  
  37585753
19 Sep, 2018 1 commit
- Removed unused libs and defered Javascript execution · d0085ca1
  Dominik Hebeler authored Sep 19, 2018
  
  d0085ca1
18 Sep, 2018 3 commits
- Anzeigelink weiter optimiert · c046a6ca
  Dominik Hebeler authored Sep 18, 2018
  
  c046a6ca
- Autofocus is applied to the startpage again · 4f08b3c5
  Dominik Hebeler authored Sep 18, 2018
  
  4f08b3c5
- The label for the langcode now isn't shown anymore if it's the default (all) · d732c3a5
  Dominik Hebeler authored Sep 18, 2018
  
  d732c3a5
17 Sep, 2018 4 commits
- Merge branch '796-ergebnisse-lesbarer-machen' into 'development' · 80de1618
  Dominik Hebeler authored Sep 17, 2018
```
Resolve "Ergebnisse lesbarer machen"

Closes #796

See merge request !1306
```
  80de1618
- Changed Font Size in Quicktips · fff582b4
  Dominik Hebeler authored Sep 17, 2018
  
  fff582b4
- Changed color of advertisement · 5d4297d1
  Dominik Hebeler authored Sep 17, 2018
  
  5d4297d1
- Search Results should now be a bit more readable · 89b0adc8
  Dominik Hebeler authored Sep 17, 2018
  
  89b0adc8