Merge branch 'develop' into feature/vuejs

config/app.php

@@ -9,7 +9,7 @@ return [
     | change this value if you are not maintaining your own internal versions.
     */
 
-    'version' => '0.7.10',
+    'version' => 'canary',
 
     /*
     |--------------------------------------------------------------------------
@@ -166,6 +166,7 @@ return [
         Illuminate\Redis\RedisServiceProvider::class,
         Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
         Illuminate\Session\SessionServiceProvider::class,
+        Illuminate\Translation\TranslationServiceProvider::class,
         Illuminate\Validation\ValidationServiceProvider::class,
         Illuminate\View\ViewServiceProvider::class,
 
@@ -179,7 +180,6 @@ return [
         Pterodactyl\Providers\HashidsServiceProvider::class,
         Pterodactyl\Providers\RouteServiceProvider::class,
         Pterodactyl\Providers\MacroServiceProvider::class,
-        Pterodactyl\Providers\PhraseAppTranslationProvider::class,
         Pterodactyl\Providers\RepositoryServiceProvider::class,
         Pterodactyl\Providers\ViewComposerServiceProvider::class,
 

config/pterodactyl.php

@@ -153,23 +153,10 @@ return [
 
     /*
     |--------------------------------------------------------------------------
-    | Language Editor
+    | Client Features
     |--------------------------------------------------------------------------
     |
-    | Set `PHRASE_IN_CONTEXT` to true to enable the PhaseApp in-context editor
-    | on this site which allows you to translate the panel, from the panel.
-    */
-    'lang' => [
-        'in_context' => env('PHRASE_IN_CONTEXT', false),
-    ],
-
-    /*
-    |--------------------------------------------------------------------------
-    | Language Editor
-    |--------------------------------------------------------------------------
-    |
-    | Set `PHRASE_IN_CONTEXT` to true to enable the PhaseApp in-context editor
-    | on this site which allows you to translate the panel, from the panel.
+    | Allow clients to create their own databases.
     */
     'client_features' => [
         'databases' => [
@@ -199,6 +186,7 @@ return [
             'text/plain',
             'text/x-perl',
             'text/x-shellscript',
+            'text/x-python',
         ],
     ],
 

config/queue.php

@@ -14,7 +14,7 @@ return [
     |
     */
 
-    'default' => env('QUEUE_DRIVER', 'database'),
+    'default' => env('QUEUE_CONNECTION', env('QUEUE_DRIVER', 'database')),
 
     /*
     |--------------------------------------------------------------------------