[TASK] Resolved merge conflicts when merging master
No related branches found
No related tags found
This commit is part of merge request !19. Comments created here will be created in the context of that merge request.
Showing
- Classes/Backend/TCAInfoField.php 2 additions, 2 deletionsClasses/Backend/TCAInfoField.php
- Classes/Controller/RouteController.php 82 additions, 39 deletionsClasses/Controller/RouteController.php
- Classes/Domain/Model/Route.php 44 additions, 25 deletionsClasses/Domain/Model/Route.php
- Classes/Domain/Repository/RouteRepository.php 77 additions, 11 deletionsClasses/Domain/Repository/RouteRepository.php
- Classes/Domain/Repository/RoutehitRepository.php 16 additions, 7 deletionsClasses/Domain/Repository/RoutehitRepository.php
- Classes/Hook/PageDataHandlerHook.php 29 additions, 2 deletionsClasses/Hook/PageDataHandlerHook.php
- Classes/Hook/PageLayoutController.php 33 additions, 3 deletionsClasses/Hook/PageLayoutController.php
- Classes/Middleware/RedirectResolver.php 131 additions, 107 deletionsClasses/Middleware/RedirectResolver.php
- Classes/Service/IpAnonymizerService.php 85 additions, 0 deletionsClasses/Service/IpAnonymizerService.php
- Classes/Updates/DefaultPageTypeSuffixUpdate.php 361 additions, 0 deletionsClasses/Updates/DefaultPageTypeSuffixUpdate.php
- Configuration/TCA/tx_sgroutes_domain_model_route.php 37 additions, 13 deletionsConfiguration/TCA/tx_sgroutes_domain_model_route.php
- README.md 1 addition, 1 deletionREADME.md
- Resources/Private/Backend/Layouts/Default.html 2 additions, 1 deletionResources/Private/Backend/Layouts/Default.html
- Resources/Private/Backend/Templates/Route/Htaccess.html 1 addition, 1 deletionResources/Private/Backend/Templates/Route/Htaccess.html
- Resources/Private/Backend/Templates/Route/List.html 229 additions, 65 deletionsResources/Private/Backend/Templates/Route/List.html
- Resources/Private/Backend/Templates/Route/Log.html 1 addition, 1 deletionResources/Private/Backend/Templates/Route/Log.html
- Resources/Private/Language/de.locallang.xlf 277 additions, 213 deletionsResources/Private/Language/de.locallang.xlf
- Resources/Private/Language/de.locallang_db.xlf 37 additions, 9 deletionsResources/Private/Language/de.locallang_db.xlf
- Resources/Private/Language/locallang.xlf 199 additions, 156 deletionsResources/Private/Language/locallang.xlf
- Resources/Private/Language/locallang_db.xlf 26 additions, 5 deletionsResources/Private/Language/locallang_db.xlf
Loading
Please register or sign in to comment