Michael (Parker) Parker
|
1ae245ac82
|
Merge remote-tracking branch 'pterodactyl/release/v0.7.10' into feature/add-dockerfile
|
2018-09-16 13:46:45 -04:00 |
|
ayan4m1
|
9f6875ed61
|
log query exception message during settings boot
|
2018-09-16 13:20:57 -04:00 |
|
Michael (Parker) Parker
|
b370b2cb91
|
adding supervisord for queue workers
Added supervisord to run the queue worker,.
moved php-fpm and nginx to supervisord as well.
|
2018-09-15 21:22:13 -04:00 |
|
Dane Everitt
|
eaabe5bd6a
|
Merge pull request #1329 from ayan4m1/fix/1307
Revert "Update terminal.css"
|
2018-09-15 17:50:12 -07:00 |
|
ayan4m1
|
d24c61b472
|
Revert "Update terminal.css"
This reverts commit 955617d7ce.
|
2018-09-15 20:43:11 -04:00 |
|
Dane Everitt
|
d5f166d121
|
bump for release
|
2018-09-03 16:23:59 -07:00 |
|
Dane Everitt
|
c305320cc6
|
Remove debug
|
2018-09-03 16:23:27 -07:00 |
|
Dane Everitt
|
25f9876779
|
Update dependencies
|
2018-09-03 15:59:36 -07:00 |
|
Dane Everitt
|
f9542c98e2
|
Fix tests broken by bad namespaces
|
2018-09-03 15:59:30 -07:00 |
|
Dane Everitt
|
44a00c3957
|
Plop the languages into the project
|
2018-09-03 15:44:29 -07:00 |
|
Dane Everitt
|
3082a57a4d
|
Merge pull request #1128 from stanjg/feature/user-specific-language
Add support for user specific languages
|
2018-09-03 15:18:23 -07:00 |
|
Dane Everitt
|
fd49e524c8
|
Update middleware code
|
2018-09-03 15:17:53 -07:00 |
|
Dane Everitt
|
9706a8dc34
|
Update changelog
|
2018-09-03 15:14:59 -07:00 |
|
Dane Everitt
|
368b9892e1
|
Rename cn to zh for language
|
2018-09-03 15:14:19 -07:00 |
|
Dane Everitt
|
4d62e4c7b9
|
Merge branch 'develop' into pr/1128
|
2018-09-03 15:10:23 -07:00 |
|
Dane Everitt
|
c6112b4234
|
Fix tests
|
2018-09-03 14:59:00 -07:00 |
|
Dane Everitt
|
3bb9bf04e5
|
Pass the updated model through for updating node config, rather than old model, ref #1237
|
2018-09-03 14:54:50 -07:00 |
|
Dane Everitt
|
7ed9c7cb93
|
Correctly store changes to upload size limit, closes #1237
|
2018-09-03 14:53:58 -07:00 |
|
Dane Everitt
|
e404918bff
|
Dont limit length of variable values, closes #1264
|
2018-09-03 14:43:05 -07:00 |
|
Dane Everitt
|
5bd3f59455
|
Fix schedules running twice, closes #1288
|
2018-09-03 14:32:33 -07:00 |
|
Dane Everitt
|
413a22a3d5
|
Changes to job running to clean up code
|
2018-09-03 14:04:25 -07:00 |
|
Dane Everitt
|
a7943553d3
|
Fix namespacing
|
2018-09-03 14:04:16 -07:00 |
|
Dane Everitt
|
bcb3f5d5fa
|
Fix handling of times
|
2018-08-31 21:12:10 -07:00 |
|
Dane Everitt
|
178b8f8ce6
|
More logical time handling
|
2018-08-31 21:00:13 -07:00 |
|
Dane Everitt
|
e5636405f3
|
Drop carbon, use chronos
|
2018-08-31 20:52:15 -07:00 |
|
Dane Everitt
|
f3efe546da
|
Fix broken namespace for autoloader
|
2018-08-31 20:34:57 -07:00 |
|
Tom Chilvers
|
25454a98b8
|
changed link (#1299)
|
2018-08-23 10:34:27 -07:00 |
|
Tom Chilvers
|
1c6159f46b
|
Typo (#1298)
|
2018-08-23 10:34:04 -07:00 |
|
Michael (Parker) Parker
|
e24abe9626
|
changes per schrej's request
Lists the stock MariaDB Link instead of my old personal one.
Corrects an echo command in the entrypoint.
|
2018-08-18 07:32:01 -04:00 |
|
Michael (Parker) Parker
|
77dfd9815f
|
moved compose to example
moved the docker-compose script to an example and ignore docker-compose.yml
|
2018-08-14 00:14:13 -04:00 |
|
Michael (Parker) Parker
|
a4c54c4e47
|
updated docker-compose
updated docker-compose
|
2018-08-14 00:12:04 -04:00 |
|
Michael (Parker) Parker
|
47c100de2f
|
latest changes
|
2018-08-14 00:01:25 -04:00 |
|
Michael (Parker) Parker
|
87e125ddad
|
key:generate is f'd
|
2018-08-13 23:33:15 -04:00 |
|
mrkrabs
|
24b213fbc6
|
change smtp.google.com to smtp.gmail.com (#1281)
|
2018-08-13 10:00:05 -07:00 |
|
月光兔-lunarbunnys
|
a8373ec726
|
Add Simplified Chinese translation for the panel (#1263)
* Add Simplified Chinese translation for the panel
* Update passwords.php
* The pterodactyl theme incomplete translation.Part 1.
* Deleteing pterodactyl theme translation.
|
2018-08-06 17:15:03 -07:00 |
|
Michael (Parker) Parker
|
63b76c60fb
|
dockerfile changes
|
2018-08-04 19:21:51 -04:00 |
|
Jakob
|
962416445e
|
update shields (#1265)
|
2018-08-03 09:05:52 -07:00 |
|
Alex
|
5d9d4da5da
|
Use appropiate infinity signs (#1260)
|
2018-08-01 09:03:36 -07:00 |
|
ViViV_
|
ac71a56fd1
|
Adding variable for Server Map Selection [ARK SERVER] (#1230)
|
2018-07-21 10:40:51 -07:00 |
|
Michael (Parker) Parker
|
1ac13c82fa
|
more docker changes
|
2018-07-18 17:15:28 -04:00 |
|
Michael (Parker) Parker
|
b7da8532ba
|
Fixing install
Adding php fpm conf and fixing dockerfile
|
2018-07-18 15:31:35 -04:00 |
|
Dane Everitt
|
6dfaba9042
|
Merge pull request #1238 from jcsnider/develop
Treat white space in terminal output as preformatted...
|
2018-07-18 09:26:46 -07:00 |
|
Michael (Parker) Parker
|
5427b7e172
|
dockerfile changes
|
2018-07-18 12:15:33 -04: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 |
|
Lance Pioch
|
44a65b4b3c
|
Move to its own dir
|
2018-07-08 11:28:26 -04:00 |
|
Lance Pioch
|
7ef3b76499
|
Consolidate commands
|
2018-07-08 11:19:51 -04:00 |
|
Lance Pioch
|
925f28b29c
|
Update alpine version
|
2018-07-08 11:19:46 -04:00 |
|
Lance Pioch
|
0667b61abf
|
Combine and consolidate
|
2018-07-08 11:19:40 -04:00 |
|
Asherslab
|
a93a73ef4d
|
Moved files
|
2018-07-08 11:19:35 -04:00 |
|
Asherslab
|
737bae300c
|
Some Additions
|
2018-07-08 11:19:30 -04:00 |
|