Commits · 40316ff68051bfc32e6860fea04ea0710e61c1f6 · open-source / MetaGer

Oct 04, 2018
- Bugfix in Service Provider · 40316ff6
  Dominik Hebeler authored 6 years ago
  
  40316ff6
- Bugfix in ServiceProvider · 72d895de
  Dominik Hebeler authored 6 years ago
  
  72d895de
- Bugfix for when a key is entered · 597c48bc
  Dominik Hebeler authored 6 years ago
  
  597c48bc
- Modified Humanverification to make less Database requests · 79caee41
  Dominik Hebeler authored 6 years ago
  
  79caee41
- Merge branch 'development' of https://gitlab.metager3.de/open-source/MetaGer into development · 4127250b
  Dominik Hebeler authored 6 years ago
  
  4127250b
- Added metager.org to our new version, too · 8845211b
  Dominik Hebeler authored 6 years ago
  
  8845211b
Oct 01, 2018
- Merge branch '707-metager-spruche' into 'development' · 1263edd5
  Phil Höfer authored 6 years ago
  
  Versionsnummer der Quicktips an neues System angepasst Closes #707 See merge request !1323
  1263edd5
- Versionsnummer der Quicktips an neues System angepasst · 50c83a7e
  Karl Hasselbring authored 6 years ago
  
  50c83a7e
Sep 28, 2018
- Merge branch '731-better-result-page-if-no-result-is-found-on-a-site-serch' into 'development' · 5e5cff14
  Dominik Hebeler authored 6 years ago
  
  Resolve "better result page if no result is found on a site serch" Closes #731 See merge request !1296
  5e5cff14
- Merge branch '699-testversion-the-word-unsere-is-partly-hidden-behind-the-menu' into 'development' · 7b6e61ea
  Dominik Hebeler authored 6 years ago
  
  Resolve "testversion: The word "Unsere" is partly hidden behind the menu" Closes #699 See merge request !1297
  7b6e61ea
- Merge branch '707-metager-spruche' into 'development' · c5109952
  Dominik Hebeler authored 6 years ago
  
  Resolve "Metager-Sprüche" Closes #707 See merge request !1298
  c5109952
- Merge branch 'development' into '707-metager-spruche' · aa54175e
  Dominik Hebeler authored 6 years ago
  
  # Conflicts: # app/Models/Quicktips/Quicktips.php
  aa54175e
- Merge branch '808-quicktip-server-versionsnummern-anpassen' into 'development' · 229ffe12
  Dominik Hebeler authored 6 years ago
  
  Resolve "Quicktip Server Versionsnummern anpassen" Closes #808 See merge request !1320
  229ffe12
- Versionsnummern um letzte Stelle gekürzt · d4cb7b61
  Karl Hasselbring authored 6 years ago
  
  d4cb7b61
- Merge branch 'development' of https://gitlab.metager3.de/open-source/MetaGer into development · 1db619b1
  Dominik Hebeler authored 6 years ago
  
  1db619b1
- Merge branch '754-url-verkurzer-nicht-nutzbar' into 'development' · e2a4f2e1
  Phil Höfer authored 6 years ago
  
  Resolve "URL-Verkürzer nicht nutzbar" Closes #754 See merge request !1319
  e2a4f2e1
- Fixed Link to the privacy page · de7cad58
  Dominik Hebeler authored 6 years ago
  
  de7cad58
- Merge branch '800-atom-api-reparieren' into 'development' · 682bfef3
  Phil Höfer authored 6 years ago
  
  Resolve "Atom-API reparieren" Closes #800 See merge request !1312
  682bfef3
- Fix Atom 1.0 output · e63dae67
  Phil Höfer authored 6 years ago
  
  e63dae67
- 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
- Merge with Development · 8a1024ca
  Karl Hasselbring authored 6 years ago
  
  8a1024ca
- Merge branch 'development' into 707-metager-spruche · a74ca60e
  Karl Hasselbring authored 6 years ago
  
  a74ca60e
- Es wird nun Quicktip-Version 1.1.0 ohne Anführungszeichen um das Zitat geladen · cf8b85fb
  Karl Hasselbring authored 6 years ago
  
  cf8b85fb
- 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