Merge branch 'development' into '932-dark-stylesheet-alternative'
# Conflicts: # resources/less/metager/pages/resultpage/result-page.less # resources/less/metager/pages/resultpage/result.less # resources/less/metager/variables.less # webpack.mix.js
No related branches found
No related tags found
Showing
- .dockerignore 1 addition, 1 deletion.dockerignore
- .env.example 6 additions, 2 deletions.env.example
- .gitlab-ci.yml 3 additions, 3 deletions.gitlab-ci.yml
- .gitlab/development-values.yaml 7 additions, 0 deletions.gitlab/development-values.yaml
- .gitlab/production-values.yaml 10 additions, 2 deletions.gitlab/production-values.yaml
- Dockerfile 63 additions, 36 deletionsDockerfile
- DockerfileDev 61 additions, 0 deletionsDockerfileDev
- DockerfileDev.ignore 5 additions, 0 deletionsDockerfileDev.ignore
- app/Console/Commands/AppendLogs.php 72 additions, 0 deletionsapp/Console/Commands/AppendLogs.php
- app/Console/Commands/CacheGC.php 0 additions, 85 deletionsapp/Console/Commands/CacheGC.php
- app/Console/Commands/RequestFetcher.php 87 additions, 35 deletionsapp/Console/Commands/RequestFetcher.php
- app/Console/Kernel.php 1 addition, 1 deletionapp/Console/Kernel.php
- app/Http/Controllers/AdminInterface.php 1 addition, 1 deletionapp/Http/Controllers/AdminInterface.php
- app/Http/Controllers/Assoziator.php 1 addition, 1 deletionapp/Http/Controllers/Assoziator.php
- app/Http/Controllers/FokiLoader.php 1 addition, 1 deletionapp/Http/Controllers/FokiLoader.php
- app/Http/Controllers/HumanVerification.php 8 additions, 4 deletionsapp/Http/Controllers/HumanVerification.php
- app/Http/Controllers/MetaGerSearch.php 74 additions, 20 deletionsapp/Http/Controllers/MetaGerSearch.php
- app/Http/Middleware/UserAgentMaster.php 7 additions, 4 deletionsapp/Http/Middleware/UserAgentMaster.php
- app/MetaGer.php 67 additions, 36 deletionsapp/MetaGer.php
- app/Models/Quicktips/Quicktips.php 18 additions, 23 deletionsapp/Models/Quicktips/Quicktips.php
Loading
Please register or sign in to comment