Commit graph

3275 commits

Author SHA1 Message Date
Dane Everitt
fd7ed1d16e Update CONTRIBUTING.md 2017-04-24 16:49:56 -04:00
Fillerino
5cc28a0716 Fixing timing attack vuln. on HMAC comparison (#409) 2017-04-24 16:49:03 -04:00
Hunter Wignall
a35788da34 LANG: Missing 'A' in 'Allows' (#402) 2017-04-23 16:30:32 -04:00
Belldandu
fc2b7b5982 Update 2017_04_20_171943_AddScriptsToServiceOptions.php (#404)
Currently mysql does not support defaults for text and blobs without disabling strict mode in 5.7. https://dev.mysql.com/doc/refman/5.7/en/blob.html

Mariadb (a drop in replacement for mysql my by the same team of devs as mysql) also doesnt support defaults text and blobs until 10.2.1 (there is no stable release, 10.2.5 is a release candidate) which isnt available on non-bleeding edge distro's. No one is going to install an unstable release of mariadb on production servers. https://mariadb.com/kb/en/mariadb/text/
Latest release for ubuntu xenial is 10.0.29-MariaDB

So for now we change text to string for values that have defaults until defaults are more widely supported for TEXT and BLOB mysql values.
2017-04-23 16:29:54 -04:00
Hunter Wignall
d76bcf4cf9 Set drop-down menu option to be same as help text below (#400) 2017-04-21 22:46:06 -04:00
Dane Everitt
147f473eeb
Add back disk limiting! 2017-04-21 22:44:56 -04:00
Dane Everitt
4928620aab Merge pull request #401 from Pterodactyl/feature/option-scripts
Feature/option scripts
2017-04-21 20:59:55 -04:00
Dane Everitt
2ba9d51f9c
Update changelog 2017-04-21 17:54:32 -04:00
Dane Everitt
a5a1ea3165
Add ability to change service implementation for a server. 2017-04-21 17:52:44 -04:00
Dane Everitt
e0958414d7
Fix server deletion 2017-04-21 17:21:00 -04:00
Dane Everitt
8dc24471ae
Add reinstall abilities and cleanup process for new servers 2017-04-20 18:52:43 -04:00
Dane Everitt
3fe5d162f5
Add skip scripting option 2017-04-20 17:57:40 -04:00
Dane Everitt
c8f1335a09
Fixup merge 2017-04-20 17:26:20 -04:00
Dane Everitt
8d24e5f168
Merge branch 'develop' into feature/option-scripts
# Conflicts:
#	app/Http/Routes/AdminRoutes.php
#	app/Http/Routes/DaemonRoutes.php
#	app/Models/ServiceOption.php
2017-04-20 17:08:08 -04:00
Dane Everitt
d695532aa2
Fixes migrations to actually rollback all the way. 2017-04-19 18:43:32 -04:00
Dane Everitt
33262cf34c
Set correct console frequency 2017-04-17 21:54:26 -04:00
Dane Everitt
e4ef8caf2d
Fix model not found error when editing an existing subuser. 2017-04-17 21:47:11 -04:00
Dane Everitt
205a10cd72
Fix display of subusers after creation. 2017-04-17 21:44:58 -04:00
Dane Everitt
619d3fe480
Fix autodeploy time checking. 2017-04-17 21:37:45 -04:00
Dane Everitt
a307ff4696
Should fix file editing in all bowsers 2017-04-17 21:22:36 -04:00
Dane Everitt
3acc7b338b
Allow deleting default allocation and setting new default at the same time. 2017-04-17 21:07:37 -04:00
Dane Everitt
776220636b
Fix password error when changing account email, closes #379 2017-04-17 20:35:07 -04:00
Dane Everitt
4011aeaa69
Fix password reset form not displaying correctly, closes #380 2017-04-17 20:30:42 -04:00
Dane Everitt
5359015248
Add link to front-end server view when managing server in Admin CP, closes #387 2017-04-17 20:24:17 -04:00
Dane Everitt
de923bbb83
Fix server deletion logic, and clean up suspend/unsuspend operations 2017-04-17 20:16:05 -04:00
Dane Everitt
bdfab16af3
Show SFTP/Docker username on server list and view. 2017-04-17 20:12:04 -04:00
Dane Everitt
91ce97a326
Fix missing service file, closes #390 2017-04-17 19:26:03 -04:00
kasper Franz
de436d3c83 show Suspended server in overview fixes #386 (#388)
* show Suspended server in overview fixes #386

* changed to use just check instead of being specific for 1
2017-04-17 14:26:45 -04:00
kasper Franz
2006920427 added a check if the task has run yet (#385)
* added a null check on the last_run

* corrected a mistake made when changing the file

* another mistake :/

* changed to be less specific and so it checks against the value instead of >
2017-04-17 12:03:11 -04:00
Dane Everitt
f59e4e0b68
Fix number in changelog... 2017-04-16 13:19:57 -04:00
Dane Everitt
60f3f2c5e5
Fix broken route causing inability to edit files within directory. 2017-04-16 13:18:53 -04:00
Jakob
7ef2368f9f Merge pull request #381 from KasperFranz/bug/deleteServer
change server to server_id since that is the new name
2017-04-16 13:40:42 +02:00
kasper Franz
f5810f068a change server to server_id since that is the new name 2017-04-16 13:37:40 +02:00
Dane Everitt
dcc2257fa7
Do things correctly... 2017-04-15 23:40:11 -04:00
Dane Everitt
b000b4da43
Fixes task migration issue, closes #378 2017-04-15 23:17:45 -04:00
Dane Everitt
f58858206e
Add console popout option.
Popout: https://s3.kelp.in/IrTyE.png
Menu: https://s3.kelp.in/JYwlC.png
Menu Hover: https://s3.kelp.in/cPtSf.png
2017-04-15 18:23:29 -04:00
Dane Everitt
eeeb4b7580
Update route javascript file. 2017-04-15 17:18:12 -04:00
Dane Everitt
7f48b757cd
Major cleanup of Ace editor files, as well as hopefully fixing broken editor issues. 2017-04-15 17:14:20 -04:00
Dane Everitt
3e7a72046e
Update changelog 2017-04-15 13:57:46 -04:00
Dane Everitt
1a87943f07
Fix missing CommandRepository statement 2017-04-15 13:54:34 -04:00
Dane Everitt
7f1a97184b
Un-butcher task system. 2017-04-15 13:52:43 -04:00
Dane Everitt
0fe9a4566e
Improve server and user model code to accept a specific user 2017-04-15 12:48:47 -04:00
Dane Everitt
2770e6d1b4
Remove old file, fix autoloading issues 2017-04-15 12:13:29 -04:00
Dane Everitt
96a75030ec
pre.8 is now beta.1 2017-04-14 20:51:37 -04:00
Dane Everitt
d20cb144be
Fix misnamed class 2017-04-14 20:46:50 -04:00
Dane Everitt
97cc30e502
Assorted fixes 2017-04-14 20:10:09 -04:00
Dane Everitt
7cead2635a
Spelling. 2017-04-14 17:55:25 -04:00
Dane Everitt
6a1c1c1215
Needle is not haystack. 2017-04-14 17:54:11 -04:00
Dane Everitt
5a95a3a044
Fix environment script to not explode when default option isn't in array. 2017-04-14 17:52:36 -04:00
Dane Everitt
d0ad3ad2f0
Just remove setup entirely.
Will document the commands needed to run  for upgrade vs. install.
2017-04-14 17:43:59 -04:00