Update beta 14

malago86 · Jan 27, 2021 · d43cc6b · d43cc6b
1 parent 0331b32
commit d43cc6b
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 6,002 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+### 0.2.0-beta.5
+- Added compatibility with Flarum 0.1.0-beta.14
+
 ### 0.2.0-beta.4
 - **Fix** captions were not working when you define them in URL BBCodes.
 - Give the `button` role to empty anchor tags for the sake of semantics.

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # fancyBox Extension for Flarum
 
-[![GPLv3 license](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://github.com/the-turk/flarum-ext-fancybox/blob/master/LICENSE) [![Latest Stable Version](https://img.shields.io/packagist/v/the-turk/flarum-ext-fancybox.svg)](https://packagist.org/packages/the-turk/flarum-ext-fancybox) [![Total Downloads](https://img.shields.io/packagist/dt/the-turk/flarum-ext-fancybox.svg)](https://packagist.org/packages/the-turk/flarum-ext-fancybox)
+[![GPLv3 license](https://img.shields.io/badge/license-GPLv3-blue.svg)](https://github.com/malago/flarum-ext-fancybox/blob/master/LICENSE) [![Latest Stable Version](https://img.shields.io/packagist/v/malago/flarum-ext-fancybox.svg)](https://packagist.org/packages/malago/flarum-ext-fancybox) [![Total Downloads](https://img.shields.io/packagist/dt/malago/flarum-ext-fancybox.svg)](https://packagist.org/packages/malago/flarum-ext-fancybox)
 
-**Disclaimer:** This extension has forked from `squeevee/flarum-ext-fancybox`
+**Disclaimer:** This extension has forked from `the-turk/flarum-ext-fancybox`
 
 ![fancyBox](https://i.ibb.co/kBWDJSL/fancyBox.png)
 
@@ -18,19 +18,19 @@
 
 ## Conflictions
 
-- This package conflicts with `squeevee/flarum-ext-fancybox`, so you need to remove it first.
+- This package conflicts with `squeevee/flarum-ext-fancybox` and `the-turk/flarum-ext-fancybox`, so you need to remove them first.
 - It seems like this package is not compatible with `reflar/recache` (see [#4](https://github.com/squeevee/flarum-ext-fancybox/issues/4)).
 
 ## Installation
 
 ```bash
-composer require the-turk/flarum-ext-fancybox
+composer require malago/flarum-ext-fancybox
 ```
 
 ## Updating
 
 ```bash
-composer update the-turk/flarum-ext-fancybox
+composer update malago/flarum-ext-fancybox
 php flarum cache:clear
 ```
 
@@ -87,6 +87,6 @@ You need to have the `flarum/bbcode` extension in order to add captions. The `ti
 ## Links
 
 - [Flarum Discuss post](https://discuss.flarum.org/d/19535-fancybox-extension-beta)
-- [Source code on GitHub](https://github.com/the-turk/flarum-ext-fancybox)
-- [Changelog](https://github.com/the-turk/flarum-ext-fancybox/blob/master/CHANGELOG.md)
-- [Download via Packagist](https://packagist.org/packages/the-turk/flarum-ext-fancybox)
+- [Source code on GitHub](https://github.com/malago86/flarum-ext-fancybox)
+- [Changelog](https://github.com/malago86/flarum-ext-fancybox/blob/master/CHANGELOG.md)
+- [Download via Packagist](https://packagist.org/packages/malago/flarum-ext-fancybox)
diff --git a/composer.json b/composer.json
@@ -1,41 +1,49 @@
-{
-    "name": "the-turk/flarum-ext-fancybox",
-    "description": "Image formatting and lightbox modal using fancyBox (forked from squeevee's).",
-    "type": "flarum-extension",
-    "require": {
-        "flarum/core": "^0.1.0-beta.8"
-    },
-    "conflict": {
-      "squeevee/flarum-ext-fancybox": ">=0.1-beta"
-    },
-    "license": "GPL-3.0-or-later",
-    "authors": [
-        {
-            "name": "Ellie Hawk",
-            "email": "squeevee@yahoo.com"
-        },
-        {
-            "name": "Hasan Özbey",
-            "email": "hasanoozbey@gmail.com"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/the-turk/flarum-ext-fancybox/issues",
-        "source": "https://github.com/the-turk/flarum-ext-fancybox"
-    },
-    "extra": {
-        "flarum-extension": {
-            "title": "FancyBox",
-            "icon": {
-                "name": "far fa-image",
-                "backgroundColor": "#b72a2a",
-                "color": "#fff"
-            }
-        }
-    },
-    "autoload": {
-        "psr-4": {
-            "TheTurk\\FancyBox\\": "src/"
-        }
-    }
-}
+{
+  "name": "malago/flarum-ext-fancybox",
+  "description": "Image formatting and lightbox modal using fancyBox (original from the-turk and squeevee).",
+  "keywords": [
+    "flarum"
+  ],
+  "conflict":
+    {
+      "the-turk/flarum-ext-fancybox": ">=0.1-beta",
+      "squeevee/flarum-ext-fancybox": ">=0.1-beta"
+    },
+  "type": "flarum-extension",
+  "license": "GPL-3.0-or-later",
+  "require": {
+    "flarum/core": "^0.1.0-beta.14"
+  },
+  "authors": [
+        {
+            "name": "Ellie Hawk",
+            "email": "squeevee@yahoo.com"
+        },
+        {
+            "name": "Hasan Özbey",
+            "email": "hasanoozbey@gmail.com"
+        }
+    ],
+  "autoload": {
+    "psr-4": {
+      "Malago\\FancyBox\\": "src/"
+    }
+  },
+  "extra": {
+    "flarum-extension": {
+      "title": "FancyBox",
+      "icon": {
+            "name": "far fa-image",
+            "backgroundColor": "#b72a2a",
+            "color": "#fff"
+        }
+    },
+    "flagrow": {
+      "discuss": "https://discuss.flarum.org/d/19535-fancybox-extension-beta"
+    },
+    "support": {
+        "issues": "https://github.com/malago86/flarum-ext-fancybox/issues",
+        "source": "https://github.com/malago86/flarum-ext-fancybox"
+    }
+  }
+}
diff --git a/extend.php b/extend.php
@@ -14,7 +14,7 @@
  *  GNU General Public License for more details.
  */
 
-namespace TheTurk\FancyBox;
+namespace Malago\FancyBox;
 
 use Flarum\Extend;
 use Illuminate\Contracts\Events\Dispatcher;