3.0 (#1647)

* 3.0.0 -> 3.0.1 * Fixed missing old URL handling, closes #1644 * Fixed responsiveness of admin dashboard, closes #1646 * Fixed opening all long comments, closes #1645 * Fixed possible issue with file verifcations
thorsten · Feb 22, 2020 · 30a3e9f · 30a3e9f
1 parent 1e4a851
commit 30a3e9f
Show file tree

Hide file tree

Showing 13 changed files with 333 additions and 265 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,4 @@
 phpMyFAQ 3.1.0-dev
-Codename "Poseidon"
 
 CHANGELOG
 
@@ -10,6 +9,9 @@ Version 3.1.0-dev
 - added support for Elasticsearch v6+ (Thorsten)
 - removed REST API v1 (Thorsten)
 
+Version 3.0.1 - 2020-03
+- fixed minor bugs (Thorsten)
+
 Version 3.0.0 - 2020-02-16
 - changed PHP requirement to PHP 7.2+ (Thorsten)
 - added PHP namespaces (Thorsten)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@thorsten/phpmyfaq",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "phpMyFAQ",
   "repository": "git://github.com/thorsten/phpMyFAQ.git",
   "author": "Thorsten Rinne",

diff --git a/phpmyfaq/.htaccess b/phpmyfaq/.htaccess
@@ -78,7 +78,7 @@ RewriteCond %{REQUEST_URI}          /login\.html$ [NC]
 RewriteRule ^(.*)$                  index.php?action=login [L,QSA]
 
 # start page
-RewriteRule ^index.html$                 index.php [PT]
+RewriteRule ^index.html$            index.php [PT]
 
 # a solution id page
 RewriteCond %{REQUEST_URI}              solution_id_([0-9]+)\.html$ [NC]
@@ -92,38 +92,38 @@ RewriteRule content/([0-9]+)/([0-9]+)/([a-z\-]+)/(.+)\.htm(l?)$     index.php?ac
 # PMF category page with page count
 # * http://[...]/category/1/<PAGE NUMBER/<CATEGORY NAME>.htm
 # * http://[...]/category/1/<PAGE NUMBER/<CATEGORY NAME>.html
-RewriteRule category/([0-9]+)/([0-9]+)/(.+)\.htm(l?)$   index.php?action=show&cat=$1&seite=$2 [L,QSA]
+RewriteRule category/([0-9]+)/([0-9]+)/(.+)\.htm(l?)$               index.php?action=show&cat=$1&seite=$2 [L,QSA]
 
 # PMF category page
 # * http://[...]/category/1/<CATEGORY NAME>.htm
 # * http://[...]/category/1/<CATEGORY NAME>.html
-RewriteRule category/([0-9]+)/(.+)\.htm(l?)$    index.php?action=show&cat=$1 [L,QSA]
+RewriteRule category/([0-9]+)/(.+)\.htm(l?)$                        index.php?action=show&cat=$1 [L,QSA]
 
 # PMF news page
 # * http://[...]/news/<ID>/<LANGUAGE CODE>/<HEADER>.htm
 # * http://[...]/news/<ID>/<LANGUAGE CODE>/<HEADER>.html
-RewriteRule news/([0-9]+)/([a-z\-]+)/(.+)\.htm(l?)$     index.php?action=news&newsid=$1&newslang=$2 [L,QSA]
+RewriteRule news/([0-9]+)/([a-z\-]+)/(.+)\.htm(l?)$                 index.php?action=news&newsid=$1&newslang=$2 [L,QSA]
 
 # PMF sitemap
 # * http://[...]/sitemap/<LETTER>/<LANGUAGE CODE>.htm
 # * http://[...]/sitemap/<LETTER>/<LANGUAGE CODE>.html
-RewriteRule sitemap/([^\/]+)/([a-z\-]+)\.htm(l?)$   index.php?action=sitemap&letter=$1&lang=$2 [L,QSA]
+RewriteRule sitemap/([^\/]+)/([a-z\-]+)\.htm(l?)$                   index.php?action=sitemap&letter=$1&lang=$2 [L,QSA]
 
 # PMF Google sitemap
 # * http://[...]/sitemap.xml
 # * http://[...]/sitemap.gz
 # * http://[...]/sitemap.xml.gz
-RewriteRule sitemap.xml$        sitemap.xml.php [L]
-RewriteRule sitemap.gz$         sitemap.xml.php?gz=1 [L]
-RewriteRule sitemap.xml.gz$     sitemap.xml.php?gz=1 [L]
+RewriteRule sitemap.xml$                                            sitemap.xml.php [L]
+RewriteRule sitemap.gz$                                             sitemap.xml.php?gz=1 [L]
+RewriteRule sitemap.xml.gz$                                         sitemap.xml.php?gz=1 [L]
 
 # PMF tags page with page count
 # * http://[...]/tags/<ID>/<PAGE NUMBER>/<HEADER>.htm
-RewriteRule tags/([0-9]+)/([0-9]+)/(.+)\.htm(l?)$   index.php?action=search&tagging_id=$1&seite=$2 [L,QSA]
+RewriteRule tags/([0-9]+)/([0-9]+)/(.+)\.htm(l?)$                   index.php?action=search&tagging_id=$1&seite=$2 [L,QSA]
 
 # PMF tags page
 # * http://[...]/tags/<ID>/<HEADER>.htm
-RewriteRule tags/([0-9]+)/([^\/]+)\.htm(l?)$     index.php?action=search&tagging_id=$1 [L,QSA] 
+RewriteRule tags/([0-9]+)/([^\/]+)\.htm(l?)$                        index.php?action=search&tagging_id=$1 [L,QSA]
 
 # REST API v2.0
 # * http://[...]/api/v2.0/<ACTION>

diff --git a/phpmyfaq/admin/assets/scss/_cards.scss b/phpmyfaq/admin/assets/scss/_cards.scss
@@ -11,7 +11,7 @@
     }
   }
   // Collapsable Card Styling
-  .card-header[data-toggle="collapse"] {
+  .card-header[data-toggle='collapse'] {
     text-decoration: none;
     position: relative;
     padding: 0.75rem 3.25rem 0.75rem 1.25rem;
@@ -34,3 +34,18 @@
     }
   }
 }
+
+.card-columns {
+  @include media-breakpoint-only(xl) {
+    column-count: 4;
+  }
+  @include media-breakpoint-only(lg) {
+    column-count: 3;
+  }
+  @include media-breakpoint-only(md) {
+    column-count: 2;
+  }
+  @include media-breakpoint-only(sm) {
+    column-count: 1;
+  }
+}