wip #3699 @0.5

diff --git a/composer.json b/composer.json
index e94fc787e459165d83ceba6c87a539e3fe8af05c..d62e1b829f90880bb1737ccd52897e890f0cc665 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -39,7 +39,7 @@
         "lavary/laravel-menu": "^1.7",
         "graham-campbell/markdown": "^12.0",
         "barryvdh/laravel-debugbar": "^3.3",
-        "league/commonmark-ext-autolink": "^1.0",
+        "league/commonmark": "^1.4",
         "cviebrock/laravel-elasticsearch": "^4.2",
         "spatie/laravel-honeypot": "^2.2",
         "chrisjean/php-ico": "^1.0",

diff --git a/src/app/Magic/Models/CubistMagicAuthenticatable.php b/src/app/Magic/Models/CubistMagicAuthenticatable.php
index 51036a68147907d10a3d9c21570c86807c0c6128..9b528a94ac8e5a1cf95fb75eee25c17a2652bd94 100644 (file)
--- a/src/app/Magic/Models/CubistMagicAuthenticatable.php
+++ b/src/app/Magic/Models/CubistMagicAuthenticatable.php
@@ -58,7 +58,7 @@ class CubistMagicAuthenticatable extends CubistMagicAbstractModel
             'type' => 'checkbox',
             'tab' => 'Login']);
 
-        $this->addField(['name' => 'permissions',
+        $this->addField(['name' => 'roles_and_permissions',
             'label' => '',
             'type' => 'RolesPermissions',
             'tab' => 'Roles & Permissions']);