Merge branch 'development' into...
Merge branch 'development' into '1020-show-information-about-every-search-engine-that-found-a-result' # Conflicts: # .gitignore
Showing
- .gitignore 1 addition, 0 deletions.gitignore
- .gitlab/development-values.yaml 1 addition, 1 deletion.gitlab/development-values.yaml
- .gitlab/production-values.yaml 1 addition, 1 deletion.gitlab/production-values.yaml
- app/Console/Commands/RequestFetcher.php 59 additions, 69 deletionsapp/Console/Commands/RequestFetcher.php
- app/Http/Controllers/AdminSpamController.php 6 additions, 1 deletionapp/Http/Controllers/AdminSpamController.php
- app/Http/Controllers/MetaGerSearch.php 20 additions, 4 deletionsapp/Http/Controllers/MetaGerSearch.php
- app/Http/Controllers/SettingsController.php 128 additions, 2 deletionsapp/Http/Controllers/SettingsController.php
- app/Http/Controllers/StartpageController.php 1 addition, 1 deletionapp/Http/Controllers/StartpageController.php
- app/Http/Middleware/BrowserVerification.php 4 additions, 4 deletionsapp/Http/Middleware/BrowserVerification.php
- app/MetaGer.php 94 additions, 50 deletionsapp/MetaGer.php
- app/Models/Quicktips/Quicktips.php 47 additions, 30 deletionsapp/Models/Quicktips/Quicktips.php
- app/Models/Searchengine.php 8 additions, 4 deletionsapp/Models/Searchengine.php
- chart/templates/deployment.yaml 5 additions, 0 deletionschart/templates/deployment.yaml
- composer.json 1 addition, 1 deletioncomposer.json
- resources/lang/de/hilfe.php 10 additions, 8 deletionsresources/lang/de/hilfe.php
- resources/lang/de/plugin-desktop/desktop-chrome.php 23 additions, 0 deletionsresources/lang/de/plugin-desktop/desktop-chrome.php
- resources/lang/de/plugin-desktop/desktop-edge.php 28 additions, 0 deletionsresources/lang/de/plugin-desktop/desktop-edge.php
- resources/lang/de/plugin-desktop/desktop-firefox.php 31 additions, 0 deletionsresources/lang/de/plugin-desktop/desktop-firefox.php
- resources/lang/de/plugin-desktop/desktop-ie.php 18 additions, 0 deletionsresources/lang/de/plugin-desktop/desktop-ie.php
- resources/lang/de/plugin-desktop/desktop-opera.php 14 additions, 0 deletionsresources/lang/de/plugin-desktop/desktop-opera.php
Loading
Please register or sign in to comment