bd78e3544d
Merge branch 'develop' into feature/PTDL-472
2017-07-08 14:08:02 -05:00
a1376db4fd
Redirect user to node allocation view after creation, closes #535
2017-07-08 18:14:54 +02:00
5c3dc60d1e
Addition of repository to ease testing and maintainability
2017-07-01 15:29:49 -05:00
b7b046c044
Merge branch 'develop' into feature/PTDL-472
2017-06-25 15:36:39 -05:00
4ee9d38ad1
Add ApiKey service, cleanup old API key methods
...
https://zube.io/pterodactyl/panel/c/525
2017-06-25 15:31:50 -05:00
2235481765
More service structure testing and configuration
...
Tests aren't working as well as I had hoped, so a lot are commented out while I wait to hear back on this bug causing them to fail.
2017-06-24 19:49:09 -05:00
cba54637fc
Fixes bug with newly created variables not being assigned to existing servers properly, closes #478
2017-06-18 21:38:00 -05:00
1c5f892049
backfill fixes from 65957e7e to address #470 in active release
2017-06-18 20:39:04 -05:00
ce2b2447d0
Apply fixes from StyleCI ( #501 )
2017-06-17 20:52:32 -05:00
0111ca7768
Push more changes to DBHost service.
...
Currently updating via the frontend is broken if you don't provide an actual node to attach it to.
2017-06-17 19:48:31 -05:00
cede747442
Cleanup user and location controllers.
2017-06-17 17:36:39 -05:00
fe4977f0fa
Update admin location routes and controller to use service
...
Needs tests written, uses new validation on model.
2017-06-14 23:53:24 -05:00
26e476a794
Push updates, removes repositories, begins moving functionality to services.
...
First integration tests included.
2017-06-13 23:25:37 -05:00
5c2b9deb09
Push initial implementations of new repository structure
...
This breaks almost the entire panel, do not pull this branch in this state.
Mostly just moved old repository files to a new folder without updating anything else in order to start doing new things. Structure is not finalized.
2017-06-10 22:28:44 -05:00
65957e7ea5
Begin implementation of new request validation, closes #470
2017-06-03 18:41:35 -05:00
265b697066
Apply fixes from StyleCI ( #471 )
2017-06-03 17:07:50 -05:00
8b762cbaf5
Also update service listing to accommodate no variables.
2017-05-24 20:42:31 -05:00
9116547e98
allow emptying server description, closes #442
2017-05-23 23:00:31 -05:00
f0fca2a681
Fix missing log class on API calls with errors.
2017-05-23 22:56:54 -05:00
72c0330486
Fixes 2FA not honoring 'Remember Me' checkbox, closes #439
2017-05-22 19:09:42 -05:00
de0b9beacb
Minor visual tweaking and filemanager backend improvements.
2017-05-05 23:13:42 -04:00
a52d9eb0fb
fix error display when server is installing, closes #424
2017-05-05 16:27:38 -04:00
b3e5565f85
Cleanup auto-deployment functions substantially
...
Also cleans up ServerRepository to use named models more clearly.
2017-05-01 22:59:58 -04:00
4eaf858684
Fix inability to set user as non-admin, closes #414
2017-05-01 17:05:30 -04:00
c9c0e845b1
Go nuclear on Safari's autocomplete.
2017-05-01 16:41:39 -04:00
b539f26dab
Stop browser autofill on user view pages.
2017-05-01 16:17:31 -04:00
ae6b0f5c5e
Use the cache tags correctly.
2017-05-01 14:52:14 -04:00
d919b2ed40
Pass the token correctly.
2017-05-01 14:26:59 -04:00
605c91a9af
Use cache helpers rather than database to handle configuration tokens and downloads.
2017-05-01 14:21:18 -04:00
2330c25a8c
Move old /remote routes into /daemon sphere.
2017-05-01 13:59:33 -04:00
7eb7377dd5
I really need to stop trying to override PHP reserved keywords...
2017-04-28 10:19:04 -04:00
aa6060846d
Actually show errors on password reset page.
2017-04-27 23:44:26 -04:00
7e0cbe8db1
Pass behind_proxy properly.
2017-04-27 22:55:42 -04:00
3ee7b7cff1
Add ability to mark a node as being over a proxy
2017-04-27 22:52:37 -04:00
30b4934013
Include default installation scripts, as well as ability to symlink a script
2017-04-27 16:16:59 -04:00
77b1a258d9
Weekly fix of my StyleCI violations...
2017-04-24 16:56:38 -04:00
147f473eeb
Add back disk limiting!
2017-04-21 22:44:56 -04:00
a5a1ea3165
Add ability to change service implementation for a server.
2017-04-21 17:52:44 -04:00
8dc24471ae
Add reinstall abilities and cleanup process for new servers
2017-04-20 18:52:43 -04:00
3fe5d162f5
Add skip scripting option
2017-04-20 17:57:40 -04:00
c8f1335a09
Fixup merge
2017-04-20 17:26:20 -04:00
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
33262cf34c
Set correct console frequency
2017-04-17 21:54:26 -04:00
619d3fe480
Fix autodeploy time checking.
2017-04-17 21:37:45 -04:00
de923bbb83
Fix server deletion logic, and clean up suspend/unsuspend operations
2017-04-17 20:16:05 -04:00
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
1a87943f07
Fix missing CommandRepository statement
2017-04-15 13:54:34 -04:00
7f1a97184b
Un-butcher task system.
2017-04-15 13:52:43 -04:00
f1024ad1a8
Improved login controller func. for 2FA, throws Failed event correctly now
2017-04-14 14:33:15 -04:00
26557b6a3f
Fix extraneous MySQL calls being made for each server record listed on page.
2017-04-14 01:25:56 -04:00
6fda3b72e4
Display total servers user can access in the Admin CP
...
closes #356
2017-04-13 23:49:47 -04:00
9320c26b86
fix misnamed variable, close #377
2017-04-13 22:30:32 -04:00
db168e34bd
Merge pull request #371 from Pterodactyl/feature/fractal-api
...
Implement new API and Route Updates
2017-04-09 19:17:06 -04:00
93d79994f8
Apply fixes from StyleCI ( #372 )
2017-04-09 19:16:39 -04:00
1e43f2049b
Fix up routes and controller names
2017-04-09 19:13:22 -04:00
722fd614a1
Add new dynamic view for creating API keys
2017-04-09 18:59:54 -04:00
87c09a921b
More defined naming scheme for config
2017-04-09 16:05:18 -04:00
de8bbcd098
Configuration for API pagination and includes on listing
2017-04-09 16:04:08 -04:00
69dfd380ad
Finalize API routes
2017-04-09 15:53:53 -04:00
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
f24b238e30
Base node route implementation
2017-04-09 13:52:31 -04:00
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
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
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
51204b8d9d
Add all of the potential transformers that might be needed for now.
2017-04-07 20:28:58 -04:00
faa437b77b
Use the `current_password` not `password` field when verifying passwords.
2017-04-04 12:14:24 -04:00
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
c071efd008
Finish API routes for users.
2017-04-02 15:52:53 -04:00
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
ddb82ac3ca
Add initial user server transformer for API.
2017-04-02 00:49:53 -04:00
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
9c303456fb
Update codebase to L5.4 ( #367 )
2017-04-01 17:59:43 -04:00
cbeecfe5e4
Implement front-end server searching 🍬
2017-04-01 13:14:49 -04:00
edaa270a33
Add server descriptions, closes #338 🐖
...
🐷 https://s3.kelp.in/D0n2Z.png
2017-03-31 23:07:19 -04:00
536865b22a
Remove deletion queue for servers. Just immediately delete.
2017-03-31 22:12:31 -04:00
451dd7ebc8
Apply fixes from StyleCI ( #364 )
2017-03-31 20:48:35 -04:00
e613e44749
fix #363
2017-04-01 01:58:05 +02:00
1f0e95790a
🔒 Don't disclose if account exists when resetting passwords, closes #358
2017-03-30 17:44:20 -04:00
95c739a3f3
Update subusers view
2017-03-30 15:31:02 -04:00
f0057353ad
Apply fixes from StyleCI
2017-03-19 23:52:11 +00:00
0312c974f5
Update doc blocks for all app/
2017-03-19 19:36:50 -04:00
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
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
4f16509447
Use env() properly throughout panel to avoid cache issues.
2017-03-18 15:56:19 -04:00
03e0de28d9
Initial implementation of option scripts on panel side.
2017-03-18 13:09:30 -04:00
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
7e45f917c7
Fix subuser permissions in file manager
2017-03-17 16:19:45 -04:00
4ad09c5435
Fixes bug introduced during admin rewrite that broke server creation
2017-03-16 21:11:15 -04:00
b8c3ab6960
closes #339
2017-03-16 19:56:58 -04:00
1aa191210a
closes #344
2017-03-16 19:54:31 -04:00
198a021a97
Add database host management to panel.
2017-03-16 19:35:29 -04:00
05d2a6d370
Add back locations with new theme
2017-03-16 18:09:02 -04:00
1852018397
Add back missing node creation page.
2017-03-15 21:38:09 -04:00
436ba814a9
Apply fixes from StyleCI ( #351 )
2017-03-15 20:53:49 -04:00
1c47b2ed55
Finish pack management in Admin CP
2017-03-15 20:52:37 -04:00
50558db7c3
Add initial pack creation and overview pages
2017-03-14 21:18:36 -04:00
2d90187c83
StyleCI fixes
2017-03-12 19:38:50 -04:00
fcadee7e67
Fix front and backend views with new service variable setups
2017-03-12 19:34:06 -04:00
1897741381
StyleCI cleanup
2017-03-12 16:34:43 -04:00
f5a4ec981d
Add ability to create new service variable.
2017-03-12 16:28:38 -04:00
b1b1f448e9
Send the correct information to daemon for new index.js setup
2017-03-12 16:04:47 -04:00
419031e0cd
Add function file editing, and move all service file items into database
2017-03-12 15:59:17 -04:00
d7682bb7c9
Complete new service, option, and variable management interface in Admin CP
2017-03-12 00:00:06 -05:00
70db461075
Start push of service changes.
...
Changes the way service files are stored and allows for much easier
updates in the future that won’t affect custom services.
Also stores more configurations in the database to make life easier for
everyone.
2017-03-10 18:25:12 -05:00
5bf2e2686a
Apply fixes from StyleCI ( #335 )
2017-03-05 20:28:29 -05:00
3355554704
Fix frontend database password reset
2017-03-05 16:46:44 -05:00
32dec97e46
Improved database mechanics in admin CP for server view
2017-03-05 16:37:40 -05:00
349b36d38a
Added startup management, cleaned up code.
...
Refactored entire startup repository code block to be more efficient
and cleaner. Also includes modifications to front-end to make it match
backend name and design.
2017-03-04 23:45:25 -05:00
d51ae5ec23
Apply fixes from StyleCI ( #332 )
2017-03-04 19:28:23 -05:00
e688468920
Push updated server views
2017-03-04 19:03:49 -05:00
b1564389d8
Apply fixes from StyleCI ( #331 )
2017-03-03 23:38:21 -05:00
e6d3663b3b
Model and template cleanup
2017-03-03 23:37:41 -05:00
d38f89a468
Cleanup node routes, cleanup remote token
2017-03-03 23:14:25 -05:00
6df573e50c
retheme admin users list
2017-03-04 00:16:11 +01:00
fd5b74c873
Use usernames for @schrej
2017-03-03 17:53:35 -05:00
fd9f1a68eb
Implement node view, cleanup other files.
...
Still in progress, need to do a lot of controller cleanup first and add
node deletion as well.
2017-03-03 17:30:41 -05:00
fb21bf9282
Begin implementation of server admin view
...
Currently completed tabs: About, Details, Build Configuration
2017-02-25 00:48:14 -05:00
bbf9fd12ae
Apply fixes from StyleCI ( #325 )
2017-02-24 18:23:03 -05:00
cb6b44d4f0
Completed new server page with new theme.
2017-02-24 18:19:03 -05:00
58999913ba
More improvements to add server page.
2017-02-23 22:52:05 -05:00
8f96b35db1
Merge branch 'develop' into feature/admin-retheme
2017-02-23 21:24:17 -05:00
b11029a666
Apply fixes from StyleCI ( #312 )
...
* Bump for release
* Apply fixes from StyleCI
2017-02-18 22:57:50 -05:00
ed4068bdb9
Fix bug preventing server container rebuilds.
2017-02-18 22:33:15 -05:00
644c07ea3a
Fix broken port deletion
2017-02-18 22:32:16 -05:00
b926d432e8
Thats enough re-theming for the day...
2017-02-18 19:31:44 -05:00
99497adcb2
Show proper server status when viewing listing.
...
closes #308
2017-02-17 20:34:57 -05:00
e9762b4277
Fixes port deletion for node allocations as well as server notes on allocations.
...
closes #305
2017-02-17 19:59:40 -05:00
9af06b4b59
Add in query caching on server view
2017-02-17 18:19:53 -05:00
73996d3154
Fix bug in node update
2017-02-16 15:57:02 -05:00
59f9ab6e90
Help @schrej not have an aneurysm.
2017-02-16 15:49:14 -05:00
5e63ac0baa
Fix double encoding of JSON
2017-02-16 15:38:56 -05:00
4e66ba078d
Fix locations error on create
2017-02-16 14:56:28 -05:00
d230ee179a
Merge pull request #299 from Pterodactyl/feature/allow-login-with-username
...
allow to use the username for login as well
2017-02-16 20:47:25 +01:00
4fc832838b
use ‚required|string‘ to validate usernames
2017-02-16 20:45:36 +01:00
0b2c5279a8
allow to use the username for login as well
...
add translation strings
2017-02-16 20:40:21 +01:00
c8ae776ab8
Fix settings redirection for server
2017-02-16 14:04:15 -05:00
2e134b7a55
Set out some roach traps to catch all these 🐛
2017-02-16 13:56:28 -05:00
516e2dc5ee
Add back API key deletion
2017-02-16 12:57:48 -05:00
19d352619e
More singularization and correct file names.
2017-02-12 16:03:17 -05:00
8ba479e51f
Singularize model names.
2017-02-12 16:02:23 -05:00
7c916ad38f
Apply fixes from StyleCI ( #294 )
2017-02-12 15:10:39 -05:00
32a1dc17ed
API model updates, as well as general model updates and code fixes.
2017-02-10 20:26:38 -05:00
c70d31c08f
More model updates.
2017-02-10 17:36:58 -05:00
3b3002b77a
API Model updates.
2017-02-10 17:29:10 -05:00
efef356870
Assorted model code updates.
2017-02-10 17:18:46 -05:00
ba175e6b55
Cleanup location model and controller for Admin.
2017-02-10 17:09:56 -05:00
0720bfe62f
Cleanup database query code.
2017-02-10 17:03:58 -05:00
99812b0407
More subuser Model updates.
2017-02-09 19:38:54 -05:00
4f61637284
More model updates to more places than I anticipated.
...
This probably broke a lot of things.
2017-02-09 17:43:54 -05:00
02458c909d
Improves server model and cleans up model code calls.
2017-02-05 19:19:46 -05:00
323f1d943f
Completed model updates for Services
2017-02-05 17:58:17 -05:00
09d23deed6
New models for node and location admin pages.
2017-02-03 16:50:28 -05:00
96d3aa767f
Model updates for Database Management in ACP
2017-02-03 15:19:14 -05:00
9c2d34d6e6
Mo' StyleCI fixes... 🦀
2017-02-02 19:48:15 -05:00
533e2bcafb
Fix database column references in ACP
2017-02-02 19:46:46 -05:00
3baa21a6eb
StyleCI fixes.
2017-02-02 19:43:55 -05:00
3114b7e52a
Complete implementation of new Server model.
2017-02-02 19:41:38 -05:00
d4bcf0be59
Initial implementation of improved sever model and logic
2017-02-02 18:21:36 -05:00
7f51e5df62
API tweaks to return more relevant information on server listing
2017-02-02 16:24:08 -05:00
32c21baab0
Return packs associated with a service when viewing it on the API.
2017-02-02 16:01:18 -05:00
a93adce303
Only allow up to 30 seconds of overlap on comparing the 2FA tokens.
2017-02-01 23:02:54 -05:00
4abdee0efb
Better 2FA implementation on logins
2017-02-01 22:58:48 -05:00
e5ed1c7f6a
One day eslint will have a PHP counterpart that works in Atom... 🤔
2017-01-31 20:04:34 -05:00
9087feec4f
Remove build settings from packs.
2017-01-27 16:21:25 -05:00
e6d3e75024
Add new daemon routes for pack handling
2017-01-25 18:25:34 -05:00
bf7b58470a
Update copyright headers
2017-01-24 17:57:08 -05:00
b9512dccb8
Apply fixes from StyleCI ( #269 )
2017-01-23 17:11:25 -05:00
06232b84c2
Merge pull request #268 from hammerdawn/ThemeFixes
...
Repair the admin side add user functionality.
2017-01-23 17:10:32 -05:00
9c87e03c0c
Repair the admin side add user functionality.
2017-01-23 13:24:14 +11:00
5f1bfcf980
Much cleaner code for updating user details front-end
2017-01-22 16:16:43 -05:00
9e54dabe5b
Display if subusers are using 2FA
2017-01-22 16:16:26 -05:00
355697dbb5
Apply fixes from StyleCI ( #260 )
2017-01-21 15:56:32 -05:00
0e23f87724
Add task management views
2017-01-21 15:40:46 -05:00
db7b741b28
Show server status in sidebar properly on subuser views
2017-01-21 13:49:14 -05:00
3d2278ba3e
Add subuser list and new subuser views
...
Holy 🐄 translations are annoying to implement for these views.
2017-01-20 23:39:37 -05:00
91178d78a4
Add support for creating files via file manager
2017-01-20 17:10:14 -05:00
83c776fc82
Fix up most of the file manager
2017-01-19 16:58:57 -05:00
88378ce983
Add allocations tab
...
Strips some core allocation features for now, will be added back with
more features once the theme is done.
2017-01-18 20:45:10 -05:00
f6600f447f
Add Startup Params view
...
Translations might be the end of us.
2017-01-17 19:30:27 -05:00
e2eff27a56
Apply fixes from StyleCI
2017-01-17 23:21:33 +00:00
515e543c7f
Add SFTP and Database management pages to new theme.
2017-01-15 20:28:54 -05:00
c7f3bb5112
New theme assigned to server console page.
2017-01-15 18:52:22 -05:00
2fc852c6a4
Push 'Account' and 'Security' pages as well as 'My Servers'
2017-01-15 14:09:57 -05:00
a5aa089d66
Apply fixes from StyleCI
2017-01-12 20:48:12 +00:00
e91362eee6
Update user controller
2017-01-12 15:40:24 -05:00
6bd9663f59
Merge branch 'develop' into feature/service-changes
2017-01-12 13:15:37 -05:00
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
f70b33d69c
one more styleci fix. don’t be that picky! 🙈
2017-01-07 18:40:55 +01:00
a661f71974
fix styleci issues
2017-01-07 18:39:41 +01:00
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
e1e159b7de
add ability to generate a token to retrieve the config for a specific node
2017-01-07 18:10:11 +01:00
d9de884de3
Apply fixes from StyleCI
2017-01-03 22:46:30 +00:00
c1bf757623
Fix service option name being set wrongly after adding a new variable. closes #208
2017-01-03 17:44:48 -05:00
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
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
3f5bf099ae
Use DaneEveritt's shortened query call.
2017-01-03 13:40:35 +11:00
a1dff5cda0
Push updated languages
2016-12-30 17:17:36 -05:00
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
a49dee2416
Add base implementation of service retrieval. 🏇
...
There is currently no authentication middleware on this route.
2016-12-14 18:54:43 -05:00
efda0dd009
Apply fixes from StyleCI
2016-12-14 21:56:25 +00:00
Dane Everitt
Joost Kwakkel
Dane Everitt
Jakob Schrettenbrunner
Emmet Young
