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
|
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 |
|