Merge branch 'develop'

Author: tuj

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## in develop
 
+## 1.3.1
+
+* Fixed primary key constraint issue with migration.
+* Added scrollable to menu.
+
 ## 1.3.0
 
 * Changed from Hillrange/CKEditor to FOS/CKEditor.

public/styles.css

@@ -1,3 +1,7 @@
+.wrapper {
+  overflow: auto;
+}
+
 .field-smiley--title-hover {
   cursor: default;
 }

src/Migrations/Version20180530113106.php

@@ -15,6 +15,9 @@ public function up(Schema $schema) : void
         // this up() migration is auto-generated, please modify it to your needs
         $this->abortIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'Migration can only be executed safely on \'mysql\'.');
 
+        $this->addSql('ALTER TABLE theme_category DROP FOREIGN KEY FK_A4720BB659027487');
+        $this->addSql('ALTER TABLE theme_category DROP FOREIGN KEY FK_A4720BB612469DE2');
+        $this->addSql('ALTER TABLE theme_category DROP PRIMARY KEY');
         $this->addSql('ALTER TABLE theme_category ADD id INT AUTO_INCREMENT NOT NULL, ADD sort_order INT NOT NULL, ADD PRIMARY KEY (id)');
         $this->addSql('ALTER TABLE theme_category ADD CONSTRAINT FK_A4720BB659027487 FOREIGN KEY (theme_id) REFERENCES theme (id)');
         $this->addSql('ALTER TABLE theme_category ADD CONSTRAINT FK_A4720BB612469DE2 FOREIGN KEY (category_id) REFERENCES category (id)');

translations/messages.da.yml

@@ -175,7 +175,7 @@ answers_show:
 'Created at': Oprettet
 'Updated at': Opdateret
 custom_filters:
-    none: Alle grupper
+    none: Alle
 Apply: Udfør
 Group: Gruppe
 label: