Merge branch '6.0.0-dev' into profiles-entity

CHANGELOG.md

@@ -1,3 +1,68 @@
+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)
+------------------
+
+Bugfixes:
+* Core: Add missing toggle navigation label in the frontend [#2493](https://github.com/forkcms/forkcms/pull/2493)
+* Core: Don't add the language to the home url if it is a single language site [#2516](https://github.com/forkcms/forkcms/pull/2516)
+* Core: Remove role tree that prevent screenreaders to use the page [#2504](https://github.com/forkcms/forkcms/pull/2504)
+* Analytics: Track mailto links as external links [#2513](https://github.com/forkcms/forkcms/pull/2513)
+* Blog: Dont ask to comment if commenting is not allowed [#2496](https://github.com/forkcms/forkcms/pull/2496)
+* Blog: Fix overview pages in blog module showing 404's when there are no blog posts [#2481](https://github.com/forkcms/forkcms/pull/2481)
+* Blog: Make it possible to add extra blog image sizes [#2467](https://github.com/forkcms/forkcms/pull/2467)
+* Blog: Update Category.html.twig if article with image too short [#2498](https://github.com/forkcms/forkcms/pull/2498)
+* Extensions: Fix button colour to save the theme template [#2487](https://github.com/forkcms/forkcms/pull/2487)
+* Groups: Delete entries linked to a deleted group [#2507](https://github.com/forkcms/forkcms/pull/2507)
+* Groups: Fix check if user belongs to a certain group [#2508](https://github.com/forkcms/forkcms/pull/2508)
+* Mailmotor: Use the symfony form in the template instead of plain html [#2468](https://github.com/forkcms/forkcms/pull/2468)
+* MediaLibrary: Fix sorting media widgets alphabetically [#2472](https://github.com/forkcms/forkcms/pull/2472)
+* Pages: Don't load images that don't exist [#2515](https://github.com/forkcms/forkcms/pull/2515)
+* Profiles: Ensure getRandomString() returns a string with the requested length [#2503](https://github.com/forkcms/forkcms/pull/2503)
+* Profiles: Use the correct macro for the buttons [#2502](https://github.com/forkcms/forkcms/pull/2502)
+* Tags: Tags should be case insensitive unique [#2479](https://github.com/forkcms/forkcms/pull/2479)
+
+
 5.2.2  (2018-02-14)
 ------------------
 

Dockerfile

@@ -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/*

VERSION.md

@@ -1 +1 @@
-5.2.2
+5.3.0

app/Kernel.php

@@ -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')

app/config/config.yml

@@ -198,6 +198,11 @@ services:
         tags:
             - { name: kernel.event_listener, event: kernel.response, method: onKernelResponse }
 
+    ForkCMS\Utility\Geolocation:
+        public: true
+        arguments:
+            - "@fork.settings"
+
     templating:
         class: Frontend\Core\Engine\TwigTemplate
         public: true

app/config/config_dev.yml

@@ -16,7 +16,7 @@ monolog:
         dockerstdout:
             type: stream
             path: php://stdout
-            level: debug
+            level: error
             formatter: monolog.full_trace_formatter
             channels: ["!event"]
 

app/config/config_test.yml

@@ -36,3 +36,8 @@ services:
             - "%database.port%"
         calls:
             - [ setDebug, [ "%kernel.debug%" ]]
+
+monolog:
+    handlers:
+        main:
+            type: 'null'

app/config/parameters.yml.dist

@@ -10,7 +10,7 @@ parameters:
 
     fork.debug_email:       <debug-email>
     fork.debug_message:     'Internal error.'
-    fork.version:           '5.2.2'
+    fork.version:           '5.3.0'
 
     site.protocol:          <site-protocol>
     site.domain:            <site-domain>

app/config/parameters.yml.travis

@@ -10,7 +10,7 @@ parameters:
 
     fork.debug_email:       ''
     fork.debug_message:     'Internal error.'
-    fork.version:           '5.2.2'
+    fork.version:           '5.3.0'
 
     site.protocol:          http
     site.domain:            fork.local

app/config/parameters_install.yml

@@ -10,7 +10,7 @@ parameters:
 
     fork.debug_email:       noreply@fork.com
     fork.debug_message:     'Internal error.'
-    fork.version:           '5.2.2'
+    fork.version:           '5.3.0'
 
     site.protocol:          <site-protocol>
     site.domain:            <site-domain>

composer.json

@@ -14,33 +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"
+        "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",