Merge branch 'develop'

Author: tuj

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## in develop
 
+## 1.3.0
+
+* Changed from Hillrange/CKEditor to FOS/CKEditor.
+* Filtered out inactive systems.
+* Added Theme-Category.
+
 ## 1.2.2
 
 * Fixed issues with IE select.

composer.json

@@ -8,8 +8,8 @@
         "doctrine/doctrine-migrations-bundle": "^1.3",
         "easycorp/easyadmin-bundle": "^1.17",
         "fresh/doctrine-enum-bundle": "^6.1",
+        "friendsofsymfony/ckeditor-bundle": "^1.1",
         "friendsofsymfony/user-bundle": "~2.0",
-        "hillrange/ckeditor": "^1.0",
         "sensio/framework-extra-bundle": "^5.1",
         "sensiolabs/security-checker": "^4.1",
         "stof/doctrine-extensions-bundle": "^1.3",

composer.lock

@@ -17,7 +17,7 @@
     EasyCorp\Bundle\EasyAdminBundle\EasyAdminBundle::class => ['all' => true],
     FOS\UserBundle\FOSUserBundle::class => ['all' => true],
     Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
-    Hillrange\CKEditor\HillrangeCKEditorBundle::class => ['all' => true],
     Fresh\DoctrineEnumBundle\FreshDoctrineEnumBundle::class => ['all' => true],
     AlterPHP\EasyAdminExtensionBundle\EasyAdminExtensionBundle::class => ['all' => true],
+    FOS\CKEditorBundle\FOSCKEditorBundle::class => ['all' => true],
 ];