Commit graph

257 commits

Author SHA1 Message Date
SirEpiclyAmazing
e771d36d41
Disallow crawlers (#3832) 2021-12-28 08:02:08 -05:00
Dane Everitt
00da092e45
Fix tests 2021-01-30 19:12:22 -08:00
Dane Everitt
a043071e3c
Update to Laravel 8
Co-authored-by: Matthew Penner <me@matthewp.io>
2021-01-23 12:12:54 -08:00
Dane Everitt
9193db9d46
Reset docker images correctly when changing egg; closes #2895 2020-12-25 15:43:44 -08:00
Dane Everitt
78c4ac80bc
Basic implemention of multiple selectable images for an egg
The admin side of this is quite ugly when creating/editing a server, but I'm not putting effort into that right now with React Admin soon™
2020-12-13 09:53:17 -08:00
Stepan Fedotov
62856556b9
Apply security fixes from #2441 to 1.0 2020-10-03 11:34:36 -07:00
Dane Everitt
1e4b50fa61
Remove socketio connections from server listing; closes #1942 2020-09-16 20:28:32 -07:00
Dane Everitt
8b4bd3945d
Fix user search in admin area; closes #2100 2020-09-13 12:35:48 -07:00
Matthew Penner
773c42e4f2 Fix #2253 2020-08-24 11:26:05 -06:00
Matthew Penner
3ebb6eadbf Add upload button and drag&drop modal 2020-07-12 15:20:37 -06:00
galeapatrik
89844e0a0d Fix terminal css line formatting 2020-06-17 21:32:33 +02:00
Charles Morgan
46285fefd7
CSS Changes
More CSS Changes....

Server overview page now looks more..... fluid
Boxes have their correct color top colors back, When admin side was changed to dark theme all by the yellow was changed to a single color, this is reverted.
Node overview page uses blue over gray box for total servers.
Lightened the text color on the side bar
Removed delete button for allocations that are assigned.
Changes Node configuration box to not hurt eyes
2020-05-10 18:09:01 -04:00
AreYouScared
c54cbe6638 Update Admin CSS / Few css fixes
Changed `code` color to be a little lighter, more contrast / easier to read (From #999 to #c3c3c3)
Added Readonly style, was white box with grey letters. Changes to Dark grey box and white letters.
Changed cursor for disabled / read-only to `not-allowed` instead of `text`
Closes #1918 -> Dropdown text was grey with a grey background.
Added Green and Yellow Text colors
Added Text-Danger
Changed Link color, to be a tad lighter
Added well/well-sm/well-lg to pterodactyl.css
Changed well to match the dark theme.
Hovering over Start / Restart show respective colors Green / Blue
2020-04-19 08:30:52 -04:00
Dane Everitt
e6a61fbe9b
Update views to support a more logical container 2020-04-17 11:17:01 -07:00
Dane Everitt
e044e8db1c
Show a nicer error message when server is installing 2020-04-17 11:07:32 -07:00
Dane Everitt
7700919d21
Merge branch 'develop' into patch-1 2020-04-12 17:49:16 -07:00
Rihan // CodeCo
006031f4d5
Fix databases dropdown being wrong unthemed 2020-04-12 02:42:57 +01:00
Rihan // CodeCo
689b0ef056
Match admin design to frontend colour schene
https://file.properties/host/uZfyNTxQ.png
2020-04-12 02:35:30 +01:00
Matthew Penner
a7dab69711 Persist service variables 2020-04-11 14:46:30 -06:00
Matthew Penner
dec6868a55 Persist nest_id, egg_id, pack_id 2020-04-11 14:14:05 -06:00
Matthew Penner
b5e50719ac Remove old Theme::js calls in blade layouts. Persist checkboxes, Server Owner, Node, Default Allocation, and Additional Allocations on servers/new.blade.php 2020-04-11 13:56:03 -06:00
Matthew Penner
fb96d9468e Prevent primary allocation from being an additional allocation at the same time when creating a server 2020-04-11 12:35:27 -06:00
Matthew Penner
a2eab3ca43 Add ui elements for handling server transfers, add TransferJob.php and TransferService.php 2020-04-03 21:45:37 -06:00
Dane Everitt
4173001f10
Put this up one level so it doesn't disappear on releases 2019-12-22 21:44:50 -08:00
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