Skip to content

Commit 8722281

Browse files
Merge pull request #24 from fortytwostudio/master
CMS, plugin and npm updates
2 parents b7b3441 + f75432d commit 8722281

34 files changed

+5213
-28871
lines changed

.env

+11-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ CRAFT_APP_ID=
1111
CRAFT_DB_DRIVER=
1212

1313
# The database server name or IP address
14-
CRAFT_DB_SERVER=127.0.0.1
14+
CRAFT_DB_SERVER=
1515

1616
# The port to connect to the database with
1717
CRAFT_DB_PORT=
@@ -35,7 +35,7 @@ CRAFT_DB_TABLE_PREFIX=
3535
PRIMARY_SITE_URL=
3636

3737
# The name of the site to be shown in the CMS
38-
SITE_NAME="Craft CMS Boilerplate"
38+
SITE_NAME=Craft CMS Boilerplate
3939

4040
# Admin email
4141
ADMIN_EMAIL=[email protected]
@@ -46,4 +46,12 @@ MG_PASSWORD=
4646

4747
#Amazon S3
4848
S3_KEY_ID=
49-
S3_SECRET=
49+
S3_SECRET=
50+
51+
#ReCaptcha
52+
CAPTCHA_SITE=
53+
CAPTCHA_SECRET=
54+
55+
# OPTIONAL - Backup commands for use with MAMP
56+
BACKUP_COMMAND="/Applications/MAMP/Library/bin/mysqldump -h localhost -u root -proot --add-drop-table --comments --create-options --dump-date --no-autocommit --routines --set-charset --triggers --single-transaction --no-data --result-file=\"{file}\" {database} && /Applications/MAMP/Library/bin/mysqldump -h localhost -u root -proot --add-drop-table --comments --create-options --dump-date --no-autocommit --routines --set-charset --triggers --no-create-info --ignore-table={database}.assetindexdata --ignore-table={database}.assettransformindex --ignore-table={database}.cache --ignore-table={database}.sessions --ignore-table={database}.templatecaches --ignore-table={database}.templatecachecriteria --ignore-table={database}.templatecacheelements --ignore-table={database}.templatecachequeries {database} >> \"{file}\""
57+
RESTORE_COMMAND="/Applications/MAMP/Library/bin/mysql -h localhost -u root -proot {database} < \"{file}\""

composer.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
"require": {
66
"adigital/cookie-consent-banner": "2.0.0",
77
"craftcms/aws-s3": "2.0.3",
8-
"craftcms/cms": "4.5.11.1",
8+
"craftcms/cms": "4.7.2",
99
"craftcms/redactor": "3.0.4",
1010
"ether/seo": "4.2.1",
1111
"sebastianlenz/linkfield": "2.1.5",
12-
"solspace/craft-freeform": "4.1.13",
13-
"spicyweb/craft-neo": "3.9.10",
12+
"solspace/craft-freeform": "5.0.9",
13+
"spicyweb/craft-neo": "4.0.3",
1414
"verbb/buttonbox": "4.2.0",
15-
"verbb/navigation": "2.0.22",
15+
"verbb/navigation": "2.0.25",
1616
"verbb/super-table": "3.0.12",
1717
"vlucas/phpdotenv": "^3.4.0",
18-
"wrav/oembed": "3.0.4"
18+
"wrav/oembed": "3.0.7"
1919
},
2020
"require-dev": {
2121
"yiisoft/yii2-shell": "^2.0.5"

0 commit comments

Comments
 (0)