Commit graph

987 commits

Author SHA1 Message Date
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
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
95171a3e41
Better user creation email. 2017-02-17 18:48:57 -05:00
Dane Everitt
3240601d03
Fix bug when trying to add new subuser. 2017-02-17 18:26:47 -05:00
Dane Everitt
9af06b4b59
Add in query caching on server view 2017-02-17 18:19:53 -05:00
Dane Everitt
ff9904227b
Fix server editing 2017-02-17 18:17:28 -05:00
Dane Everitt
232e9a05ed
Update filemanager to be a little cleaner 2017-02-17 13:08:07 -05:00
Dane Everitt
008b18e19a
Fixes deployment issue with new servers due to DB changes. 2017-02-17 12:08:11 -05:00
Dane Everitt
f5eb309950
Fix changelog numbering 2017-02-16 18:34:46 -05:00
Dane Everitt
4ea2ea1dd9
Update changelog 2017-02-16 18:28:27 -05:00
Dane Everitt
ebe88bb1a8
Cleaner navigation bar for logout/admin 2017-02-16 18:19:52 -05:00
Dane Everitt
0357205a74
Fix database seeders 2017-02-16 18:06:16 -05:00
Dane Everitt
73996d3154
Fix bug in node update 2017-02-16 15:57:02 -05:00
Dane Everitt
59f9ab6e90
Help @schrej not have an aneurysm. 2017-02-16 15:49:14 -05:00
Dane Everitt
5e63ac0baa
Fix double encoding of JSON 2017-02-16 15:38:56 -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
4e66ba078d
Fix locations error on create 2017-02-16 14:56:28 -05:00
Dane Everitt
6148a3bb9b
Fix EULA checking 2017-02-16 14:56:27 -05:00
Dane Everitt
ba288e5bef Courageous Carniadactylus 2017-02-16 14:50:38 -05:00
Jakob
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
Jakob Schrettenbrunner
bdf8b473d4 fix translations for login field 2017-02-16 20:46:37 +01:00
Jakob Schrettenbrunner
4fc832838b use ‚required|string‘ to validate usernames 2017-02-16 20:45:36 +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