Merge branch 'development' of https://gitlab.metager.de/open-source/MetaGer into development
Showing
- .gitlab/development-values.yaml 2 additions, 2 deletions.gitlab/development-values.yaml
- .gitlab/production-values.yaml 2 additions, 2 deletions.gitlab/production-values.yaml
- .gitlab/review-apps-values.yaml 1 addition, 1 deletion.gitlab/review-apps-values.yaml
- app/Console/Commands/AppendLogs.php 50 additions, 2 deletionsapp/Console/Commands/AppendLogs.php
- app/Http/Controllers/AdminInterface.php 11 additions, 3 deletionsapp/Http/Controllers/AdminInterface.php
- app/Http/Controllers/MetaGerSearch.php 7 additions, 4 deletionsapp/Http/Controllers/MetaGerSearch.php
- app/Http/Controllers/StartpageController.php 16 additions, 0 deletionsapp/Http/Controllers/StartpageController.php
- app/Http/Controllers/Stresstest.php 31 additions, 0 deletionsapp/Http/Controllers/Stresstest.php
- app/MetaGer.php 24 additions, 135 deletionsapp/MetaGer.php
- app/Models/Adgoal.php 161 additions, 0 deletionsapp/Models/Adgoal.php
- app/Models/parserSkripte/Dummy.php 85 additions, 0 deletionsapp/Models/parserSkripte/Dummy.php
- config/stress.json 115 additions, 0 deletionsconfig/stress.json
- config/sumas.json.example 115 additions, 0 deletionsconfig/sumas.json.example
- config/sumas.xml.example 0 additions, 6 deletionsconfig/sumas.xml.example
- docker-compose.yml 11 additions, 0 deletionsdocker-compose.yml
- init.sh 8 additions, 0 deletionsinit.sh
- resources/lang/de/metaGer.php 5 additions, 0 deletionsresources/lang/de/metaGer.php
- resources/lang/en/kontakt.php 1 addition, 1 deletionresources/lang/en/kontakt.php
- resources/lang/en/metaGer.php 5 additions, 0 deletionsresources/lang/en/metaGer.php
- resources/lang/es/plugin-desktop/desktop-ie.php 14 additions, 0 deletionsresources/lang/es/plugin-desktop/desktop-ie.php
Loading
Please register or sign in to comment