Skip to content

Commit 9023323

Browse files
committed
Finish user templates refacto
1 parent d913589 commit 9023323

46 files changed

Lines changed: 1121 additions & 162 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Makefile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,13 @@ build-prod:
3535
docker build -t resop:latest -f docker/php-flex/Dockerfile .
3636

3737
start-db:
38-
$(DOCKER_COMPOSE_UP) traefik postgres adminer
38+
$(DOCKER_COMPOSE_UP) traefik postgres adminer mailcatcher
3939
docker-compose run --rm wait -c postgres:5432
4040

4141
start-php:
4242
$(DOCKER_COMPOSE_UP_RECREATE) traefik nginx fpm
4343
docker-compose run --rm wait -c fpm:9000,nginx:80
44-
@echo -n "\nStack started with success:\nhttp://resop.vcap.me:7500/login => user1@resop.com : 01/01/1990"
45-
@echo -n "\nhttp://resop.vcap.me:7500/organizations/login => DT75 : covid19\n"
44+
@echo -n "\nStack started with success: http://resop.vcap.me:7500/\nuser102@resop.com : covid19\nadmin101@resop.com : covid19\nsuper_admin1@resop.com : covid19\n"
4645

4746
start: init-db start-php
4847

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"symfony/form": "5.*",
2727
"symfony/framework-bundle": "5.*",
2828
"symfony/intl": "5.*",
29-
"symfony/mailer": "5.0.*",
29+
"symfony/mailer": "5.*",
3030
"symfony/monolog-bundle": "^3.5",
3131
"symfony/security-bundle": "5.*",
3232
"symfony/serializer-pack": "^1.0",
@@ -41,7 +41,7 @@
4141
"twig/intl-extra": "^3.0"
4242
},
4343
"require-dev": {
44-
"alexandresalome/mailcatcher": "dev-master",
44+
"alexandresalome/mailcatcher": "^1.3",
4545
"behat/behat": "^3.6",
4646
"dama/doctrine-test-bundle": "^6.3",
4747
"escapestudios/symfony2-coding-standard": "^3.11",

0 commit comments

Comments
 (0)