Skip to content

Commit 1f64086

Browse files
committed
Merge branch 'develop' of github.com:pterodactyl/panel into develop
2 parents 6b16b9b + 3898e40 commit 1f64086

File tree

3 files changed

+24
-7
lines changed

3 files changed

+24
-7
lines changed

database/Seeders/eggs/voice-servers/egg-mumble-server.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
{
22
"_comment": "DO NOT EDIT: FILE GENERATED AUTOMATICALLY BY PTERODACTYL PANEL - PTERODACTYL.IO",
33
"meta": {
4-
"version": "PTDL_v1"
4+
"version": "PTDL_v1",
5+
"update_url": null
56
},
6-
"exported_at": "2020-10-25T22:34:06+00:00",
7+
"exported_at": "2021-05-06T23:35:46+03:00",
78
"name": "Mumble Server",
89
"author": "support@pterodactyl.io",
910
"description": "Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming.",
10-
"image": "quay.io\/pterodactyl\/core:glibc",
11+
"features": null,
12+
"images": [
13+
"quay.io\/pterodactyl\/core:glibc"
14+
],
15+
"file_denylist": [],
1116
"startup": ".\/murmur.x86 -fg",
1217
"config": {
1318
"files": "{\"murmur.ini\":{\"parser\": \"ini\", \"find\":{\"logfile\": \"murmur.log\", \"port\": \"{{server.build.default.port}}\", \"host\": \"0.0.0.0\", \"users\": \"{{server.build.env.MAX_USERS}}\"}}}",
@@ -39,7 +44,7 @@
3944
"default_value": "latest",
4045
"user_viewable": true,
4146
"user_editable": true,
42-
"rules": "required|regex:\/^([0-9_\\.-]{5,8})$\/"
47+
"rules": "required|string"
4348
}
4449
]
4550
}

database/Seeders/eggs/voice-servers/egg-teamspeak3-server.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
"version": "PTDL_v1",
55
"update_url": null
66
},
7-
"exported_at": "2021-01-12T15:44:41+01:00",
7+
"exported_at": "2021-05-06T23:38:28+03:00",
88
"name": "Teamspeak3 Server",
99
"author": "support@pterodactyl.io",
1010
"description": "VoIP software designed with security in mind, featuring crystal clear voice quality, endless customization options, and scalabilty up to thousands of simultaneous users.",
1111
"features": null,
1212
"images": [
1313
"quay.io\/parkervcp\/pterodactyl-images:base_debian"
1414
],
15+
"file_denylist": [],
1516
"startup": ".\/ts3server default_voice_port={{SERVER_PORT}} query_port={{QUERY_PORT}} filetransfer_ip=0.0.0.0 filetransfer_port={{FILE_TRANSFER}} license_accepted=1",
1617
"config": {
1718
"files": "{}",
@@ -21,7 +22,7 @@
2122
},
2223
"scripts": {
2324
"installation": {
24-
"script": "#!\/bin\/bash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y tar curl jq bzip2\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n TS_VERSION=$(curl -sSL https:\/\/teamspeak.com\/versions\/server.json | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting files from http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\" \r\ncurl -L http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar -xvj --strip-components=1\r\n\r\nrm teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2",
25+
"script": "#!\/bin\/bash\r\n# TS3 Installation Script\r\n#\r\n# Server Files: \/mnt\/server\r\napt update\r\napt install -y tar curl jq bzip2\r\n\r\nif [ -z ${TS_VERSION} ] || [ ${TS_VERSION} == latest ]; then\r\n TS_VERSION=$(curl -sSL https:\/\/teamspeak.com\/versions\/server.json | jq -r '.linux.x86_64.version')\r\nfi\r\n\r\ncd \/mnt\/server\r\n\r\necho -e \"getting files from http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2\" \r\ncurl -L http:\/\/files.teamspeak-services.com\/releases\/server\/${TS_VERSION}\/teamspeak3-server_linux_amd64-${TS_VERSION}.tar.bz2 | tar -xvj --strip-components=1",
2526
"container": "debian:buster-slim",
2627
"entrypoint": "bash"
2728
}

resources/scripts/components/server/files/MassActionsBar.tsx

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,18 @@ const MassActionsBar = () => {
7474
onConfirmed={onClickConfirmDeletion}
7575
onModalDismissed={() => setShowConfirm(false)}
7676
>
77-
Deleting files is a permanent operation, you cannot undo this action.
77+
Are you sure you want to delete {selectedFiles.length} file(s)?
78+
<br/>
79+
Deleting the file(s) listed below is a permanent operation, you cannot undo this action.
80+
<br/>
81+
<code>
82+
{ selectedFiles.slice(0, 15).map(file => (
83+
<li key={file}>{file}<br/></li>))
84+
}
85+
{ selectedFiles.length > 15 &&
86+
<li> + {selectedFiles.length - 15} other(s) </li>
87+
}
88+
</code>
7889
</ConfirmationModal>
7990
{showMove &&
8091
<RenameFileModal

0 commit comments

Comments
 (0)