Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  Use stable version
  Add version 2.5.0 to changelog
  Add mail configuration
  Move documentation to website
  • Loading branch information
vinkla committed May 21, 2015
2 parents b196ca0 + ed22552 commit 65a1db7
Show file tree
Hide file tree
Showing 4 changed files with 100 additions and 2 deletions.
7 changes: 6 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,12 @@ DB_NAME=wordpress
DB_USER=homestead
DB_PASSWORD=secret

GOOGLE_ANALYTICS_ID=
MAIL_HOST=mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null

GOOGLE_ANALYTICS_ID=null

AUTH_KEY=yourrandomstring
SECURE_AUTH_KEY=yourrandomstring
Expand Down
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# CHANGELOG

## 2.5.0 (released 2015-05-21)

- Fix Permalink Update Method Bug (#104)
- Move Docs to Website (#102)
- Add Test Coverage (#103)
- Add Mail Configuration (#100)

## 2.4.0 (released 2015-05-10)

- Add post revisions to config (#98)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
],
"require": {
"wordplate/framework": "2.4.*",
"wordplate/framework": "2.5.*",
"wpackagist-plugin/advanced-custom-fields": "~4.0",
"wpackagist-plugin/tiny-compress-images": "~1.0",
"wpackagist-plugin/wordpress-importer": "~0.6",
Expand Down
86 changes: 86 additions & 0 deletions config/mail.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
<?php

return [

/*
|--------------------------------------------------------------------------
| SMTP Host Address
|--------------------------------------------------------------------------
|
| Here you may provide the host address of the SMTP server used by your
| applications. A default option is provided that is compatible with
| the Mailgun mail service which will provide reliable deliveries.
|
*/

'host' => env('MAIL_HOST', 'smtp.mailgun.org'),

/*
|--------------------------------------------------------------------------
| SMTP Host Port
|--------------------------------------------------------------------------
|
| This is the SMTP port used by your application to deliver e-mails to
| users of the application. Like the host we have set this value to
| stay compatible with the Mailgun e-mail application by default.
|
*/

'port' => env('MAIL_PORT', 587),

/*
|--------------------------------------------------------------------------
| Global "From" Address
|--------------------------------------------------------------------------
|
| You may wish for all e-mails sent by your application to be sent from
| the same address. Here, you may specify a name and address that is
| used globally for all e-mails that are sent by your application.
|
*/

'from' => [
'address' => null,
'name' => null,
],

/*
|--------------------------------------------------------------------------
| E-Mail Encryption Protocol
|--------------------------------------------------------------------------
|
| Here you may specify the encryption protocol that should be used when
| the application send e-mail messages. A sensible default using the
| transport layer security protocol should provide great security.
|
*/

'encryption' => 'tls',

/*
|--------------------------------------------------------------------------
| SMTP Server Username
|--------------------------------------------------------------------------
|
| If your SMTP server requires a username for authentication, you should
| set it here. This will get used to authenticate with your server on
| connection. You may also set the "password" value below this one.
|
*/

'username' => env('MAIL_USERNAME'),

/*
|--------------------------------------------------------------------------
| SMTP Server Password
|--------------------------------------------------------------------------
|
| Here you may set the password required by your SMTP server to send out
| messages from your application. This will be given to the server on
| connection so that the application will be able to send messages.
|
*/

'password' => env('MAIL_PASSWORD'),

];

0 comments on commit 65a1db7

Please sign in to comment.