Dane Everitt
8d24e5f168
Merge branch 'develop' into feature/option-scripts
...
# Conflicts:
# app/Http/Routes/AdminRoutes.php
# app/Http/Routes/DaemonRoutes.php
# app/Models/ServiceOption.php
2017-04-20 17:08:08 -04:00
Dane Everitt
33262cf34c
Set correct console frequency
2017-04-17 21:54:26 -04:00
Dane Everitt
e4ef8caf2d
Fix model not found error when editing an existing subuser.
2017-04-17 21:47:11 -04:00
Dane Everitt
619d3fe480
Fix autodeploy time checking.
2017-04-17 21:37:45 -04:00
Dane Everitt
3acc7b338b
Allow deleting default allocation and setting new default at the same time.
2017-04-17 21:07:37 -04:00
Dane Everitt
de923bbb83
Fix server deletion logic, and clean up suspend/unsuspend operations
2017-04-17 20:16:05 -04:00
kasper Franz
f5810f068a
change server to server_id since that is the new name
2017-04-16 13:37:40 +02:00
Dane Everitt
f58858206e
Add console popout option.
...
Popout: https://s3.kelp.in/IrTyE.png
Menu: https://s3.kelp.in/JYwlC.png
Menu Hover: https://s3.kelp.in/cPtSf.png
2017-04-15 18:23:29 -04:00
Dane Everitt
1a87943f07
Fix missing CommandRepository statement
2017-04-15 13:54:34 -04:00
Dane Everitt
7f1a97184b
Un-butcher task system.
2017-04-15 13:52:43 -04:00
Dane Everitt
0fe9a4566e
Improve server and user model code to accept a specific user
2017-04-15 12:48:47 -04:00
Dane Everitt
2770e6d1b4
Remove old file, fix autoloading issues
2017-04-15 12:13:29 -04:00
Dane Everitt
d20cb144be
Fix misnamed class
2017-04-14 20:46:50 -04:00
Dane Everitt
97cc30e502
Assorted fixes
2017-04-14 20:10:09 -04:00
Dane Everitt
7cead2635a
Spelling.
2017-04-14 17:55:25 -04:00
Dane Everitt
6a1c1c1215
Needle is not haystack.
2017-04-14 17:54:11 -04:00
Dane Everitt
5a95a3a044
Fix environment script to not explode when default option isn't in array.
2017-04-14 17:52:36 -04:00
Dane Everitt
2564276657
Seems the 'r' key is loosing its sensitivity... 👀
2017-04-14 17:11:54 -04:00
Dane Everitt
52fb4f58d5
Ship with support for login notifications
2017-04-14 17:10:01 -04:00
Dane Everitt
f1024ad1a8
Improved login controller func. for 2FA, throws Failed event correctly now
2017-04-14 14:33:15 -04:00
Dane Everitt
26557b6a3f
Fix extraneous MySQL calls being made for each server record listed on page.
2017-04-14 01:25:56 -04:00
Dane Everitt
6fda3b72e4
Display total servers user can access in the Admin CP
...
closes #356
2017-04-13 23:49:47 -04:00
Dane Everitt
23e6e0510b
Move config::set calls into single helper function
2017-04-13 23:19:01 -04:00
Dane Everitt
9320c26b86
fix misnamed variable, close #377
2017-04-13 22:30:32 -04:00
Emmet Young
16b8480325
Repair php artisan pterodactyl:env
2017-04-11 02:49:37 +10:00
Dane Everitt
2c1b332fee
Minor API handling fixes.
2017-04-09 19:22:49 -04:00
Dane Everitt
db168e34bd
Merge pull request #371 from Pterodactyl/feature/fractal-api
...
Implement new API and Route Updates
2017-04-09 19:17:06 -04:00
Dane Everitt
93d79994f8
Apply fixes from StyleCI ( #372 )
2017-04-09 19:16:39 -04:00
Dane Everitt
1e43f2049b
Fix up routes and controller names
2017-04-09 19:13:22 -04:00
Dane Everitt
722fd614a1
Add new dynamic view for creating API keys
2017-04-09 18:59:54 -04:00
Dane Everitt
87c09a921b
More defined naming scheme for config
2017-04-09 16:05:18 -04:00
Dane Everitt
de8bbcd098
Configuration for API pagination and includes on listing
2017-04-09 16:04:08 -04:00
Dane Everitt
69dfd380ad
Finalize API routes
2017-04-09 15:53:53 -04:00
Dane Everitt
f0c3f6f9b6
Fix location permission name
2017-04-09 15:39:44 -04:00
Dane Everitt
a2a4ab05c8
Corrected permissions to go with the more logical thought process
2017-04-09 15:35:49 -04:00
Dane Everitt
820d2bf172
Node and user API routes implemented.
...
More attempts at the logic for API permissions, most likely will need
continued tweaking in the future, but base is there.
2017-04-09 15:31:10 -04:00
Dane Everitt
f24b238e30
Base node route implementation
2017-04-09 13:52:31 -04:00
Dane Everitt
75b8753533
Simplify server and api key policy.
2017-04-09 13:34:47 -04:00
Dane Everitt
c492446513
Implement initial server and location API routes.
...
Also fixes a few exception handler issues causing incorrect HTTP status
codes on authorization errors.
2017-04-09 13:15:15 -04:00
Dane Everitt
463f465dea
Block viewing node allocations and location unless user has permission
...
Blocks viewing the allocation list and location for a node unless a
user has permission to view the node in the first place.
2017-04-08 12:07:17 -04:00
Dane Everitt
4479d3bf19
Improved logic for handling permissions on API routes.
...
Still only partially implemented, however this method will allow the
inclusion of data that is granted with servers (such as viewing more
about the node, node location, allocations, etc) while still limiting
someone from doing `?include=node.servers` and listing all servers when
they don’t have list-servers as a permission.
2017-04-08 12:05:29 -04:00
Dane Everitt
db4df2bfa1
Push basis of new API key policy
...
Will need to revisit this another day when I’m fresh to figure out the
best method to do this.
2017-04-07 21:25:17 -04:00
Dane Everitt
51204b8d9d
Add all of the potential transformers that might be needed for now.
2017-04-07 20:28:58 -04:00
Dane Everitt
faa437b77b
Use the current_password not password field when verifying passwords.
2017-04-04 12:14:24 -04:00
Dane Everitt
65630bdcce
Move API to use JSON:API standards and fractal serializer
...
Makes the data slightly more complex, but forces a standard and can
always be changed down the road simply by changing the default
serializer.
2017-04-02 16:51:56 -04:00
Dane Everitt
c071efd008
Finish API routes for users.
2017-04-02 15:52:53 -04:00
Dane Everitt
97773300ed
Better middleware for routes, cleaned up API, removed old API calls
...
New API routes for Server allow specifying which fractal objects to
load into the request, thus making it possible to fine-tune what data
is returned.
2017-04-02 13:19:39 -04:00
Dane Everitt
ddb82ac3ca
Add initial user server transformer for API.
2017-04-02 00:49:53 -04:00
Dane Everitt
87530cdc01
Initial moves to new API scheme.
...
Implements a better middleware for handling API authentication, as well
as cleaner route handling.
2017-04-02 00:11:52 -04:00
Dane Everitt
e5f3678c62
Fix login routes
2017-04-01 21:18:56 -04:00
Dane Everitt
5927e0e12a
Merge remote-tracking branch 'origin/develop' into develop
...
# Conflicts:
# app/Http/Controllers/Base/LanguageController.php
# app/Http/Kernel.php
# app/Http/Middleware/TrimStrings.php
# app/Providers/RouteServiceProvider.php
2017-04-01 21:03:10 -04:00
Dane Everitt
d80c59aad3
Cleanup routing mechanisms
2017-04-01 21:01:10 -04:00
Dane Everitt
9c303456fb
Update codebase to L5.4 ( #367 )
2017-04-01 17:59:43 -04:00
Dane Everitt
0a95d97d7f
Better support for redis as a backend
2017-04-01 16:31:18 -04:00
Dane Everitt
cbeecfe5e4
Implement front-end server searching 🍬
2017-04-01 13:14:49 -04:00
Dane Everitt
27d472195f
Misc. bug fixes
2017-04-01 12:29:56 -04:00
Dane Everitt
844ebfaf64
Add support for starting server on creation.
2017-04-01 12:29:49 -04:00
Dane Everitt
edaa270a33
Add server descriptions, closes #338 🐖
...
🐷 https://s3.kelp.in/D0n2Z.png
2017-03-31 23:07:19 -04:00
Dane Everitt
536865b22a
Remove deletion queue for servers. Just immediately delete.
2017-03-31 22:12:31 -04:00
Dane Everitt
2dec659dd1
Fix syntax error.
2017-03-31 21:47:53 -04:00
Dane Everitt
c7d4c3aa76
Send default response
2017-03-31 21:16:00 -04:00
Dane Everitt
ff57e2ff85
Cleanup recaptcha middleware
2017-03-31 21:12:49 -04:00
Dane Everitt
451dd7ebc8
Apply fixes from StyleCI ( #364 )
2017-03-31 20:48:35 -04:00
Jakob Schrettenbrunner
e613e44749
fix #363
2017-04-01 01:58:05 +02:00
Jakob Schrettenbrunner
0ee80b1fec
fix captcha middleware using wrong function when disabled
2017-04-01 01:54:42 +02:00
Jakob Schrettenbrunner
ec0b55bcfe
fix missing path for Permission model in SubuserRepository
2017-03-31 12:50:58 +02:00
Jakob Schrettenbrunner
207e0131fc
Merge branch 'develop' of github.com:Pterodactyl/Panel into improve-password-reset
2017-03-31 12:20:41 +02:00
Jakob Schrettenbrunner
142cbb0641
Add invisible ReCAPTCHA to login and password reset
2017-03-31 12:19:44 +02:00
Dane Everitt
1f0e95790a
🔒 Don't disclose if account exists when resetting passwords, closes #358
2017-03-30 17:44:20 -04:00
Dane Everitt
9106971565
closes #362
2017-03-30 16:30:22 -04:00
Dane Everitt
95c739a3f3
Update subusers view
2017-03-30 15:31:02 -04:00
Dane Everitt
f0057353ad
Apply fixes from StyleCI
2017-03-19 23:52:11 +00:00
Dane Everitt
0312c974f5
Update doc blocks for all app/
2017-03-19 19:36:50 -04:00
Dane Everitt
5e27772fef
Very rough go at getting API back into operational state.
...
Not spending a lot of time on this as its a pre-release and I have
plans to overhaul the API to actually work and be easy to maintain.
2017-03-19 13:20:33 -04:00
Dane Everitt
4e916cbf08
Fix auto-deploy checkbox triggering error
2017-03-19 12:39:22 -04:00
Dane Everitt
da19749098
Fix phraseapp and move config location
2017-03-19 11:55:36 -04:00
Dane Everitt
e8a80c6a20
Fix allocation parsing bug.
2017-03-19 11:13:18 -04:00
Dane Everitt
377fe92f5b
Don't try to render 200 lines per second in the console... 💣
...
Corrects a math mistake on my end, and makes the console speed
configurable again. Now sends 50 messages per second.
Console will notify when being throttled, and refreshing the page will
clear the queue if necessary.
2017-03-19 11:13:17 -04:00
Dane Everitt
82b3cbc246
Minor fixes
2017-03-18 20:52:02 -04:00
Dane Everitt
6ee878080b
Fix rebuild to pass things that are needed.
2017-03-18 19:03:05 -04:00
Dane Everitt
4f16509447
Use env() properly throughout panel to avoid cache issues.
2017-03-18 15:56:19 -04:00
Dane Everitt
9a581ef536
Add support for rebuilding servers from the console.
2017-03-18 15:26:08 -04:00
Dane Everitt
03e0de28d9
Initial implementation of option scripts on panel side.
2017-03-18 13:09:30 -04:00
Dane Everitt
5d990dcb06
Revert "Rename startup command to add deprecation support to containers."
...
This reverts commit fdd1d11038
2017-03-17 19:35:48 -04:00
Dane Everitt
fdd1d11038
Rename startup command to add deprecation support to containers.
2017-03-17 19:09:54 -04:00
Dane Everitt
202dd52e2b
Fixes bug causing MySQL user accounts to be corrupted when resetting a password via the panel.
...
closes #352
2017-03-17 17:17:36 -04:00
Dane Everitt
7e45f917c7
Fix subuser permissions in file manager
2017-03-17 16:19:45 -04:00
Dane Everitt
4ad09c5435
Fixes bug introduced during admin rewrite that broke server creation
2017-03-16 21:11:15 -04:00
Dane Everitt
be60299089
Send correct container to daemon
2017-03-16 20:49:11 -04:00
Dane Everitt
b8c3ab6960
closes #339
2017-03-16 19:56:58 -04:00
Dane Everitt
1aa191210a
closes #344
2017-03-16 19:54:31 -04:00
Dane Everitt
198a021a97
Add database host management to panel.
2017-03-16 19:35:29 -04:00
Dane Everitt
5bbded2c03
Correctly json_encode validation errors.
2017-03-16 19:30:04 -04:00
Dane Everitt
05d2a6d370
Add back locations with new theme
2017-03-16 18:09:02 -04:00
Dane Everitt
db072025d4
Reference the correct column in the DB
2017-03-15 21:39:50 -04:00
Dane Everitt
1852018397
Add back missing node creation page.
2017-03-15 21:38:09 -04:00
Dane Everitt
436ba814a9
Apply fixes from StyleCI ( #351 )
2017-03-15 20:53:49 -04:00
Dane Everitt
1c47b2ed55
Finish pack management in Admin CP
2017-03-15 20:52:37 -04:00
Dane Everitt
4730309589
Add IDE helper for all functions
2017-03-15 19:47:44 -04:00
Dane Everitt
50558db7c3
Add initial pack creation and overview pages
2017-03-14 21:18:36 -04:00
