Commit graph

3910 commits

Author SHA1 Message Date
Dane Everitt
cbbd3704fe
Add a second check here *just* to make sure someone doesn't break this. 2017-03-04 19:27:24 -05:00
Dane Everitt
cd0a45a777
Fixes caching to actually clear the cache for *all* users, rather than the logged in user by using cache tags. 2017-03-04 19:24:46 -05:00
Dane Everitt
5d59d364f8
Fixes bug preventing proper updating of caches and models due to undefined Auth::user() 2017-03-04 19:04:11 -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
b1564389d8 Apply fixes from StyleCI (#331) 2017-03-03 23:38:21 -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
b91e3d95f8 fix revealing module and jquery3 of 2fa-modal 2017-03-03 23:42:58 +01: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
500cf7fdb3 Merge pull request #329 from Pterodactyl/feature/new-theme
Some more changes to the new theme
2017-03-03 17:33:40 -05:00
Dane Everitt
b301b89459
Merge branch 'develop' into feature/admin-retheme 2017-03-03 17:30:51 -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
c021872a9c Update database.php 2017-03-02 12:17:52 -05: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
bbf9fd12ae Apply fixes from StyleCI (#325) 2017-02-24 18:23:03 -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
8f96b35db1
Merge branch 'develop' into feature/admin-retheme 2017-02-23 21:24:17 -05:00
Dane Everitt
b82c67424f Slow ya roll StyleCI... 2017-02-18 22:59:08 -05:00
Dane Everitt
b11029a666 Apply fixes from StyleCI (#312)
* Bump for release

* Apply fixes from StyleCI
2017-02-18 22:57:50 -05:00
Dane Everitt
ed4068bdb9
Fix bug preventing server container rebuilds. 2017-02-18 22:33:15 -05:00
Dane Everitt
644c07ea3a
Fix broken port deletion 2017-02-18 22:32:16 -05:00
Dane Everitt
efdc3e6fd8
Add cache policy for ServerPolicy
10 second cache, just long enough to handle the page load without
making more than one MySQL call.
2017-02-18 22:26:07 -05:00
Dane Everitt
f91e4c511e
Attach user to cache to prevent showing servers they can't access. 2017-02-18 21:45:11 -05:00
Dane Everitt
b926d432e8
Thats enough re-theming for the day... 2017-02-18 19:31:44 -05:00
Dane Everitt
911434d033 Only apache could manage to do something this ridiculous 2017-02-18 12:47:49 -05:00
Dane Everitt
824041f6ca
Fix service creation/updates, closes #306 2017-02-17 20:40:50 -05:00
Dane Everitt
99497adcb2
Show proper server status when viewing listing.
closes #308
2017-02-17 20:34:57 -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
22da8d47c8
Auto-fill emails when resetting password 2017-02-17 19:45:14 -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
6a996c7c0c
Fix account creation email 2017-02-17 19:35:26 -05:00
Dane Everitt
054e65b78f
Fix user deletion 2017-02-17 19:28:23 -05:00
Dane Everitt
397172de3b
Better notification for user creation, only add button if needed. 2017-02-17 19:26:02 -05:00