153 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Jakob	f258a5c93d	Merge pull request #45 from clrxbl/patch-1 ... Shorten systemctl enable & start	2018-11-02 09:53:00 +01:00
Michael	12ed166c5c	Shorten systemctl enable & start	2018-11-01 20:55:26 +01:00
Lance Pioch	fcd0cf2b01	Merge pull request #44 from Ultra03/patch-1 ... Fix typo (0.6.S to 0.6.X)	2018-10-31 10:52:57 -04:00
Ultra03	dda3f419a9	Fix typo (0.6.S to 0.6.X)	2018-10-30 21:05:22 -07:00
Dane Everitt	c832db928a	Merge pull request #42 from cyrodii/patch-1 ... Fixing documentation error	2018-10-27 11:46:41 -07:00
Dane Everitt	2590d3db3c	Merge pull request #41 from tenten8401/patch-4 ... Add rudimentary Apache SSL configuration	2018-10-27 11:46:25 -07:00
Isaac A	8df45454b2	Fix capitalization	2018-10-26 08:01:55 -04:00
Isaac A	d81042da91	Add links to SSL certs	2018-10-26 07:59:53 -04:00
Jakob	64d8df7987	Merge pull request #40 from tenten8401/patch-3 ... Provide link to MySQL page	2018-10-25 23:29:52 +02:00
Jakob	ed22444b49	Merge pull request #38 from Ethereal739/patch-6 ... Adding Fedora	2018-10-25 23:25:14 +02:00
Riley	1b879ded72	Fixing documentation error ... Seeing as the rest of the documentation revolves around the usage of apt instead of apt-get the SSL certificate bit should as well.	2018-10-24 17:23:04 -04:00
Isaac A	0fb186468c	Update docs to reflect new apache config	2018-10-16 00:35:51 -04:00
Isaac A	342fa07eb4	Rudimentary apache SSL config file	2018-10-16 00:29:59 -04:00
Isaac A	f17dedd5be	Create apache-nossl.conf	2018-10-16 00:21:29 -04:00
Isaac A	167be5c9cb	Provide link to MySQL page	2018-10-08 08:52:47 -04:00
Thien Tran	58db90d97e	Update installing.md	2018-10-03 04:53:44 -04:00
Dane Everitt	81e1000716	release	2018-09-29 15:33:51 -07:00
Dane Everitt	81824ae9b6	Merge pull request #30 from BrightSkyz/patch-1 ... Add a fix for 18.04	2018-09-29 15:27:07 -07:00
Dane Everitt	aa5a8ce495	Merge pull request #35 from tenten8401/patch-2 ... Clear up OVH server warning	2018-09-29 14:33:46 -07:00
Dane Everitt	6044b2daa6	Merge pull request #32 from Ethereal739/patch-1 ... Replace LetsEncrypt with Certbot	2018-09-29 14:30:30 -07:00
Dane Everitt	3c9a4f30ec	Merge pull request #19 from tenten8401/patch-1 ... Use quick installation script for Docker	2018-09-29 14:26:24 -07:00
Dane Everitt	12405e933f	Merge branch 'master' of https://github.com/pterodactyl/documentation	2018-09-29 14:25:03 -07:00
Dane Everitt	4418969133	Bump version for release	2018-09-29 14:25:02 -07:00
Isaac A	f2aade229f	Clear up OVH server warning	2018-09-27 11:29:50 -04:00
Thien Tran	6c0386d342	Replace LetsEncrypt with Certbot ... Replacing LetsEncrypt as it is outdated.	2018-09-27 01:16:33 -04:00
BrightSkyz	d5e15dd505	Add a fix for 18.04	2018-09-23 11:35:02 -04:00
Jakob	0626999221	Merge pull request #25 from Mechtecs/patch-1 ... Provide info about how to stop the daemon	2018-09-11 10:58:51 +02:00
Max Schorradt	6a3d7e8c35	Provide info about how to stop the daemon	2018-09-05 20:02:05 +02:00
Dane Everitt	dd9de318eb	Bump versions	2018-09-03 16:04:49 -07:00
Lance Pioch	9e25abe679	Merge pull request #21 from Doc94/patch-1 ... Update kernel version number to avoid confusion in instructions	2018-08-20 11:38:04 -04:00
Lance Pioch	c09982b8ba	Update debian_8_docker.md	2018-08-20 11:36:44 -04:00
Pedro Arenas	6f1b49f039	Litle change for avoid confusion in instructions	2018-08-20 02:51:06 -03:00
Dane Everitt	fcbe3cd908	Merge branch 'master' of https://github.com/pterodactyl/documentation	2018-08-13 19:31:51 -07:00
Dane Everitt	2a873f5cbb	Bump daemon versions	2018-08-13 19:31:50 -07:00
Lance Pioch	1e8f116097	Merge pull request #18 from xion87/patch-1 ... Fix readme typo	2018-08-13 22:08:40 -04:00
Lance Pioch	56fa002682	Merge pull request #20 from JanDevDE/patch-1 ... Fix json format	2018-08-13 22:08:03 -04:00
Jan	e3765852a2	Fix json format	2018-08-13 22:49:52 +02:00
Isaac A	a5aca48e6b	Use quick installation script for Docker	2018-08-11 21:32:03 -04:00
Dane Everitt	6716e71028	Bump versions on daemon	2018-08-10 22:31:40 -07:00
Dane Everitt	b186f1422d	Bump versions for daemon release	2018-08-07 21:40:32 -07:00
Dane Everitt	6982e71fdd	Update pteroq service info	2018-08-07 21:39:59 -07:00
Dane Everitt	f68105face	Merge branch 'master' of https://github.com/pterodactyl/documentation	2018-08-06 20:58:41 -07:00
Dane Everitt	903b2ae749	Bump for release	2018-08-06 20:58:40 -07:00
Dane Everitt	5ab6a7b37f	Warn about minor version only	2018-08-06 11:28:50 -07:00
xion87	b2eed7f356	typo	2018-08-06 17:20:43 +02:00
Dane Everitt	88f44e0d76	Fix links to new version of daemon	2018-08-06 07:43:12 -07:00
Dane Everitt	f6e58d956f	Merge pull request #17 from Bl4ckSpr4y/patch-3 ... Change 0.6.0 to 0.6.1	2018-08-06 07:39:03 -07:00
mrkrabs	c563c3aec0	Change 0.6.0 to 0.6.1 ... https://i.unreliable.host/Discord_2018-08-06_17-31-47.png	2018-08-06 17:32:18 +03:00
Dane Everitt	e90bb19d90	Update 0.5_to_0.6.md	2018-08-05 22:32:14 -07:00
Dane Everitt	e16b9e0328	Fix restart command	2018-08-05 22:08:44 -07:00