Merge branch 'development' into '1116-remove-font-awesome-icons'
# Conflicts: # resources/views/assoziator/asso.blade.php
Showing
- .gitignore 0 additions, 1 deletion.gitignore
- .gitlab-ci.yml 26 additions, 25 deletions.gitlab-ci.yml
- .gitlab/development-values.yaml 2 additions, 0 deletions.gitlab/development-values.yaml
- .gitlab/production-values.yaml 1 addition, 0 deletions.gitlab/production-values.yaml
- .gitlab/review-apps-values.yaml 1 addition, 0 deletions.gitlab/review-apps-values.yaml
- .phpunit.result.cache 1 addition, 0 deletions.phpunit.result.cache
- .vscode/launch.json 2 additions, 2 deletions.vscode/launch.json
- Dockerfile 64 additions, 61 deletionsDockerfile
- DockerfileDev 59 additions, 55 deletionsDockerfileDev
- DockerfileDev.ignore 2 additions, 1 deletionDockerfileDev.ignore
- app/Console/Commands/SaveUseragents.php 5 additions, 3 deletionsapp/Console/Commands/SaveUseragents.php
- app/Exceptions/Handler.php 5 additions, 5 deletionsapp/Exceptions/Handler.php
- app/Http/Controllers/Assoziator.php 22 additions, 4 deletionsapp/Http/Controllers/Assoziator.php
- app/Http/Controllers/HumanVerification.php 4 additions, 3 deletionsapp/Http/Controllers/HumanVerification.php
- app/Http/Controllers/KeyController.php 166 additions, 20 deletionsapp/Http/Controllers/KeyController.php
- app/Http/Controllers/LanguageController.php 1 addition, 1 deletionapp/Http/Controllers/LanguageController.php
- app/Http/Controllers/MailController.php 4 additions, 4 deletionsapp/Http/Controllers/MailController.php
- app/Http/Controllers/MetaGerSearch.php 36 additions, 11 deletionsapp/Http/Controllers/MetaGerSearch.php
- app/Http/Controllers/SettingsController.php 2 additions, 2 deletionsapp/Http/Controllers/SettingsController.php
- app/Http/Controllers/StartpageController.php 0 additions, 6 deletionsapp/Http/Controllers/StartpageController.php
Loading
Please register or sign in to comment