Commit graph

2150 commits

Author SHA1 Message Date
Dane Everitt
404da5a6a3
Merge pull request #1465 from f0rb1d/feature/zhimprove
Hugely improved Simplified Chinese translation quality. (Feature/zhimprove)
2019-02-02 13:36:54 -08:00
Dane Everitt
7c0dce5900
Update CHANGELOG.md 2019-02-02 13:36:39 -08:00
Dane Everitt
c33e9fc4f5
Merge branch 'develop' into feature/zhimprove 2019-02-02 13:36:22 -08:00
Dane Everitt
3d9bb53dd0
Merge pull request #1451 from MarkL4YG/feature/issue-1450
Fix an edge case where files could not be edited from the file manager
2019-02-02 13:35:57 -08:00
Dane Everitt
2e4d1aa262
Merge branch 'develop' into feature/issue-1450 2019-02-02 13:35:51 -08:00
Dane Everitt
90f7ecffb8
Merge pull request #1452 from Sir3lit/patch-7
Update CHANGELOG.md
2019-02-02 13:35:09 -08:00
F0rb1d
d281cfded5 Merge fix. 2019-02-03 00:34:35 +08:00
F0rb1d
c1bc895248 Modified CHANGELOG. 2019-02-03 00:13:59 +08:00
F0rb1d
44c2f74c21 Hugely improved Simplified Chinese translation quality. 2019-02-03 00:10:51 +08:00
F0rb1d
851f292ee3 Hugely improved Simplified Chinese translation quality. 2019-02-02 23:47:11 +08:00
Oreo Oreoniv
e3ebef96d3
Merge branch 'develop' into develop 2019-02-02 11:14:29 +03:00
Dane Everitt
f7399f8819
Merge pull request #1454 from pterodactyl/analysis-qrbbNx
Apply fixes from StyleCI
2019-01-29 09:23:31 -08:00
Lance Pioch
db937af616 Apply fixes from StyleCI
[ci skip] [skip ci]
2019-01-26 23:26:15 +00:00
Sir3lit
3ae2ecde83
Update CHANGELOG.md
Added Pull - 1411 (Fixed checking of language changes)
Added Pull - 1419 (Fixed Spigot egg not building versions other than `latest`.)
Added Pull - 1449 (Fixed the Forge egg install script.)
2019-01-26 00:38:03 -05:00
Magnus Leßmann
789d8308f1
Update changelog 2019-01-24 09:31:39 +01:00
Magnus Leßmann
5a23fdae6e
Fix missing encoding of file editing urls 2019-01-24 09:29:35 +01:00
Dane Everitt
899e6c3837
Merge pull request #1449 from parkervcp/breakfix/forge_install_image
Fix Forge Install Container
2019-01-23 09:44:14 -08:00
Michael (Parker) Parker
33dc84f951 Fix Forge Install Container
frolvlad's oraclejdk image died and the stock openjdk image works fine for this,
2019-01-22 23:50:38 -05:00
Oreo Oreoniv
186418ee50
Fixed skip_scripts in startup the server 2019-01-18 08:02:09 +03:00
Oreo Oreoniv
27882467e5
Fixed skip_scripts in creating the server 2019-01-18 08:00:35 +03:00
Dane Everitt
14838db8d3
Merge pull request #1432 from smcfreak/patch-1
Added missing option for auto-save interval
2019-01-03 09:54:28 -08:00
Cristi
7b7e2086b8
Added missing option for auto-save interval
Also I'm not sure why the default port was set to 8401.
The default port for RCON is 28016.
2019-01-01 11:56:23 +01:00
Dane Everitt
79060745df
Merge pull request #1411 from zKoz210/patch-3
Fixed checking of the language change
2018-12-19 17:46:21 -08:00
Dane Everitt
7826078ebb
Merge pull request #1408 from zKoz210/patch-2
Fixed the class name in the constructor
2018-12-19 08:47:27 -08:00
Dane Everitt
6a74eeb05c
Merge pull request #1419 from Sir3lit/patch-6
Fixed grep regex
2018-12-19 08:46:10 -08:00
Sir3lit
cf8c5c6604
Use https
Changed URL's to use https, as forge's website doesn't redirect to https
2018-12-18 03:44:52 -05:00
Sir3lit
3f19d2ba7b
Fixed grep regex
regex had an extra bracket `]` causing it to not match anything.
2018-12-18 03:36:41 -05:00
Oreo Oreoniv
c1fb38fb5e
Cleanup 2018-12-09 14:40:03 +03:00
Oreo Oreoniv
a4a758e202
Fixed StyleCI 2018-12-09 14:29:43 +03:00
Oreo Oreoniv
fb51659a04
Fixed checking of the language change 2018-12-09 14:27:30 +03:00
Oreo Oreoniv
0b37c74875
Fixed the class name in the constructor 2018-12-08 15:05:58 +03:00
Dane Everitt
f6d0147419
Merge pull request #1405 from zKoz210/patch-1
Fixed PHPUnit test (Coverage) #1393
2018-12-04 16:25:05 -08:00
Oreo Oreoniv
04326a0786
Fixed PHPUnit test (Coverage) #1393 2018-12-03 21:09:25 +03:00
Dane Everitt
8385ba48b3
Merge pull request #1401 from fabm3n/patch-1
Updated TS3 Server version
2018-12-02 14:15:28 -08:00
Fabian
c35cdafc55
Updated TS3 Server version
Just updated to the latest TS3 Server version
2018-12-02 23:13:11 +01:00
Dane Everitt
1a8592b3b3
Add support for python files, closes #1395 2018-12-02 13:52:47 -08:00
Dane Everitt
3dd2e50e4b
Update CHANGELOG.md 2018-12-02 13:42:38 -08:00
Dane Everitt
492ec2c6c2
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2018-12-02 13:40:19 -08:00
Dane Everitt
7c73f21b30
Fix Node daemon secret not being reset, closes #1390 2018-12-02 13:40:12 -08:00
Dane Everitt
6e4cfe8f98
Ensure that a Node's daemon secret can be properly reset 2018-12-02 13:38:59 -08:00
Dane Everitt
4d8760f335
Merge pull request #1393 from matthewpi/patch-1
Fix API method return, namespace issue
2018-12-02 13:01:37 -08:00
Dane Everitt
d6e9770937
Merge branch 'develop' into patch-1 2018-12-02 13:01:31 -08:00
Dane Everitt
24dfdf27ef
Merge pull request #1397 from zKoz210/develop
Upgrade Laravel to 5.7
2018-12-02 13:00:58 -08:00
Dane Everitt
c543b3caa9
Update CHANGELOG.md 2018-12-02 13:00:09 -08:00
Dane Everitt
fd1859d91d
Use more of a composer setup 2018-12-02 12:59:34 -08:00
Dane Everitt
d519be0109
Use old environment variable fallback to avoid BC 2018-12-02 12:46:15 -08:00
Oreo Oreoniv
adcf0c9fee
Fixed Failed event
Thank you very much Laravel for not pointing out the changes to be made when upgrading from 5.6 to 5.7
2018-11-28 23:24:43 +03:00
zKoz210
2d7e889bcc Fixed StyleCI 2018-11-26 03:28:14 +03:00
zKoz210
1416cec7c4 Create .gitignore 2018-11-26 03:25:55 +03:00
zKoz210
0b4b1a3443 Initial update 2018-11-26 03:25:18 +03:00