Dane Everitt
3a4d3fb2bf
Merge pull request #249 from Pterodactyl/analysis-87AogE
...
Apply fixes from StyleCI
2017-01-12 15:48:26 -05:00
Dane Everitt
a5aa089d66
Apply fixes from StyleCI
2017-01-12 20:48:12 +00:00
Dane Everitt
e91362eee6
Update user controller
2017-01-12 15:40:24 -05:00
Dane Everitt
f292080483
Should close #244
...
What a peculiar bug. Also modifies code to try and return the correct
status code, as well as return JSON based errors on any request that
Laravel thinks should have a JSON based response.
2017-01-12 13:44:23 -05:00
Dane Everitt
8323477d0c
Better display of configuration button for services
2017-01-12 13:38:59 -05:00
Dane Everitt
6bd9663f59
Merge branch 'develop' into feature/service-changes
2017-01-12 13:15:37 -05:00
Dane Everitt
c09170a7a7
Merge pull request #245 from schrej/feature/wings-auto-setup
...
Configuration retrival for wings via token
2017-01-10 17:58:31 -05:00
Jakob Schrettenbrunner
9f2ca17ea4
replace manual json headers with laravel response()->json()
...
better Carbon dependency
rename admin.nodes.configuration-token route
style fixes
2017-01-08 15:21:02 +01:00
Jakob Schrettenbrunner
67bb8fe230
add protocol to the generated node configuration command
2017-01-07 22:16:23 +01:00
Jakob Schrettenbrunner
f70b33d69c
one more styleci fix. don’t be that picky! 🙈
2017-01-07 18:40:55 +01:00
Jakob Schrettenbrunner
a661f71974
fix styleci issues
2017-01-07 18:39:41 +01:00
Jakob Schrettenbrunner
cc0d54e906
improve wording on token explanation on node configuration tab
2017-01-07 18:33:37 +01:00
Jakob Schrettenbrunner
a1568e5acb
add button to generate token to node configuration tab
...
add info message after node creation about token generation
2017-01-07 18:27:19 +01:00
Jakob Schrettenbrunner
52a395ac9a
fix forgotten rename of NodeConfigurationToken
2017-01-07 18:26:45 +01:00
Jakob Schrettenbrunner
e1e159b7de
add ability to generate a token to retrieve the config for a specific node
2017-01-07 18:10:11 +01:00
Jakob Schrettenbrunner
24bab6de17
use getConfigurationAsJson in the admin/nodes/view view
2017-01-07 18:09:04 +01:00
Jakob Schrettenbrunner
ef1fa4c4e6
add method to get config as json to node model
2017-01-07 18:06:09 +01:00
Dane Everitt
2dbacafabb
Merge pull request #243 from schrej/patch-1
...
add .editorconfig
2017-01-06 19:07:33 -05:00
Jakob
b662f99898
add .editorconfig
2017-01-07 01:05:51 +01:00
Dane Everitt
0a23aa1a68
Merge pull request #238 from Pterodactyl/analysis-XpONKL
...
Apply fixes from StyleCI
2017-01-03 17:46:46 -05:00
Dane Everitt
d9de884de3
Apply fixes from StyleCI
2017-01-03 22:46:30 +00:00
Dane Everitt
673b9e2d7c
Reflect API update
2017-01-03 17:45:51 -05:00
Dane Everitt
c1bf757623
Fix service option name being set wrongly after adding a new variable. closes #208
2017-01-03 17:44:48 -05:00
Dane Everitt
2e33b9c4e4
Revert "Select the whole field when renaming a file."
...
This reverts commit b8b0e0bdf9
2017-01-03 17:39:28 -05:00
Dane Everitt
b8b0e0bdf9
Select the whole field when renaming a file.
2017-01-03 17:37:43 -05:00
Dane Everitt
130aa6cc8a
Transpile ES6 to ES5 for filemanager. Closes #224
2017-01-03 17:32:23 -05:00
Dane Everitt
aa6e733ba5
Switch filemanager and EULA check to use pure Javascript methods
...
Removes the need for the javascript to be parsed by Blade template
engine by using a defined javascript variable with the values that are
necessary for checking everything and passing the correct values.
This does make it so that if a user does not have permission to do
something they could theoretically make the option show up in the
context menu, however when they click it, it will simply return an
error by the daemon.
2017-01-03 16:47:33 -05:00
Dane Everitt
e282f774af
Update changelog
2017-01-03 16:45:52 -05:00
Dane Everitt
759ebd3ad0
Fixes misnamed tag for Sponge servers. closes #237
2017-01-03 15:06:40 -05:00
Dane Everitt
06bdadb92f
Add missing language string in English
2017-01-03 15:02:51 -05:00
Dane Everitt
39731f99da
Merge pull request #226 from hammerdawn/APICHANGE
...
Allow listing a user by both ID and email. Useful for checking if a u…
2017-01-02 22:00:45 -05:00
Emmet Young
3f5bf099ae
Use DaneEveritt's shortened query call.
2017-01-03 13:40:35 +11:00
Dane Everitt
f94e31db53
Merge pull request #229 from Pterodactyl/analysis-zGbJor
...
Sometimes its quicker to let StyleCI do this for me.
2016-12-30 17:19:46 -05:00
Dane Everitt
920ed824d6
Apply fixes from StyleCI
2016-12-30 22:19:23 +00:00
Dane Everitt
6331a29962
Merge pull request #228 from Pterodactyl/analysis-XWDo3P
...
Apply fixes from StyleCI
2016-12-30 17:18:54 -05:00
Dane Everitt
a1dff5cda0
Push updated languages
2016-12-30 17:17:36 -05:00
Dane Everitt
fb182ffb4a
Apply fixes from StyleCI
2016-12-30 22:00:06 +00:00
Dane Everitt
0afa568095
Address two bugs in subuser system.
...
1.) Prevents adding the owner of a server as a subuser which could
potentially break things.
2.) Prevents adding duplicate subusers for a server.
2016-12-30 16:28:43 -05:00
Dane Everitt
ef8e0b5a74
Update changelog 📝
2016-12-30 16:04:24 -05:00
Dane Everitt
7848f63e05
Fix error thrown on 0 values for variables, closes #223
2016-12-30 16:00:51 -05:00
Dane Everitt
43786b1d2a
Block addition of more than 2000 ports at once, closes #219
2016-12-30 15:50:37 -05:00
Dane Everitt
9231171fa9
Update link to docker reference for BlockIO
2016-12-30 15:46:26 -05:00
Dane Everitt
9a494d8245
Adjust server name requirements, closes #205
2016-12-30 15:46:10 -05:00
Emmet Young
b5d3417167
Allow listing a user by both ID and email. Useful for checking if a user exists by its email.
2016-12-29 22:56:45 +11:00
Dane Everitt
a49dee2416
Add base implementation of service retrieval. 🏇
...
There is currently no authentication middleware on this route.
2016-12-14 18:54:43 -05:00
Dane Everitt
51ce4d4d47
Update existing configs
2016-12-14 18:54:02 -05:00
Dane Everitt
fd360f6475
Fix data pack assignment
2016-12-14 17:17:16 -05:00
Dane Everitt
84f87680d8
Add editorconfig
2016-12-14 17:07:50 -05:00
Dane Everitt
6d59824d00
Merge pull request #214 from Pterodactyl/analysis-zYo1bG
...
Apply fixes from StyleCI
2016-12-14 16:56:41 -05:00
Dane Everitt
efda0dd009
Apply fixes from StyleCI
2016-12-14 21:56:25 +00:00
