Commits · b9850bfeb00d541177bad4a798bba9e75dad3bf7 · open-source / MetaGer

Oct 28, 2020
- Merge branch 'development' into... · b9850bfe
  Davide Aprea authored 4 years ago
  
  Merge branch 'development' into '1020-show-information-about-every-search-engine-that-found-a-result' # Conflicts: # .gitignore
  b9850bfe
- added timings to duplication check · 1dca30ac
  Davide Aprea authored 4 years ago
  
  1dca30ac
- removed placeholders · e2d0e7f2
  Davide Aprea authored 4 years ago
  
  e2d0e7f2
- fixed deleting duplicates · f5d82c7c
  Davide Aprea authored 4 years ago
  
  f5d82c7c
- testing · d84886ee
  Davide Aprea authored 4 years ago
  
  d84886ee
- fixed ad provider implementation · 7b1866ce
  Davide Aprea authored 4 years ago
  
  7b1866ce
- added new duplicatation filter · 0d188fab
  Davide Aprea authored 4 years ago
  
  0d188fab
Oct 27, 2020
- fixed waiting for all engines when main engines are in cache · dad27b81
  Dominik Hebeler authored 4 years ago
  
  dad27b81
- Fixed waiting for Quicktips before starting searches · 822d50f3
  Dominik Hebeler authored 4 years ago
  
  822d50f3
Oct 26, 2020
- quicktip timer now starts when search is started · 46b7b4bc
  Dominik Hebeler authored 4 years ago
  
  46b7b4bc
- added browserstack error log to gitignore · 172e5edc
  Davide Aprea authored 4 years ago
  
  172e5edc
Oct 22, 2020
- fixed integrationtest · 47071b20
  Dominik Hebeler authored 4 years ago
  
  47071b20
- Merge branch '1010-add-quotes-and-did-you-know-to-metager' into 'development' · 73335223
  Dominik Hebeler authored 4 years ago
  
  Resolve "Add Quotes and Did-you-know to MetaGer" Closes #1010 See merge request !1710
  73335223
- Fix typo · ebb3c4d8
  Phil Höfer authored 4 years ago
  
  ebb3c4d8
- Merge branch 'development' of https://gitlab.metager.de/open-source/MetaGer into development · 88be234f
  Dominik Hebeler authored 4 years ago
  
  88be234f
- added language files for es · a7487e42
  Dominik Hebeler authored 4 years ago
  
  a7487e42
Oct 21, 2020
- Merge branch '1029-fixing-language-files-for-instructions' into 'development' · d66c7074
  Dominik Hebeler authored 4 years ago
  
  Resolve "fixing language files for instructions" Closes #1029 See merge request !1721
  d66c7074
- removed old french instructions · 05cba4c8
  Davide Aprea authored 4 years ago
  
  05cba4c8
- fixed test for pipeline · 95628377
  Davide Aprea authored 4 years ago
  
  95628377
- minor changes · b17c925f
  Davide Aprea authored 4 years ago
  
  b17c925f
Oct 20, 2020
- Fix Style Compilation Error · 8db89b37
  Phil Höfer authored 4 years ago
  
  8db89b37
- Improve Quicktips caching · 75987d10
  Phil Höfer authored 4 years ago
  
  75987d10
- Improve quicktip loading · fdd1b34c
  Phil Höfer authored 4 years ago
  
  fdd1b34c
Oct 19, 2020
- Merge branch '1028-customize-help-page-to-match-the-new-metager-design' into 'development' · e12cc621
  Phil Höfer authored 4 years ago
  
  Resolve "Customize help page to match the new MetaGer design" Closes #1028 See merge request !1720
  e12cc621
- Update resources/views/hilfe.blade.php, resources/lang/de/hilfe.php,... · 9d7cea65
  Carsten Riel authored 4 years ago
  
  Update resources/views/hilfe.blade.php, resources/lang/de/hilfe.php, resources/lang/en/hilfe.php files
  9d7cea65
- Reintroduce quicktips into resultpage · 33ef3f93
  Phil Höfer authored 4 years ago
  
  33ef3f93
- Merge branch '1027-fixing-dynamic-instructions' into 'development' · 303fec54
  Dominik Hebeler authored 4 years ago
  
  Resolve "fixing dynamic instructions" Closes #1027 See merge request !1719
  303fec54
- corrected version check on firefox mobile · db88a288
  Davide authored 4 years ago
  
  db88a288
Oct 16, 2020
- Merge branch '1022-settings-for-blacklisting-pages' into 'development' · 3f2dd7e1
  Dominik Hebeler authored 4 years ago
  
  Resolve "settings for blacklisting pages" Closes #1022 See merge request !1701
  3f2dd7e1
- Merge branch '1022-settings-for-blacklisting-pages' of... · 0de3c9e9
  Dominik Hebeler authored 4 years ago
  
  Merge branch '1022-settings-for-blacklisting-pages' of https://gitlab.metager.de/open-source/MetaGer into 1022-settings-for-blacklisting-pages
  0de3c9e9
- fixed typo · 5fe9b79e
  Dominik Hebeler authored 4 years ago
  
  5fe9b79e
- fixed underscore in cookie · 0374c654
  Dominik Hebeler authored 4 years ago
  
  0374c654
- Merge branch '1022-settings-for-blacklisting-pages' of... · ac57f0d8
  Davide authored 4 years ago
  
  Merge branch '1022-settings-for-blacklisting-pages' of https://gitlab.metager.de/open-source/MetaGer into 1022-settings-for-blacklisting-pages
  ac57f0d8
- minor fix · a992898d
  Davide authored 4 years ago
  
  a992898d
- Merge branch '1022-settings-for-blacklisting-pages' of... · b4829fe6
  Dominik Hebeler authored 4 years ago
  
  Merge branch '1022-settings-for-blacklisting-pages' of https://gitlab.metager.de/open-source/MetaGer into 1022-settings-for-blacklisting-pages
  b4829fe6
- changed counter to count all entries · 7b482a79
  Dominik Hebeler authored 4 years ago
  
  7b482a79
- added black list to delete settings · b3329005
  Davide authored 4 years ago
  
  b3329005
- added black list to settings count on resultpage · 5b829e84
  Davide authored 4 years ago
  
  5b829e84
- added settings validation for setting cookies · fd95b4d8
  Davide authored 4 years ago
  
  fd95b4d8
- added design · cfa33c5b
  Davide authored 4 years ago
  
  cfa33c5b