Commit Graph

233 Commits

Author SHA1 Message Date
Dane Everitt 447c4291ad
Update all places in the code referencing named routes using JS that doesn't exist now 2019-12-15 18:19:35 -08:00
Dane Everitt 81143e231a
Merge branch 'master' into develop 2019-08-04 13:49:26 -07:00
Dane Everitt 873da44a1e
Merge pull request #1615 from MatthewSH/hotfix/1614-mass-delete
Fix #1614 for mass delete error
2019-07-26 11:24:14 -04:00
AreYouScared c68ca0c773 Added Disk to overview (issue:1547) (#1569) 2019-07-26 11:14:27 -04:00
Matthew Hatcher 1d06876f69
Fix for mass delete error. 2019-06-22 22:51:14 -04:00
Dane Everitt d1880af18d
New login page design 2019-06-22 13:53:41 -07:00
Dane Everitt 56640253b9
Merge branch 'release/v0.7.14' into feature/react 2019-06-22 12:28:44 -07:00
Dane Everitt 06ff76e2e9
Fix security vulnerability in file manager allowing XSS attack 2019-06-21 21:04:42 -07:00
Martin Gafert cd7ec731dc Change Console Chart yAxes to start at 0 and calculate maximum depending on server config (#1535)
* Change Console Chart to start yAxes at 0

* Add calculation for Console Chart yAxes maximum if data is recieved

* Fix problem with calculating memory maximum
2019-05-02 12:25:03 -04:00
Dane Everitt e87c5f6657
Implement basic support for connecting to wings console via websocket rather than socketio 2019-05-01 20:12:20 -07:00
Dane Everitt 21ffa08d66
Merge branch 'develop' into feature/vuejs 2018-12-16 14:20:35 -08:00
Dane Everitt c97efe2b18
Merge pull request #1362 from Havila199/patch-1
Update terminal.css
2018-11-10 12:16:48 -08:00
Dane Everitt d2991eafa1
Merge pull request #1363 from pterodactyl/feature/remove-phraseapp
Remove phraseapp because we no longer use it
2018-11-10 12:16:18 -08:00
SpiderDead ca47c68fa3
Typo
There was a typo in the console error. reqired to required
2018-11-05 15:41:55 +01:00
Lance Pioch 5b1859ba6f
Delete phraseapp.js 2018-10-24 11:26:40 -04:00
Havila 8bd6e6bdf9
Update terminal.css
Fix for some terminal output not being wrapped properly on mobile
e.g.
overflow-x: auto; just to show 
`ServerLog: [FAdmin] prop_physics(models/props_building_details/storefront_template001a_bars.mdl) Got removed` is not being wrapped on mobile properly https://i.imgur.com/etQyafC.png
2018-10-22 17:50:37 +01:00
ayan4m1 a415b6ca58 update laroute.js 2018-10-13 21:31:33 -04:00
ayan4m1 3a45bc1986 update laroute.js 2018-10-13 21:31:08 -04:00
ayan4m1 561b3dd1e7 fix JS syntax error (using PHP concat operator in JS) 2018-10-13 21:30:47 -04:00
Dane Everitt b6205463db
Merge branch 'develop' into feature/vuejs 2018-09-23 13:14:46 -07:00
Andrew DeLisa 262ef78fae Allow deletion of multiple allocations at once (#1322) 2018-09-18 21:43:18 -07:00
ayan4m1 d24c61b472 Revert "Update terminal.css"
This reverts commit 955617d7ce.
2018-09-15 20:43:11 -04:00
Dane Everitt 5ca13839cf
Merge branch 'develop' into feature/vue-serverview 2018-09-05 21:34:59 -07:00
JC Snider 955617d7ce
Update terminal.css
Treat white space in terminal output as preformatted so ascii art/other formatting works.
2018-07-17 18:09:05 -04:00
Dane Everitt f2d2725ca0
Merge branch 'feature/vuejs' into feature/vue-serverview 2018-07-15 16:50:11 -07:00
Lance Pioch b5022766df Do not keep processing the file/folder paths if the user has cancelled the operation and fix #1124 (#1177) 2018-07-01 14:42:01 -07:00
Jayden Downes 5f90d841d0 Fixed Search Bar Scaling in Firefox (#1187)
Fixed scaling issue with Firefox where it would scale the search bar to 30% of the width of the box-tools container instead of 30% of the row container. (Note this is not a fix for the issue with it appearing on a separate line on mobiles).
2018-06-04 19:33:34 -07:00
Dane Everitt e0d67ff857
Merge branch 'feature/vuejs' into feature/vue-serverview 2018-05-31 23:01:24 -07:00
Dane Everitt fd8d7c3571
Merge pull request #1130 from stanjg/feature/stats-page
Added a statistics page to monitor the panel usage
2018-05-31 22:56:58 -07:00
Lance Pioch b7eed67f2f Warn users about uploading folders not working and resolve #599 (#1181) 2018-05-31 20:36:00 -07:00
Jakob Schrettenbrunner d2c770d218 add new favicon 2018-05-28 00:35:54 +02:00
stanjg 60e1ffa564
Added a test for the controller and cleaned up the controller 2018-05-27 00:16:13 +02:00
stanjg 7a81c61ad8
Wording changes and fix of major fail last commit 2018-05-26 21:02:47 +02:00
Dane Everitt 545e44df4e
Update file manager code 2018-05-26 11:41:46 -07:00
Lance Pioch c6c37e1b88 occurred 2018-05-13 11:12:25 -04:00
stanjg 095d85bb60
Added the server as argument, and improved the bug fix 2018-05-06 17:59:11 +02:00
stanjg 28a97fea54
Polished it up 2018-05-04 22:48:43 +02:00
stanjg 93a7d11c28
Made a base 2018-05-04 18:45:37 +02:00
Dane Everitt bac02f64e3
close #1047 2018-03-17 12:38:29 -05:00
Dane Everitt 3a5d21f455
Filemanager cleanup 2018-03-08 21:30:07 -06:00
Dane Everitt 4964d294f6
Throw 504 where necessary 2018-03-06 22:17:01 -06:00
Dane Everitt bcb69603ad
Add support for user management of databases 2018-03-02 19:03:55 -06:00
Dane Everitt 9b93629f45
Add UI for client API keys 2018-02-28 23:30:39 -06:00
Dane Everitt e7e50bc45d
Add a few new internal configs to the node config 2018-02-18 20:39:43 -06:00
Dane Everitt 0341dbdfad
Add very basic cache busting 2018-02-18 15:15:53 -06:00
Dane Everitt 8dcab927e5
Merge branch 'develop' into feature/api-v1 2018-01-21 14:31:32 -06:00
Dane Everitt 0e7f8cedf0
Reorganize API files 2018-01-19 19:58:57 -06:00
Dane Everitt c3b9738364
Implement application API Keys 2018-01-18 21:36:15 -06:00
Lance Pioch f5fc27a19c Fix #872 (#876) 2018-01-17 21:10:08 -06:00
Dane Everitt f9fc3f4370
Update interface to begin change to seperate account API keys and application keys
Main difference is permissions, cleaner UI for normal users, and account keys use permissions assigned to servers and subusers while application keys use R/W ACLs stored in the key table.
2018-01-14 13:30:55 -06:00