Commit Graph

454 Commits

Author SHA1 Message Date
Dane Everitt 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
MeltedLux 887c859f61 Sneaky typo fix 2017-03-10 07:29:58 +00:00
Dane Everitt 3355554704
Fix frontend database password reset 2017-03-05 16:46:44 -05:00
Dane Everitt 32dec97e46
Improved database mechanics in admin CP for server view 2017-03-05 16:37:40 -05:00
Jakob Schrettenbrunner 16aaf531d6 switch user delete box to the style from nodes for consistency 2017-03-05 17:25:28 +01:00
Dane Everitt 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
Dane Everitt e688468920
Push updated server views 2017-03-04 19:03:49 -05:00
Dane Everitt 9a14cb5687
Remove old views 2017-03-03 23:40:33 -05:00
Dane Everitt e6d3663b3b
Model and template cleanup 2017-03-03 23:37:41 -05:00
Dane Everitt d38f89a468
Cleanup node routes, cleanup remote token 2017-03-03 23:14:25 -05:00
Dane Everitt 287015669a
Deleting nodes is now located on index 2017-03-03 23:14:25 -05:00
Jakob Schrettenbrunner 61d8332e93 make new user and view user consistent 2017-03-04 01:47:39 +01:00
Jakob Schrettenbrunner 23dfcbd7bc retheme admin create user page 2017-03-04 01:45:03 +01:00
Jakob Schrettenbrunner d1811822f3 fix form on admin user view 2017-03-04 01:44:52 +01:00
Jakob Schrettenbrunner ae980f9020 retheme admin user view 2017-03-04 01:10:03 +01:00
Jakob Schrettenbrunner e331157f53 add users menu link to new admin layout
rename server list to servers
rename node list to nodes
2017-03-04 00:20:17 +01:00
Jakob Schrettenbrunner 6df573e50c retheme admin users list 2017-03-04 00:16:11 +01:00
Dane Everitt fd5b74c873
Use usernames for @schrej 2017-03-03 17:53:35 -05:00
Dane Everitt 2854a55aa2
Fix server view to use owner username and named route locations 2017-03-03 17:50:45 -05:00
Jakob Schrettenbrunner 2efd6865e3 fix rethemed settings title 2017-03-03 23:36:11 +01:00
Dane Everitt 799f2ee6d9
Merge branch 'develop' into feature/admin-retheme
# Conflicts:
#	public/themes/pterodactyl/css/pterodactyl.css
2017-03-03 17:35:04 -05:00
Dane Everitt 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
Jakob Schrettenbrunner 6c7fff1de0 fix rethemed settings breadcrumbs 2017-03-03 23:23:45 +01:00
Jakob Schrettenbrunner c5e7f414f6 retheme admin settings view 2017-03-03 23:18:36 +01:00
Jakob Schrettenbrunner 3a88deb97a Merge branch 'develop' into feature/new-theme
# Conflicts:
#	.gitignore
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map
#	public/themes/pterodactyl/js/frontend/serverlist.js
#	resources/themes/pterodactyl/server/files/list.blade.php
2017-03-03 23:08:24 +01:00
Dane Everitt 9f54ff236a
Add back manage and delete tabs to server view
Will come back to deal with Startup and Database tabs at a later date.
2017-02-25 14:14:07 -05:00
Dane Everitt fb21bf9282
Begin implementation of server admin view
Currently completed tabs: About, Details, Build Configuration
2017-02-25 00:48:14 -05:00
Dane Everitt cb6b44d4f0
Completed new server page with new theme. 2017-02-24 18:19:03 -05:00
Dane Everitt 58999913ba
More improvements to add server page. 2017-02-23 22:52:05 -05:00
Dane Everitt b926d432e8
Thats enough re-theming for the day... 2017-02-18 19:31:44 -05:00
Dane Everitt e9762b4277
Fixes port deletion for node allocations as well as server notes on allocations.
closes #305
2017-02-17 19:59:40 -05:00
Dane Everitt 0f93ba2495
Add permissions checking to sidebar 2017-02-17 19:45:03 -05:00
Dane Everitt 5f8572fe1a
Fix power button permissions checking 2017-02-17 19:37:35 -05:00
Dane Everitt 008cccb098
Fix up email sending and add more notifications to the panel.
Closes #265
2017-02-17 19:23:27 -05:00
Dane Everitt 9af06b4b59
Add in query caching on server view 2017-02-17 18:19:53 -05:00
Dane Everitt 232e9a05ed
Update filemanager to be a little cleaner 2017-02-17 13:08:07 -05:00
Dane Everitt ebe88bb1a8
Cleaner navigation bar for logout/admin 2017-02-16 18:19:52 -05:00
Dane Everitt f9dc66b4dd
Update footer 2017-02-16 15:02:40 -05:00
Dane Everitt d4e1bc6cc0
Discord link via CDN now. 2017-02-16 15:01:26 -05:00
Dane Everitt 6148a3bb9b
Fix EULA checking 2017-02-16 14:56:27 -05:00
Jakob Schrettenbrunner bdf8b473d4 fix translations for login field 2017-02-16 20:46:37 +01:00
Jakob Schrettenbrunner 0b2c5279a8 allow to use the username for login as well
add translation strings
2017-02-16 20:40:21 +01:00
Dane Everitt 516e2dc5ee
Add back API key deletion 2017-02-16 12:57:48 -05:00
Dane Everitt 19d352619e
More singularization and correct file names. 2017-02-12 16:03:17 -05:00
Dane Everitt 8ba479e51f
Singularize model names. 2017-02-12 16:02:23 -05:00
Dane Everitt 32a1dc17ed
API model updates, as well as general model updates and code fixes. 2017-02-10 20:26:38 -05:00
Dane Everitt ba175e6b55
Cleanup location model and controller for Admin. 2017-02-10 17:09:56 -05:00
Dane Everitt 0720bfe62f
Cleanup database query code. 2017-02-10 17:03:58 -05:00
Dane Everitt 99812b0407
More subuser Model updates. 2017-02-09 19:38:54 -05:00
Dane Everitt 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
Dane Everitt 02458c909d
Improves server model and cleans up model code calls. 2017-02-05 19:19:46 -05:00
Dane Everitt 323f1d943f
Completed model updates for Services 2017-02-05 17:58:17 -05:00
Dane Everitt 09d23deed6
New models for node and location admin pages. 2017-02-03 16:50:28 -05:00
Dane Everitt 96d3aa767f
Model updates for Database Management in ACP 2017-02-03 15:19:14 -05:00
Dane Everitt 242294598f Merge branch 'develop' into feature/updated-models 2017-02-02 19:47:10 -05:00
Dane Everitt 3114b7e52a
Complete implementation of new Server model. 2017-02-02 19:41:38 -05:00
Jakob 8cac2a3669 Merge pull request #285 from Pterodactyl/feature/phrase-in-context
add phraseapp in context editor
2017-02-03 00:36:50 +01:00
Dane Everitt d4bcf0be59
Initial implementation of improved sever model and logic 2017-02-02 18:21:36 -05:00
Jakob Schrettenbrunner d9225e65df move phraseapp js into own file 2017-02-02 15:30:40 +01:00
Jakob Schrettenbrunner 8fc30fbe3a add phraseapp in context editor 2017-02-02 15:05:33 +01:00
Dane Everitt 4abdee0efb
Better 2FA implementation on logins 2017-02-01 22:58:48 -05:00
Dane Everitt a1a81ac980
Fix auth page not remembering users. 2017-02-01 22:28:50 -05:00
Jakob Schrettenbrunner 1cd9e8ca88 switch to jQuery 3.1.1 on new theme
will resolve #113
2017-01-29 01:20:37 +01:00
Dane Everitt 9087feec4f
Remove build settings from packs. 2017-01-27 16:21:25 -05:00
Jakob Schrettenbrunner c62312b8af redesign parts of the file manager
ignore yarn.lock file
2017-01-27 00:44:59 +01:00
Jakob Schrettenbrunner 344e3b4330 add console notification on new output that is out of view
fix the revealing module pattern (browser cache 😒)
change graph colors to theme primary color
move Socket.on(‚console’) to console.js
2017-01-26 22:57:33 +01:00
Dane Everitt 95d0c646f9
Require packs to be a tarball 2017-01-25 18:25:34 -05:00
Dane Everitt 95730da419
Fix pack edit display 2017-01-25 18:25:34 -05:00
Dane Everitt bf7b58470a
Update copyright headers 2017-01-24 17:57:08 -05:00
Dane Everitt 06232b84c2 Merge pull request #268 from hammerdawn/ThemeFixes
Repair the admin side add user functionality.
2017-01-23 17:10:32 -05:00
Emmet Young 9c87e03c0c Repair the admin side add user functionality. 2017-01-23 13:24:14 +11:00
Dane Everitt d21e6b8c90 Merge pull request #267 from hammerdawn/ThemeFixes
Theme Changes
2017-01-22 19:59:37 -05:00
Emmet Young 7bd1fbb14c Fix up the configuration token, app.url should already have the protocol included with it. Appending a new one messes it up 2017-01-23 11:02:10 +11:00
Emmet Young a2b56e865e Make sure where applying strtolower on the users email on the frontend as well. 2017-01-23 10:34:20 +11:00
Dane Everitt 5f1bfcf980
Much cleaner code for updating user details front-end 2017-01-22 16:16:43 -05:00
Dane Everitt 9e54dabe5b
Display if subusers are using 2FA 2017-01-22 16:16:26 -05:00
Emmet Young 7654d3652a Only show admin control menu if the user is a root admin 2017-01-23 01:13:53 +11:00
Dane Everitt a52290dd76 Merge pull request #259 from Pterodactyl/feature/new-theme
Implement new AdminLTE theme for front-end of panel.
2017-01-21 15:58:50 -05:00
Dane Everitt 355697dbb5 Apply fixes from StyleCI (#260) 2017-01-21 15:56:32 -05:00
Dane Everitt 19da4eda04
Update views, remove old theme views 2017-01-21 15:51:05 -05:00
Dane Everitt 0e23f87724
Add task management views 2017-01-21 15:40:46 -05:00
Dane Everitt aea9b020c5
Use words not symbols for revoking subuser 2017-01-21 13:59:02 -05:00
Dane Everitt db7b741b28
Show server status in sidebar properly on subuser views 2017-01-21 13:49:14 -05:00
Dane Everitt 8e9069cced
Subuser updates 2017-01-21 00:04:09 -05:00
Dane Everitt 95f574ec67
Sidebar and API View tweaks 2017-01-20 23:48:12 -05:00
Dane Everitt 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
Dane Everitt 91178d78a4
Add support for creating files via file manager 2017-01-20 17:10:14 -05:00
Dane Everitt 5567269bf3
Fix menu toggle element element hiding, better mobile support 2017-01-19 23:19:26 -05:00
Dane Everitt da92796ca1
Better file upload handling, add touch target 2017-01-19 22:58:58 -05:00
Dane Everitt 83c776fc82
Fix up most of the file manager 2017-01-19 16:58:57 -05:00
Dane Everitt 042c28ca43
Add Socket.io alert 2017-01-18 21:12:58 -05:00
Dane Everitt 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
Dane Everitt 758927db8e
Translations are hard 2017-01-18 19:48:12 -05:00
Dane Everitt ff241abe81
Minor tweaks to new API token page. 2017-01-18 19:41:46 -05:00
Jakob Schrettenbrunner 148e9d1fd5 use adminPermissions[] correctly in api key creation form 2017-01-19 01:24:33 +01:00
Jakob Schrettenbrunner e81af3afee add csrf token to api key creation form 2017-01-19 01:07:28 +01:00
Jakob Schrettenbrunner 76cef7bf1d add redesigned base.api.new view
add translations
2017-01-19 01:06:26 +01:00
Dane Everitt d3d1b88135
Add 404 and 403 error pages 2017-01-17 20:28:49 -05:00
Jakob Schrettenbrunner e075b9061e replace `{{ trans() }}` with `@lang()` 2017-01-18 02:01:26 +01:00
Dane Everitt 542b919bd1
Add translations for database overview 2017-01-17 19:46:42 -05:00