Skip to content

Commit

Permalink
Merge branch 'master' into refactor-spoon-thumbnail
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroendesloovere committed Jun 5, 2018
2 parents ee4ef86 + 44320d4 commit 1484624
Show file tree
Hide file tree
Showing 287 changed files with 4,493 additions and 3,821 deletions.
42 changes: 42 additions & 0 deletions CHANGELOG.md
@@ -1,3 +1,45 @@
5.3.0 (2018-05-29)
------------------

Added:
* Core: Re-add some lost functionality of the ckeditor link plugin [#2539](https://github.com/forkcms/forkcms/pull/2539)
* Core: Re-add internal pages to the ckeditor link plugin [#2499](https://github.com/forkcms/forkcms/pull/2499)
* Blog: Set a label and for attribute for each form field in blog add/edit action [#2505](https://github.com/forkcms/forkcms/pull/2505)
* Core: Set aria label on subnavigation based on the active page [#2501](https://github.com/forkcms/forkcms/pull/2501)
* Locale: Polish language [#2520](https://github.com/forkcms/forkcms/pull/2520)
* Location: Service for geolocation [#2525](https://github.com/forkcms/forkcms/pull/2525)

Changed:
* Core: Add screen readers only guiding text for the breadcrumbs [#2542](https://github.com/forkcms/forkcms/pull/2542)
* Core: Increase log level for the dockerstdout since the logs are showing up in the console commands [#2548](https://github.com/forkcms/forkcms/pull/2548)
* Core: updated the included composer packages [#2547](https://github.com/forkcms/forkcms/pull/2547)
* Core: updated the included javascript packages [#2549](https://github.com/forkcms/forkcms/pull/2549)
* Core: Use type button on buttons that trigger modals [#2523](https://github.com/forkcms/forkcms/pull/2523)
* Blog: Add the tags to the blogpost in the frontend in the model instead of the action [#2486](https://github.com/forkcms/forkcms/pull/2486)
* Dashboard: Make the links bolder for accessibility reasons [#2536](https://github.com/forkcms/forkcms/pull/2536)
* FormBuilder: Use CurlPost for Google Recaptcha [#2532](https://github.com/forkcms/forkcms/pull/2532)
* Pages: Improve accessibility of the block buttons [#2500](https://github.com/forkcms/forkcms/pull/2500)
* Pages: Simplify PageBlock title and description [#2518](https://github.com/forkcms/forkcms/pull/2518)
* Tags: Improve accessibility of the tags input field [#2506](https://github.com/forkcms/forkcms/pull/2506)

Removed:
* Tests: Disable console debug logging when running tests [#2511](https://github.com/forkcms/forkcms/pull/2511)

Fixed:
* Core: Increase z-index of the alerts [#2550](https://github.com/forkcms/forkcms/pull/2550)
* Analytics: Fix for Backend Analytics Charts [#2526](https://github.com/forkcms/forkcms/pull/2526)
* Docker: Fix docker image not building because libpng12-dev changed its name to libpng-dev [#2543](https://github.com/forkcms/forkcms/pull/2543)
* Docs: Update 06. blocks_and_widgets.md [#2531](https://github.com/forkcms/forkcms/pull/2531)
* FormBuilder: Fix error when we don't store the responses in the database [#2535](https://github.com/forkcms/forkcms/pull/2535)
* Groups: Fix tabbing to the permissions pannels [#2537](https://github.com/forkcms/forkcms/pull/2537)
* Location: Only copy the location widgets to an other locale if the Location module is installed [#2522](https://github.com/forkcms/forkcms/pull/2522)
* Mailmotor: Add missing import for the macro's on the settings page [#2538](https://github.com/forkcms/forkcms/pull/2538)
* Mailmotor: Fix errors showing up in the logs after installing [#2545](https://github.com/forkcms/forkcms/pull/2545)

Security:
* Core: Add referrer security header [#2483](https://github.com/forkcms/forkcms/pull/2483)


5.2.3 (2018-03-28)
------------------

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Expand Up @@ -8,7 +8,7 @@ RUN a2enmod rewrite
RUN apt-get update && apt-get install -y --no-install-recommends \
libfreetype6-dev \
libjpeg62-turbo-dev \
libpng12-dev && \
libpng-dev && \
docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ && \
docker-php-ext-install -j$(nproc) gd && \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion VERSION.md
@@ -1 +1 @@
5.2.3
5.3.0
2 changes: 1 addition & 1 deletion app/Kernel.php
Expand Up @@ -184,7 +184,7 @@ private function getInstalledModules(ContainerBuilder $containerBuilder): array
return $moduleNames;
}

private function isInstallingModule(): bool
public function isInstallingModule(): bool
{
return preg_match('/\/private(\/\w\w)?\/extensions\/install_module\?/', $this->request->getRequestUri())
&& $this->request->query->has('module')
Expand Down
2 changes: 1 addition & 1 deletion app/config/config_dev.yml
Expand Up @@ -16,7 +16,7 @@ monolog:
dockerstdout:
type: stream
path: php://stdout
level: debug
level: error
formatter: monolog.full_trace_formatter
channels: ["!event"]

Expand Down
2 changes: 1 addition & 1 deletion app/config/parameters.yml.dist
Expand Up @@ -10,7 +10,7 @@ parameters:

fork.debug_email: <debug-email>
fork.debug_message: 'Internal error.'
fork.version: '5.2.3'
fork.version: '5.3.0'

site.protocol: <site-protocol>
site.domain: <site-domain>
Expand Down
2 changes: 1 addition & 1 deletion app/config/parameters.yml.travis
Expand Up @@ -10,7 +10,7 @@ parameters:

fork.debug_email: ''
fork.debug_message: 'Internal error.'
fork.version: '5.2.3'
fork.version: '5.3.0'

site.protocol: http
site.domain: fork.local
Expand Down
2 changes: 1 addition & 1 deletion app/config/parameters_install.yml
Expand Up @@ -10,7 +10,7 @@ parameters:

fork.debug_email: noreply@fork.com
fork.debug_message: 'Internal error.'
fork.version: '5.2.3'
fork.version: '5.3.0'

site.protocol: <site-protocol>
site.domain: <site-domain>
Expand Down
40 changes: 20 additions & 20 deletions composer.json
Expand Up @@ -14,34 +14,34 @@
"license": "MIT",
"require": {
"php": "^7.1",
"tijsverkoyen/akismet": "1.1.*",
"tijsverkoyen/css-to-inline-styles": "1.5.*",
"matthiasmullie/minify": "~1.3",
"matthiasmullie/scrapbook": "^1.3",
"symfony/symfony": "^3.3",
"symfony/assetic-bundle": "^2.8",
"symfony/swiftmailer-bundle": "^3.0",
"symfony/monolog-bundle": "^3.1",
"behat/transliterator": "~1.0",
"google/apiclient": "~1.1.2",
"league/flysystem": "~1.0",
"doctrine/doctrine-bundle": "^1.6",
"doctrine/orm": "^2.5",
"simple-bus/symfony-bridge": "^4.1",
"simple-bus/doctrine-orm-bridge": "^4.0",
"mailmotor/mailchimp-bundle": "^3.0",
"google/apiclient": "~1.1.2",
"google/recaptcha": "~1.1",
"jeroendesloovere/geolocation-php-api": "^2.1",
"league/flysystem": "~1.0",
"league/flysystem-aws-s3-v3": "^1.0.13",
"league/flysystem-cached-adapter": "^1.0.6",
"liip/imagine-bundle": "^1.7",
"mailmotor/campaignmonitor-bundle": "^2.0",
"mailmotor/mailchimp-bundle": "^3.0",
"mailmotor/mailmotor-bundle": "^3.0",
"matthiasmullie/minify": "~1.3",
"matthiasmullie/scrapbook": "^1.3",
"pimple/pimple": "^3.2",
"ramsey/uuid": "^3.5",
"ramsey/uuid-doctrine": "^1.2",
"liip/imagine-bundle": "^1.7",
"swiftmailer/swiftmailer": "^6.0",
"google/recaptcha": "~1.1",
"simple-bus/doctrine-orm-bridge": "^4.0",
"simple-bus/symfony-bridge": "^4.1",
"spoon/library": "^3.0",
"league/flysystem-aws-s3-v3": "^1.0.13",
"league/flysystem-cached-adapter": "^1.0.6",
"pimple/pimple": "^3.2",
"jeroendesloovere/geolocation-php-api": "^2.1"
"swiftmailer/swiftmailer": "^6.0",
"symfony/assetic-bundle": "^2.8",
"symfony/monolog-bundle": "^3.1",
"symfony/swiftmailer-bundle": "^3.0",
"symfony/symfony": "^3.3",
"tijsverkoyen/akismet": "1.1.*",
"tijsverkoyen/css-to-inline-styles": "1.5.*"
},
"require-dev": {
"jdorn/sql-formatter": "1.2.17",
Expand Down

0 comments on commit 1484624

Please sign in to comment.