Merge pull request #92 from gomzyakov/patch-1

Fix Flarum logo in README.md

.nginx.conf

@@ -5,10 +5,12 @@ location / {
 
 # Uncomment the following lines if you are not using a `public` directory
 # to prevent sensitive resources from being exposed.
+# <!-- BEGIN EXPOSED RESOURCES PROTECTION -->
 # location ~* ^/(\.git|composer\.(json|lock)|auth\.json|config\.php|flarum|storage|vendor) {
 #   deny all;
 #   return 404;
 # }
+# <!-- END EXPOSED RESOURCES PROTECTION -->
 
 # The following directives are based on best practices from H5BP Nginx Server Configs
 # https://github.com/h5bp/server-configs-nginx

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.8.0](https://github.com/flarum/flarum/compare/v1.7.0...v1.8.0)
+
+No changes.
+
+## [1.7.0](https://github.com/flarum/flarum/compare/v1.6.0...v1.7.0)
+
+No changes.
+
+## [1.6.0](https://github.com/flarum/flarum/compare/v1.5.0...v1.6.0)
+
+No changes.
+
 ## [1.5.0](https://github.com/flarum/flarum/compare/v1.4.0...v1.5.0)
 
 ### Changed

README.md

@@ -1,5 +1,5 @@
 <p align="center">
-<a href="https://flarum.org/"><img src="https://flarum.org/assets/img/logo.png"></a>
+<a href="https://flarum.org/"><img src="https://flarum.org/images/flarum.svg"></a>
 </p>
 
 <p align="center">

composer.json

@@ -21,7 +21,7 @@
         "docs": "https://docs.flarum.org/"
     },
     "require": {
-        "flarum/core": "^1.5",
+        "flarum/core": "^1.8",
         "flarum/approval": "*",
         "flarum/bbcode": "*",
         "flarum/emoji": "*",

public/.htaccess

@@ -6,6 +6,7 @@
 
   # Uncomment the following lines if you are not using a `public` directory
   # to prevent sensitive resources from being exposed.
+  # <!-- BEGIN EXPOSED RESOURCES PROTECTION -->
   # RewriteRule /\.git / [F,L]
   # RewriteRule ^auth\.json$ / [F,L]
   # RewriteRule ^composer\.(lock|json)$ / [F,L]
@@ -13,6 +14,7 @@
   # RewriteRule ^flarum$ / [F,L]
   # RewriteRule ^storage/(.*)?$ / [F,L]
   # RewriteRule ^vendor/(.*)?$ / [F,L]
+  # <!-- END EXPOSED RESOURCES PROTECTION -->
 
   # Pass requests that don't refer directly to files in the filesystem to index.php
   RewriteCond %{REQUEST_FILENAME} !-f