Skip to content

Commit 98ed96d

Browse files
Merge branch 'bugfixes' of https://github.com/Sir3lit/panel into bugfixes
2 parents d1a3253 + 857d311 commit 98ed96d

25 files changed

+382
-909
lines changed

config/database.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,17 @@
9696
'client' => 'predis',
9797

9898
'default' => [
99+
'scheme' => env('REDIS_SCHEME', 'tcp'),
100+
'path' => env('REDIS_PATH', '/run/redis/redis.sock'),
99101
'host' => env('REDIS_HOST', 'localhost'),
100102
'password' => env('REDIS_PASSWORD', null),
101103
'port' => env('REDIS_PORT', 6379),
102104
'database' => env('REDIS_DATABASE', 0),
103105
],
104106

105107
'sessions' => [
108+
'scheme' => env('REDIS_SCHEME', 'tcp'),
109+
'path' => env('REDIS_PATH', '/run/redis/redis.sock'),
106110
'host' => env('REDIS_HOST', 'localhost'),
107111
'password' => env('REDIS_PASSWORD', null),
108112
'port' => env('REDIS_PORT', 6379),

database/migrations/2020_04_03_230614_create_backups_table.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function up()
2626
// Take any of the results, most likely "backups" and "backup_logs" and rename them to have a
2727
// suffix so data isn't completely lost, but they're no longer in the way of this migration...
2828
foreach ($results as $result) {
29-
Schema::rename($result['TABLE_NAME'], $result['TABLE_NAME'] . '_plugin_bak');
29+
Schema::rename($result->TABLE_NAME, $result->TABLE_NAME. '_plugin_bak');
3030
}
3131

3232
Schema::create('backups', function (Blueprint $table) {

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@
55
"@fortawesome/free-solid-svg-icons": "^5.9.0",
66
"@fortawesome/react-fontawesome": "0.1.4",
77
"axios": "^0.19.2",
8-
"ayu-ace": "^2.0.4",
9-
"brace": "^0.11.1",
108
"chart.js": "^2.8.0",
9+
"codemirror": "^5.57.0",
1110
"date-fns": "^2.14.0",
1211
"debounce": "^1.2.0",
1312
"deepmerge": "^4.2.2",
@@ -57,6 +56,7 @@
5756
"@babel/preset-typescript": "^7.7.4",
5857
"@babel/runtime": "^7.7.5",
5958
"@types/chart.js": "^2.8.5",
59+
"@types/codemirror": "^0.0.98",
6060
"@types/debounce": "^1.2.0",
6161
"@types/events": "^3.0.0",
6262
"@types/node": "^12.6.9",

public/themes/pterodactyl/js/admin/node/view-servers.js

Lines changed: 0 additions & 113 deletions
This file was deleted.

resources/scripts/components/elements/AceEditor.tsx

Lines changed: 0 additions & 84 deletions
This file was deleted.

0 commit comments

Comments
 (0)