fix bug hotkey

orchidsoftware · Oct 1, 2017 · f1293ef · f1293ef
1 parent 789eda4
commit f1293ef
Show file tree

Hide file tree

Showing 114 changed files with 17,652 additions and 1,570 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -1,2 +1,4 @@
 exclude_paths:
-- "public/**/*"
+- "resources/assets/dist/"
+- "resources/lang/"
+- "resources/stubs/"
diff --git a/.gitattributes b/.gitattributes
@@ -9,3 +9,6 @@
 /.scrutinizer.yml   export-ignore
 /tests              export-ignore
 /docs               export-ignore
+
+*.php linguist-language=PHP
+*.js linguist-language=PHP
diff --git a/.gitignore b/.gitignore
diff --git a/.styleci.yml b/.styleci.yml
@@ -0,0 +1 @@
+preset: psr2
diff --git a/.travis.yml b/.travis.yml
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,20 @@
+# 1.1.4 - 1.1.5 (12.09.2017)
+- Added events for role assignment and deletion
+
+# 1.1.2 (06.09.2017)
+- Fix bug create user
+- Removing unused methods
+- Move google analytics to widget
+
+# 1.1.1
+- Support Laravel 5.5
+
+# 1.1 (31.08.2017)
+- fix config display auth
+- Added global permission for superadmin
+- Summernote supports "media"
+- Shortcut (ctrl + s) save form
+
 # 1.0 (04.08.2017)
 
 - Added menu badges & notifications

diff --git a/composer.json b/composer.json
@@ -17,7 +17,7 @@
   ],
   "require": {
     "php": ">=7.0",
-    "laravel/framework": "5.4.*",
+    "laravel/framework": "5.5.*",
     "watson/active": "^2.0",
     "orchid/defender": "^1.0",
     "orchid/alert": "^1.0",
@@ -41,18 +41,15 @@
   "extra": {
     "laravel": {
       "providers": [
-        "Orchid\\Platfrorm\\Providers\\FoundationServiceProvider"
+        "Orchid\\Platform\\Providers\\FoundationServiceProvider"
       ],
       "aliases": {
-        "Dashboard": "Orchid\\Platfrorm\\Facades\\Dashboard"
+        "Dashboard": "Orchid\\Platform\\Facades\\Dashboard"
       }
     }
   },
   "suggest": {
     "orchid/cms": "Laravel package CMS",
-    "orchid/remote": "Admin Panel for Microservices",
     "orchid/socket": "Laravel library for asynchronously serving WebSockets."
-  },
-  "minimum-stability": "dev",
-  "prefer-stable": true
+  }
 }
diff --git a/config/platform.php b/config/platform.php
@@ -59,7 +59,7 @@
     */
 
     'main_widgets' => [
-
+        Orchid\Platform\Http\Widgets\GoogleAnalyticsWidget::class,
     ],
 
 ];
diff --git a/package.json b/package.json
@@ -27,7 +27,6 @@
     "select2": "^4.0.3",
     "simple-line-icons": "^2.4.1",
     "summernote": "^0.8.3",
-    "tinymce": "^4.5.7",
     "vue": "^2.1.10",
     "vue-resource": "^1.2.0"
   },

diff --git a/public/css/orchid.css b/public/css/orchid.css
diff --git a/public/fonts/summernote.eot b/public/fonts/summernote.eot
diff --git a/public/fonts/summernote.ttf b/public/fonts/summernote.ttf
diff --git a/public/fonts/summernote.woff b/public/fonts/summernote.woff
diff --git a/public/fonts/vendor/summernote/src/icons/dist/summernote.eot b/public/fonts/vendor/summernote/src/icons/dist/summernote.eot
diff --git a/public/fonts/vendor/summernote/src/icons/dist/summernote.ttf b/public/fonts/vendor/summernote/src/icons/dist/summernote.ttf
diff --git a/public/fonts/vendor/summernote/src/icons/dist/summernote.woff b/public/fonts/vendor/summernote/src/icons/dist/summernote.woff
diff --git a/public/js/orchid.js b/public/js/orchid.js
diff --git a/public/summernote/font/summernote.eot b/public/summernote/font/summernote.eot
diff --git a/public/summernote/font/summernote.ttf b/public/summernote/font/summernote.ttf
diff --git a/public/summernote/font/summernote.woff b/public/summernote/font/summernote.woff
diff --git a/public/summernote/lang/summernote-ar-AR.min.js b/public/summernote/lang/summernote-ar-AR.min.js
diff --git a/public/summernote/lang/summernote-bg-BG.min.js b/public/summernote/lang/summernote-bg-BG.min.js
diff --git a/public/summernote/lang/summernote-ca-ES.min.js b/public/summernote/lang/summernote-ca-ES.min.js
diff --git a/public/summernote/lang/summernote-cs-CZ.min.js b/public/summernote/lang/summernote-cs-CZ.min.js
diff --git a/public/summernote/lang/summernote-da-DK.min.js b/public/summernote/lang/summernote-da-DK.min.js
diff --git a/public/summernote/lang/summernote-de-DE.js b/public/summernote/lang/summernote-de-DE.js
@@ -54,7 +54,7 @@
       },
       style: {
         style: 'Stil',
-        p: 'p',
+        p: 'Normal',
         blockquote: 'Zitat',
         pre: 'Quellcode',
         h1: 'Überschrift 1',
-Original file line number
+Diff line change
@@ Expand Up / @@ -59,7 +59,7 @@ @@
         */
         'main_widgets' => [
+            Orchid\Platform\Http\Widgets\GoogleAnalyticsWidget::class,
         ],
     ];