1
1
mirror of https://github.com/pterodactyl/panel.git synced 2024-11-25 10:32:31 +01:00
Commit Graph

260 Commits

Author SHA1 Message Date
ViViV_
ac71a56fd1 Adding variable for Server Map Selection [ARK SERVER] (#1230) 2018-07-21 10:40:51 -07:00
Dane Everitt
1df3efdfb0
Fix eggs (#1224) 2018-06-30 18:52:32 -07:00
Dane Everitt
969b16a563 Apply fixes from StyleCI
[ci skip] [skip ci]
2018-06-02 21:32:26 +00:00
stanjg
013dde75ae
Renamed the field and made some improvements 2018-05-31 16:34:35 +02:00
Dane Everitt
e3bbd85f3f
Merge branch 'develop' into pr/1129 2018-05-26 10:34:29 -07:00
Michael (Parker) Parker
52ae3f1062 Parkervcp patch 1 (#1169) 2018-05-23 22:00:57 -07:00
Michael (Parker) Parker
5fddf02247 Update to build spigot (#1168) 2018-05-23 21:58:16 -07:00
Jakob
4d91cc697b no longer lie about spigot being built when no url provided (#1104) 2018-05-23 21:38:39 -07:00
stanjg
86c8ecdcdf
Added the actual logic 2018-05-04 15:02:51 +02:00
Lance Pioch
88fd83d413 Remove unused imports (#1102) 2018-04-08 15:37:27 -05:00
Dane Everitt
68f0811273
Merge branch 'feature/api-integration-testing' into develop 2018-03-26 19:55:28 -05:00
Stan
f1a76ec7fd Add description field to nodes (#1065) 2018-03-26 13:57:24 -05:00
Dane Everitt
bde4d4187f
Merge branch 'develop' into feature/api-integration-testing 2018-03-21 22:25:16 -05:00
William Cody Ardoin
0c07577d3b Allow for 3 decimals, future proof (#999)
The GET_VERSIONS Grep Command will fail with 1.12.2 but will work with 1.12. Added optional check for 3rd decimal place in the MC Version of Forge and future proofed the forge version for Double Numeric SubMinor version.
2018-03-06 23:11:58 -06:00
arajdon
1d623a319b Update Teamspeak 3.1.1 (#1022)
Added "\n\ntouch \/mnt\/server\/.ts3server_license_accepted" and changed version number.
I've tested this changes on my installation. Works fine.

Thats my first PR. Hope thats ok so.
2018-03-06 23:11:05 -06:00
Dane Everitt
e8ea218f20
Add integration test for remaining application api user endpoints 2018-03-04 22:35:57 -06:00
Dane Everitt
9905358bc3
Add integration tests for remote user endpoint 2018-03-04 16:56:05 -06:00
Dane Everitt
e2aa01c9cc
First go at integration tests 2018-03-04 16:30:16 -06:00
Dane Everitt
89db9390df
Fix broken migration rollbacks 2018-03-04 15:21:54 -06:00
Dane Everitt
aaccf38640
Merge branch 'develop' into feature/user-databases 2018-03-02 18:40:38 -06:00
Dane Everitt
d03559080f
Theoretically fix migration issues for api_key table 2018-03-02 18:37:39 -06:00
Dane Everitt
87b96bdfc8
Add core logic to allow for limited databases and allocations 2018-03-01 20:08:27 -06:00
Dane Everitt
aa08498d51
Formatting fix 2018-02-25 16:10:28 -06:00
Dane Everitt
4cfb8941d5
Fix broken users table in database causing validation errors. 2018-02-25 16:08:01 -06:00
Dane Everitt
633bba6d6e
Add support for external_id on servers, closes #975 2018-02-24 11:57:12 -06:00
Dane Everitt
d86c35d80f
Prevent duplicate allocations for servers 2018-02-17 13:53:38 -06:00
Dane Everitt
c3dc376c4c
Fixes #921 2018-02-10 15:58:34 -06:00
William Cody Ardoin
e1d6980c0b Add the MAP Varible (#903)
The MAP Var was added to startup config but never to the user config options.
2018-02-09 18:50:56 -06:00
Dane Everitt
2ec76d283b
Fix bad API behavior 2018-02-04 15:38:38 -06:00
Dane Everitt
2bd691efad
Add database list endpoint, add more resource name magic 2018-01-25 21:26:06 -06:00
Dane Everitt
407120a854
Merge branch 'develop' into feature/api-v1 2018-01-21 17:06:31 -06:00
Dane Everitt
655d2485b5
Fix error causing inability to save variables. 2018-01-21 17:02:25 -06:00
Dane Everitt
c3b9738364
Implement application API Keys 2018-01-18 21:36:15 -06:00
Dane Everitt
d0bce4af97
Apply fixes from StyleCI (#875)
[ci skip] [skip ci]
2018-01-14 12:07:14 -06:00
Dane Everitt
ad3a954256
Rename APIKey to ApiKey 2018-01-14 12:06:15 -06:00
Dane Everitt
7aa540b895
Remove api permissions table 2018-01-14 12:05:18 -06:00
Dane Everitt
8e8147cc43
Apply fixes from StyleCI (#874)
[ci skip] [skip ci]
2018-01-13 16:06:55 -06:00
Dane Everitt
e3df0738da
Change the way API keys are stored and validated; clarify API namespacing
Previously, a single key was used to access the API, this has not changed in terms of what the user sees. However, API keys now use an identifier and token internally. The identifier is the first 16 characters of the key, and the token is the remaining 32. The token is stored encrypted at rest in the database and the identifier is used by the API middleware to grab that record and make a timing attack safe comparison.
2018-01-13 16:06:19 -06:00
Dane Everitt
a31e5875dc
First round of changes to API to support simpler permissions. 2018-01-11 22:49:46 -06:00
Bl4ckSpr4y
d1806d9d29 Fix a typo (#856)
Changed 'custo' to 'custom'.
2018-01-06 20:09:20 -06:00
Dane Everitt
60eb60013c
Update repository base code to be cleaner and make use of PHP 7 features 2018-01-04 22:49:50 -06:00
Dane Everitt
ffc8d4875f
Fix unability to store '-1' in the database properly 2018-01-01 12:32:33 -06:00
Dane Everitt
b9d67459b2
Update to Laravel 5.5 (#814) 2017-12-17 13:07:38 -06:00
Dane Everitt
f9df463d32
Implement a better management interface for Settings (#809) 2017-12-14 21:05:26 -06:00
Franco Sanllehi
75eb506dab Solution for "SteamInternal_ContextInit" (#802)
Add required package to apt install

Solution for: error=/home/container/garrysmod/bin/server_srv.so: undefined symbol: SteamInternal_ContextInit
2017-12-13 21:03:54 -06:00
Dane Everitt
dff2e1ea47
Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop 2017-12-04 18:43:30 -06:00
Dane Everitt
3f6d782ce1
Fix forgotten migration that caused node deletions to not be cascaded to all allocations.
closes #795
2017-12-04 18:43:19 -06:00
Dane Everitt
285485d7b0
Change how API keys are validated (#771) 2017-12-03 14:29:14 -06:00
tenten8401
5d98fc327b
Workaround for improper boolean handling
Since laravel only takes 1, 0, true, false, "1", and "0" instead of allowing "true" and "false".
2017-11-20 09:47:49 -05:00
Dane Everitt
9a588cb6dc
Merge branch 'develop' into develop 2017-11-18 16:29:52 -05:00