Merge branch 'dev' into 'master'

Dev

See merge request TheGamecraft/c-cms!21
This commit is contained in:
Mathieu Lagace
2018-11-13 18:27:23 +00:00

View File

@@ -2,19 +2,19 @@ APP_NAME=C-CMS
APP_ENV=local APP_ENV=local
APP_KEY= APP_KEY=
APP_DEBUG=true APP_DEBUG=true
APP_URL=https://dev.c-cms.cf/ APP_URL=https://dev.c-cms.cf/ # Adresse de votre site web
SQN_NUMBER=000 SQN_NUMBER=000 # Numéro de votre escadron
SQN_FULLNAME="Escadron 000 Exemple" SQN_FULLNAME="Escadron 000 Exemple" # Nom complet de votre escadron
LOG_CHANNEL=stack LOG_CHANNEL=stack
DB_CONNECTION=mysql DB_CONNECTION=mysql
DB_HOST=127.0.0.1 DB_HOST=127.0.0.1
DB_PORT=3306 DB_PORT=3306
DB_DATABASE= DB_DATABASE=ddb # Nom de la base de donnée
DB_USERNAME= DB_USERNAME=user # Nom d'utilisateur pour ce connecter a la base de donnée
DB_PASSWORD= DB_PASSWORD=password # Mot de passe de la base de donnée
BROADCAST_DRIVER=log BROADCAST_DRIVER=log
CACHE_DRIVER=file CACHE_DRIVER=file
@@ -33,8 +33,8 @@ MAIL_USERNAME=null
MAIL_PASSWORD=null MAIL_PASSWORD=null
MAIL_ENCRYPTION=null MAIL_ENCRYPTION=null
NEXMO_KEY= NEXMO_KEY=4587feffd # Clé Nexmo API
NEXMO_SECRET= NEXMO_SECRET=54dasf4e8fa4s4fd4f5s # Mot de passe Nexmo API
PUSHER_APP_ID= PUSHER_APP_ID=
PUSHER_APP_KEY= PUSHER_APP_KEY=
@@ -43,3 +43,4 @@ PUSHER_APP_CLUSTER=mt1
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"