Commit graph

3889 commits

Author SHA1 Message Date
Dane Everitt
b9c2148630
Merge pull request #1285 from parkervcp/feature/add-dockerfile 2018-09-18 21:41:16 -07:00
Dane Everitt
fefcc310d4
Merge branch 'develop' into feature/add-dockerfile 2018-09-18 21:40:30 -07:00
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
3188782ce7
Revert "Get ionicons imported"
This reverts commit 5404b81193.
2018-09-13 21:53:12 -07:00
Dane Everitt
bba8797f7b
Revert "Update navigation icons"
This reverts commit 63375d0f37.
2018-09-13 21:53:00 -07:00
Dane Everitt
63375d0f37
Update navigation icons 2018-09-13 21:23:13 -07:00
Dane Everitt
5404b81193
Get ionicons imported 2018-09-13 20:44:29 -07:00
Dane Everitt
201c8a7c4c
Make search work correctly when clicking on results 2018-09-11 22:24:48 -07:00
Dane Everitt
31092df5df
Show loading indicator when searching 2018-09-11 21:32:01 -07:00
Dane Everitt
0b0b80dc6d
Add search box to server pages 2018-09-11 21:25:02 -07:00
Dane Everitt
b1b6a7eecd
Biggerify the navigation 2018-09-11 20:08:01 -07:00
Dane Everitt
dae780249f
Less colors 2018-09-11 19:23:22 -07:00
Dane Everitt
395a2860e7
Start working on a better design for the server boxes on the dashboard 2018-09-05 22:55:59 -07:00
Dane Everitt
5c25edfdd4
format 2018-09-05 21:46:09 -07:00
Dane Everitt
b820542b02
Make the colors less strange looking 2018-09-05 21:45:33 -07:00
Dane Everitt
5ca13839cf
Merge branch 'develop' into feature/vue-serverview 2018-09-05 21:34:59 -07:00
Dane Everitt
a77897eb43
Merge branch 'release/v0.7.10' 2018-09-03 16:26:47 -07: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
9c11a9d0bd
Merge branch 'release/v0.7.10' 2018-09-03 16:06:26 -07:00
Dane Everitt
414b2f8f8c
Bump version for release 2018-09-03 16:01:10 -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
Dane Everitt
5c4d5f733f
Move some files around 2018-08-31 20:30:38 -07:00
Dane Everitt
b731659135
Finish up deletion logic 2018-08-26 14:11:18 -07:00
Dane Everitt
039650bf75
More animate 2018-08-26 14:05:10 -07:00
Dane Everitt
5170d40bb2
Cleaner animation 2018-08-26 14:03:43 -07:00
Dane Everitt
e906ada528
Better handling when deleting a database 2018-08-26 14:01:00 -07:00
Dane Everitt
0999ec93c3
More logic for deleting databases 2018-08-25 15:07:42 -07:00