Commit graph

4509 commits

Author SHA1 Message Date
Dane Everitt
20beb2f280 Fix error causing tasks to be un-deletable.
closes #786
2017-12-01 20:10:06 -06:00
Dane Everitt
fb7d8a9626 Merge branch 'feature/api-key-changes' into feature/api-v1 2017-11-26 13:27:39 -06:00
Dane Everitt
a10db204ab Misc fixes 2017-11-26 13:26:38 -06:00
Dane Everitt
4c57b5e8ee Merge branch 'develop' into feature/api-v1 2017-11-26 13:22:25 -06:00
Dane Everitt
80ddd5b659 Merge branch 'develop' into feature/api-key-changes 2017-11-26 13:20:25 -06:00
Dane Everitt
47f2ca0673 Fix incorrect CPU usage display for limited servers, closes #758 2017-11-26 13:17:40 -06:00
Dane Everitt
08a965d882
Merge pull request #785 from Pterodactyl/revert-777-feature/search-box-fix
Revert "Lengthen search box"
2017-11-26 13:06:42 -06:00
Dane Everitt
6a4d267c2a
Revert "Lengthen search box" 2017-11-26 13:06:33 -06:00
Dane Everitt
c5f4f4ab60
Merge pull request #777 from Pterodactyl/feature/search-box-fix
Lengthen search box
2017-11-26 13:03:25 -06:00
Dane Everitt
4c09f6fda9
Merge branch 'develop' into feature/search-box-fix 2017-11-26 13:03:18 -06:00
Dane Everitt
a710bdf457 Make a todo a todid, closes #774 2017-11-25 13:45:47 -06:00
Dane Everitt
9ee503b3c1 Fix error message formatting to match new style 2017-11-25 13:17:31 -06:00
Dane Everitt
20c1c74116 Fix issues with validation in admin CP for server variables, closes #780 2017-11-25 13:15:46 -06:00
Dane Everitt
0bb44a4972 Fix server startup dropdown for egg being incorrect, fixes #778 2017-11-25 12:27:08 -06:00
Dane Everitt
34db4102b9 Enable opcache on travis to speed up build time 2017-11-25 11:59:11 -06:00
Dane Everitt
44eedd594f
Merge pull request #781 from Pterodactyl/analysis-8KKlv9
Apply fixes from StyleCI
2017-11-23 15:10:47 -06:00
Dane Everitt
166c43c259 Apply fixes from StyleCI
[ci skip] [skip ci]
2017-11-23 21:08:43 +00:00
Dane Everitt
d4758efef8 Implement fix for console spam when using invalid environment variable values 2017-11-23 15:08:35 -06:00
Lance Pioch
674628cc01 Lengthen search box 2017-11-22 14:16:11 -05:00
Dane Everitt
1fcad8d86c
Merge pull request #772 from tenten8401/patch-1
Workaround for improper boolean handling
2017-11-21 13:55:13 -05:00
tenten8401
5d98fc327b
Workaround for improper boolean handling
Since laravel only takes 1, 0, true, false, "1", and "0" instead of allowing "true" and "false".
2017-11-20 09:47:49 -05:00
Dane Everitt
698c121e11
First round of API additions 2017-11-19 16:30:00 -06:00
Dane Everitt
bf9708fe4f
Add permissions checking to API middleware list 2017-11-19 15:23:37 -06:00
Dane Everitt
49379bd115
Pop some tests for new middleware in there. 2017-11-19 14:34:55 -06:00
Dane Everitt
45a153427e
Add new API middleware 2017-11-19 14:05:13 -06:00
Dane Everitt
47e14ccaae
API key UI changes and backend storage of the keys 2017-11-19 13:32:17 -06:00
Dane Everitt
69e67b5e2d
Push migration 2017-11-19 13:00:56 -06:00
Dane Everitt
3e8514b966
Merge pull request #768 from Pterodactyl/feature/auth-controller-cleanup
Push updates to login page, mostly UI enhancements.
2017-11-18 18:00:01 -05:00
Dane Everitt
699f0df8f4
Update readme 2017-11-18 16:59:20 -06:00
Dane Everitt
24d0ae18fd
Include permission for subusers to access the server console. 2017-11-18 16:50:58 -06:00
Dane Everitt
897338bfa7
Show socketio error messages 2017-11-18 16:50:08 -06:00
Dane Everitt
e6ab6de3e5
Merge pull request #737 from tenten8401/develop
Add rust as a supported nest and egg.
2017-11-18 16:30:15 -05:00
Dane Everitt
9a588cb6dc
Merge branch 'develop' into develop 2017-11-18 16:29:52 -05:00
Dane Everitt
6f52f4a614
Push updates to login page, mostly UI enhancements. 2017-11-18 15:09:58 -06:00
Dane Everitt
c7c2c1a45e
Implement changes to 2FA system (#761) 2017-11-18 13:35:33 -05:00
Dane Everitt
a0c96f2c15
Merge pull request #763 from Pterodactyl/feature/unused-imports
Remove unused imports
2017-11-18 13:35:00 -05:00
Dane Everitt
aa875c8361
Merge pull request #765 from Pterodactyl/feature/namespace-wrong
Fix incorrect namespace
2017-11-18 13:32:48 -05:00
Dane Everitt
29ee712506
Merge pull request #767 from TheProKiller756/patch-2
Exclamative sentence
2017-11-18 13:32:26 -05:00
Dane Everitt
da930892e1
Merge pull request #766 from TheProKiller756/patch-1
Fix maximum size translation to get it working
2017-11-18 13:31:08 -05:00
TheProKiller756
2782985ce2
Update auth.php 2017-11-18 15:28:53 +01:00
TheProKiller756
5d4f8ca9ab
Fix maximum size translation to get it working
Fixed that :size was translated and it doesn't work
2017-11-18 15:26:28 +01:00
Lance Pioch
c7f01d66d5 Fix namespace 2017-11-17 20:02:09 -05:00
Lance Pioch
c2408a28d8 Remove unused imports 2017-11-17 18:08:10 -05:00
Lance Pioch
559aa51f01 Add links to beta (#756) 2017-11-15 21:49:07 -05:00
Lance Pioch
f94e4c15b0 Replace magic numbers with constants (#754)
* Replace magic numbers with constants
2017-11-12 18:16:54 -05:00
Dane Everitt
6043114f38
Text cleanup for settings 2017-11-11 15:58:42 -06:00
Dane Everitt
26eeffd764
Fix bug preventing changing of the server startup on first save attempt. 2017-11-11 15:07:01 -06:00
Dane Everitt
1800d1c095
Fix bug preventing variables with quotes from rendering in the ACP. 2017-11-11 13:56:38 -06:00
Dane Everitt
81869bd5f2
Fix allocation alias setting 2017-11-10 21:47:43 -06:00
Dane Everitt
1740b8dfb5
Revert change to node allocation selection query 2017-11-10 21:42:24 -06:00