Skip to content

Commit

Permalink
Merge pull request #3972 from pyrocms/master
Browse files Browse the repository at this point in the history 
merge master into dev
  • Loading branch information
@RyanThompson
RyanThompson committed Nov 12, 2016
2 parents b588c1d + a4052ce commit dde4d83
Show file tree
Hide file tree
Showing 7 changed files with 121 additions and 61 deletions.
Empty file modified app/Console/Kernel.php
100755 → 100644
View file
Empty file.
Empty file modified app/Http/Kernel.php
100755 → 100644
View file
Empty file.
114 changes: 57 additions & 57 deletions composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,65 +19,65 @@
}
],
"require": {
"anomaly/streams-composer-plugin": "~1.1",
"anomaly/streams-platform": "1.1.x-dev",
"anomaly/default_authenticator-extension": "2.1.x-dev",
"anomaly/throttle_security_check-extension": "2.1.x-dev",
"anomaly/local_storage_adapter-extension": "2.1.x-dev",
"anomaly/default_page_handler-extension": "2.1.x-dev",
"anomaly/user_security_check-extension": "2.1.x-dev",
"anomaly/xml_feed_widget-extension": "2.1.x-dev",
"anomaly/page_link_type-extension": "2.1.x-dev",
"anomaly/url_link_type-extension": "2.1.x-dev",
"anomaly/relationship-field_type": "2.1.x-dev",
"anomaly/colorpicker-field_type": "2.1.x-dev",
"anomaly/polymorphic-field_type": "2.1.x-dev",
"anomaly/checkboxes-field_type": "2.1.x-dev",
"anomaly/encrypted-field_type": "2.1.x-dev",
"anomaly/datetime-field_type": "2.1.x-dev",
"anomaly/language-field_type": "2.1.x-dev",
"anomaly/multiple-field_type": "2.1.x-dev",
"anomaly/textarea-field_type": "2.1.x-dev",
"anomaly/markdown-field_type": "2.1.x-dev",
"anomaly/wysiwyg-field_type": "2.1.x-dev",
"anomaly/boolean-field_type": "2.1.x-dev",
"anomaly/country-field_type": "2.1.x-dev",
"anomaly/decimal-field_type": "2.1.x-dev",
"anomaly/integer-field_type": "2.1.x-dev",
"anomaly/editor-field_type": "2.1.x-dev",
"anomaly/select-field_type": "2.1.x-dev",
"anomaly/slider-field_type": "2.1.x-dev",
"anomaly/addon-field_type": "2.1.x-dev",
"anomaly/email-field_type": "2.1.x-dev",
"anomaly/state-field_type": "2.1.x-dev",
"anomaly/files-field_type": "2.1.x-dev",
"anomaly/tags-field_type": "2.1.x-dev",
"anomaly/slug-field_type": "2.1.x-dev",
"anomaly/text-field_type": "2.1.x-dev",
"anomaly/file-field_type": "2.1.x-dev",
"anomaly/url-field_type": "2.1.x-dev",
"anomaly/configuration-module": "2.1.x-dev",
"anomaly/preferences-module": "2.1.x-dev",
"anomaly/navigation-module": "2.1.x-dev",
"anomaly/dashboard-module": "2.1.x-dev",
"anomaly/redirects-module": "2.1.x-dev",
"anomaly/installer-module": "2.1.x-dev",
"anomaly/variables-module": "2.1.x-dev",
"anomaly/settings-module": "2.1.x-dev",
"anomaly/addons-module": "2.1.x-dev",
"anomaly/users-module": "2.1.x-dev",
"anomaly/pages-module": "2.1.x-dev",
"anomaly/posts-module": "2.1.x-dev",
"anomaly/files-module": "2.1.x-dev",
"anomaly/contact-plugin": "1.1.x-dev",
"anomaly/helper-plugin": "2.1.x-dev",
"anomaly/robots-extension": "2.1.x-dev",
"anomaly/sitemap-extension": "2.1.x-dev",
"pyrocms/starter-theme": "1.0.x-dev",
"pyrocms/pyrocms-theme": "1.1.x-dev"
"anomaly/streams-composer-plugin": "~1.1.0",
"anomaly/streams-platform": "~1.1.0",
"anomaly/default_authenticator-extension": "~2.1.0",
"anomaly/throttle_security_check-extension": "~2.1.0",
"anomaly/local_storage_adapter-extension": "~2.1.0",
"anomaly/default_page_handler-extension": "~2.1.0",
"anomaly/user_security_check-extension": "~2.1.0",
"anomaly/xml_feed_widget-extension": "~2.1.0",
"anomaly/page_link_type-extension": "~2.1.0",
"anomaly/url_link_type-extension": "~2.1.0",
"anomaly/relationship-field_type": "~2.1.0",
"anomaly/colorpicker-field_type": "~2.1.0",
"anomaly/polymorphic-field_type": "~2.1.0",
"anomaly/checkboxes-field_type": "~2.1.0",
"anomaly/encrypted-field_type": "~2.1.0",
"anomaly/datetime-field_type": "~2.1.0",
"anomaly/language-field_type": "~2.1.0",
"anomaly/multiple-field_type": "~2.1.0",
"anomaly/textarea-field_type": "~2.1.0",
"anomaly/markdown-field_type": "~2.1.0",
"anomaly/wysiwyg-field_type": "~2.1.0",
"anomaly/boolean-field_type": "~2.1.0",
"anomaly/country-field_type": "~2.1.0",
"anomaly/decimal-field_type": "~2.1.0",
"anomaly/integer-field_type": "~2.1.0",
"anomaly/editor-field_type": "~2.1.0",
"anomaly/select-field_type": "~2.1.0",
"anomaly/slider-field_type": "~2.1.0",
"anomaly/addon-field_type": "~2.1.0",
"anomaly/email-field_type": "~2.1.0",
"anomaly/state-field_type": "~2.1.0",
"anomaly/files-field_type": "~2.1.0",
"anomaly/tags-field_type": "~2.1.0",
"anomaly/slug-field_type": "~2.1.0",
"anomaly/text-field_type": "~2.1.0",
"anomaly/file-field_type": "~2.1.0",
"anomaly/url-field_type": "~2.1.0",
"anomaly/configuration-module": "~2.1.0",
"anomaly/preferences-module": "~2.1.0",
"anomaly/navigation-module": "~2.1.0",
"anomaly/dashboard-module": "~2.1.0",
"anomaly/redirects-module": "~2.1.0",
"anomaly/installer-module": "~2.1.0",
"anomaly/variables-module": "~2.1.0",
"anomaly/settings-module": "~2.1.0",
"anomaly/addons-module": "~2.1.0",
"anomaly/users-module": "~2.1.0",
"anomaly/pages-module": "~2.1.0",
"anomaly/posts-module": "~2.1.0",
"anomaly/files-module": "~2.1.0",
"anomaly/contact-plugin": "~1.1.0",
"anomaly/helper-plugin": "~2.1.0",
"anomaly/robots-extension": "~2.1.0",
"anomaly/sitemap-extension": "~2.1.0",
"pyrocms/starter-theme": "~1.0.0",
"pyrocms/pyrocms-theme": "~1.1.0"
},
"require-dev": {
"phpunit/phpunit": "~4.4"
"phpunit/phpunit": "~4.4|~5.0"
},
"autoload": {
"classmap": [
Expand Down
2 changes: 1 addition & 1 deletion config/database.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
'collation' => 'utf8_unicode_ci',
'prefix' => env('DB_PREFIX', ''),
'strict' => false,
'engine' => null,
'engine' => env('DB_ENGINE'),
],

'pgsql' => [
Expand Down
56 changes: 54 additions & 2 deletions config/streams.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,64 @@

/*
|--------------------------------------------------------------------------
| Schedule
| Schedules
|--------------------------------------------------------------------------
|
| Additional scheduled commands for Streams Platform to register.
|
*/

'schedule' => []
'schedules' => [],

/*
|--------------------------------------------------------------------------
| Middleware
|--------------------------------------------------------------------------
|
| The application's global HTTP middleware stack.
| These middleware are run during every request to your application.
| By default Laravel's default middleware stack will be ran.
|
*/

'middleware' => [],

/*
|--------------------------------------------------------------------------
| Route Middleware
|--------------------------------------------------------------------------
|
| Route middleware allows you to apply middleware to a group of routes.
| By default Laravel's default route middleware will be registered.
|
*/

'route_middleware' => [],

/*
|--------------------------------------------------------------------------
| Middleware Groups
|--------------------------------------------------------------------------
|
| Sometimes you may want to group several middleware under a single
| key to make them easier to assign to routes. You may define these here.
| By default Laravel's default middleware groups will be registered.
|
*/

'middleware_groups' => [],

/*
|--------------------------------------------------------------------------
| Middleware Groups
|--------------------------------------------------------------------------
|
| The priority-sorted list of middleware.
| Forces the listed middleware to always be in the given order.
| By default Laravel's default middleware priority will be used.
|
*/

'middleware_priority' => [],

];
8 changes: 8 additions & 0 deletions public/.htaccess
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,12 @@
#RewriteCond %{HTTP_HOST} !^www\.(.*)$ [NC]
#RewriteRule ^(.*)$ http://www.%1/$1 [R=301,L]

# Force non-ssl
#RewriteCond %{HTTPS} on
#RewriteRule ^ http://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]

# Force ssl
#RewriteCond %{HTTPS} off
#RewriteRule ^ https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301]

</IfModule>
2 changes: 1 addition & 1 deletion resources/streams/config/distribution.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
return [
'name' => 'PyroCMS',
'description' => 'The CMS built for everyone.',
'version' => 'v3.1.1',
'version' => 'v3.1.3',
];

0 comments on commit dde4d83

Please sign in to comment.