Commit graph

607 commits

Author SHA1 Message Date
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
Dane Everitt
fc38b09e1f
Merge branch 'develop' into feature/service-changes 2016-12-14 16:53:53 -05:00
Dane Everitt
c3775f4164 Merge pull request #213 from schrej/patch-1
fix adding current path to new file in filemanager twice
2016-12-14 11:45:45 -05:00
Jakob
d1d473352f fix adding current path to new file in filemanager twice 2016-12-14 17:01:26 +01:00
spaceemotion
a85ac87ae8 Refactor to use more laravel logic and improve compatibility with older PHP versions (#206)
* Fix @param namespaces for PHPDocs in ServerPolicy

* Reduce permission check duplication in ServerPolicy

This introduces a new checkPermission method to reduce code duplication when checking for permissions.

* Simplify logic to list accessible servers for the user

We can directly use the pluck function that laravel collections provide to simplify the logic.

* Fix pagination issue when databases/servers exceed 20

Laravels strips out the currently selected tab (or any GET query for that matter) by default when using pagination. the appends() methods helps with keeping that information.

* Refactor unnecessary array_merge calls

We can just append to the array instead of constantly merging a new copy.

* Fix accessing “API Access” on some versions of PHP

The “new” word is reserved and should not be used as a method name.

http://stackoverflow.com/questions/9575590/why-am-i-getting-an-unexpected-t-new-error-in-php

* Fix revoking API keys on older versions of php (5.6)

“string” was not a valid function argument type yet, so revoking keys results in an error on older installations.

* Fix issues with API due to methods named “list”

“list” is yet another reserved keyword in PHP and messes up older installations of PHP (5.6).
This renames all methods named “list” to “lists”. The API route names are left untouched (e.g. still called “api.admin.users.list”).

* Refactor and shorten some API logic

Used laravel collection methods where applicable to directly transform the values instead of converting back and forth.
This also removes some dead variables that were never used as well as getting rid of a n+1 problem in the Service API (loading service variables afterwards, not during the model creation).

* Return model save status in repositories where applicable

* Fix typo in ServicePolicy#powerStart

* Apply StyleCI corrections
2016-12-12 14:30:57 -05:00
Dane Everitt
c3abb32c0c Merge pull request #204 from schrej/feature/terminal-only-scroll-at-bottom
Only auto-scroll terminal on new output when at the bottom
2016-12-10 19:10:41 -05:00
Jakob Schrettenbrunner
d844c4135c update jquery.terminal to v0.11.23
set new scrollBottomOffset to 5 to hopefully resolve issues with chrome
2016-12-10 13:51:07 +01:00
Jakob Schrettenbrunner
c80c6714a1 add small notification to terminal if new invisible output is available 2016-12-10 00:17:23 +01:00
Jakob Schrettenbrunner
96462a119f disable srcollOnEcho for jquery terminal so it will only scroll at the bottom 2016-12-09 23:50:51 +01:00
Jakob Schrettenbrunner
2a101c0ffd update to jquery terminal v0.11.22 2016-12-09 23:50:22 +01:00
Dane Everitt
0472706807 Update CHANGELOG.md 2016-12-07 19:30:55 -05:00
Dane Everitt
b96e5a23e5 Merge pull request #203 from Pterodactyl/analysis-XNM13L
Apply fixes from StyleCI
2016-12-07 18:36:47 -05:00
Dane Everitt
c1fb0a665f Apply fixes from StyleCI 2016-12-07 22:46:38 +00:00
Dane Everitt
a1d3bbf73d Merge pull request #202 from hammerdawn/FixSubUserView
Fix the subuser edit view, large amount of checkboxes were not properly formatted
2016-12-06 22:35:36 -05:00
Emmet Young
88837f8ac0 Fix the subuser edit view, large amount of checkboxes were not properly formatted causing the first half of the edit screen to be broken.
Correct the value used for the create files permission.
2016-12-07 14:31:44 +11:00
Emmet Young
f687fab9a2 API: ability to search for an allocation based on the assigned server id (#194) 2016-12-04 22:17:35 -05:00
Dane Everitt
e3587966e2
Update changelog 2016-12-02 19:46:27 -05:00
Dane Everitt
9ae716ee42
show container ID for server in panel
Also shows the UID of the user to ease permissions setting

closes #160
2016-12-02 19:35:08 -05:00
Dane Everitt
2ac734d595
Update node config sent over API 2016-12-02 19:12:29 -05:00
Dane Everitt
777e7138e6
Update regex checking for minecraft services
closes #193
2016-12-02 19:06:14 -05:00
Dane Everitt
e39c750563
Remove link that shouldn't exist in the first place. 2016-12-02 18:47:22 -05:00
Dane Everitt
259b220dfc
misc file cleanup 2016-12-02 18:45:08 -05:00
Dane Everitt
3cd0a8337f
Add ability to filter user list 2016-12-02 18:41:52 -05:00
Dane Everitt
ed5b7559ec
Fixes potential for generated password to not meet own validation requirements 2016-12-01 19:16:40 -05:00
Dane Everitt
90460bef43
New button in file manager that triggers the right click menu
Enable’s support on mobile devices and those who cannot right click
(blessed be them)

closes #182
2016-12-01 19:11:48 -05:00
Dane Everitt
1eb1f96e71
Add support for updating the daemon's configuration file automatically. 2016-12-01 18:33:32 -05:00
Dane Everitt
72ad6d5c87
Show file upload size limit when uploading files
Also handle errors better.
2016-12-01 18:32:05 -05:00