Skip to content

Commit

Permalink
Merge branch 'release/4.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
terryupton committed Feb 11, 2021
2 parents 3248a56 + 7cdc4f4 commit cc46c1b
Show file tree
Hide file tree
Showing 142 changed files with 2,401 additions and 2,937 deletions.
4 changes: 3 additions & 1 deletion .deployignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ gulp/**
.babelrc
.browserlistrc
README.*
TODO.*
TODO.*
tailwind.*
webpack.mix.js
63 changes: 35 additions & 28 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
################################################
# Craft general settings
################################################
SECURITY_KEY=""
APP_ID=""
ENVIRONMENT="local"
SECURITY_KEY=
APP_ID=
ENVIRONMENT=local

ALLOW_UPDATES=1
ALLOW_ADMIN_CHANGES=1
Expand All @@ -13,56 +13,63 @@ ENABLE_TEMPLATE_CACHING=0
IS_SYSTEM_LIVE=1
MAX_REVISIONS=10
RUN_QUEUE_AUTOMATICALLY=1
TEST_TO_EMAIL_ADDRESS=""
TEST_TO_EMAIL_ADDRESS=
DISALLOW_ROBOTS=1

################################################
# Plugin Settings
################################################
SEOMATIC_ENVIROMENT=local

################################################
# Craft database settings
################################################
DB_DRIVER="mysql"
DB_SERVER="localhost"
DB_USER="REPLACE_ME"
DB_PASSWORD="REPLACE_ME"
DB_DATABASE="REPLACE_ME"
DB_SCHEMA="public"
DB_TABLE_PREFIX="craft_"
DB_PORT="3306"
DB_DRIVER=mysql
DB_SERVER=127.0.0.1
DB_USER=
DB_PASSWORD=
DB_DATABASE=
DB_SCHEMA=
DB_TABLE_PREFIX=craft_
DB_PORT=3306

################################################
# Site Settings
################################################
# Site Url - the url that is used to access the site on the environmental platform
PRIMARY_SITE_URL="REPLACE_ME"
PRIMARY_SITE_URL=

# The base path of the cms uploads folder - this is used in @aliases in the general config.
ASSETS_PATH="/uploads"
CP_UPLOADS_PATH="/uploads"

################################################
# Email Settings
################################################

# The from name and address used when sening emaisl via the system. Likely to be different per environment.
EMAIL_FROM_ADDRESS="REPLACE_ME"
EMAIL_FROM_NAME="REPLACE_ME"
EMAIL_FROM_ADDRESS=
EMAIL_FROM_NAME="Local Form Testing"

EMAIL_PORT =
EMAIL_HOST_NAME=
EMAIL_HOST_USERNAME=
EMAIL_HOST_PASSWORD=

EMAIL_PORT = "465"
EMAIL_HOST_NAME="REPLACE_ME"
EMAIL_HOST_USERNAME="REPLACE_ME"
EMAIL_HOST_PASSWORD="REPLACE_ME"
EMAIL_TEMPLATE_PATH=_layouts/layout-email

################################################
# Licences
################################################
PLUGIN_SEOMATIC_LICENSE="REPLACE_ME"
PLUGIN_SEOMATIC_LICENSE=
PLUGIN_IMAGEOPTIMIZE_LICENSE=
PLUGIN_FREEFORM_LICENSE=
PLUGIN_SPOON_LICENSE=
PLUGIN_NAVIGATION_LICENSE=

################################################
# Plugin Settings
# Google and API Settings
################################################
SEOMATIC_ENVIROMENT="REPLACE_ME"
GA_TRACKING_ID=
GOOGLE_MAPS_KEY=


################################################
# Google and API Settings
################################################
GA_TRACKING_ID="REPLACE_ME"
GOOGLE_MAPS_KEY="REPLACE_ME"
Loading

0 comments on commit cc46c1b

Please sign in to comment.