Commit graph

2008 commits

Author SHA1 Message Date
Dane Everitt
f8a5a082af Merge pull request from Pterodactyl/release/v0.6.4
Update master, because I forgot it even exists...
2017-10-05 00:21:50 -05:00
Dane Everitt
29cfae86b1 Merge branch 'develop' into feature/service-export-import 2017-10-05 00:17:17 -05:00
Dane Everitt
b450e43f3b Update CONTRIBUTING.md 2017-10-05 00:14:42 -05:00
Dane Everitt
953f14b4e1 Update CONTRIBUTING.md 2017-10-05 00:14:36 -05:00
Dane Everitt
46aeca43d8 Update CONTRIBUTING.md 2017-10-05 00:13:10 -05:00
Dane Everitt
fbd5c25ed0
Finalize tests 2017-10-04 23:52:25 -05:00
Dane Everitt
609bf32843
Add test for service option exporter 2017-10-04 23:42:04 -05:00
Dane Everitt
d95a63c09b
Today Dane learned about Mockery::subset, tomorrow we take over Canada.
In other news, why could no one have mentioned this a few months ago. Would have been nice.
2017-10-04 22:41:15 -05:00
kasper Franz
d7518d2a97 updated vagrant provision to be using the new namespace ()
* updated to use the new commands
2017-10-04 17:05:14 -05:00
Dane Everitt
3e689cf212
Please fix failing tests? 2017-10-03 23:57:13 -05:00
Dane Everitt
29ac1662b6
Fix failing tests 2017-10-03 23:54:24 -05:00
Dane Everitt
8952043600
Fix some test runner issues 2017-10-03 23:36:39 -05:00
Dane Everitt
9b79d9c756
Delete service variables when the option is deleted. 2017-10-03 23:33:46 -05:00
Dane Everitt
6269a08db7
Finalize service option import/export 2017-10-03 23:31:04 -05:00
Dane Everitt
d608c313c3
Complete the service option export configuration 2017-10-03 20:18:27 -05:00
TrixterTheTux
6482f79088 Grant execute privilege ()
closes 
2017-10-03 12:53:28 -10:00
Dane Everitt
0d739257a9
First pass at XML exporter for services 2017-10-03 00:01:04 -05:00
Dane Everitt
12faf80faf
Disable seeding until more complete 2017-10-02 22:56:12 -05:00
Dane Everitt
ae671e6b19
Begin updating UI 2017-10-02 22:51:13 -05:00
Dane Everitt
493c5888a3
Migration change 2017-10-02 22:03:01 -05:00
Dane Everitt
220789a4b9
Push migrations to change existing service structure 2017-10-02 20:54:22 -05:00
Dane Everitt
92ca84a37f
Remove unused controller 2017-10-02 20:03:47 -05:00
Dane Everitt
b1834307d5
Update demon routes to use /v1/ 2017-09-30 21:00:24 -05:00
Dane Everitt
15d38ce823
Add ability to switch between new and existing daemon 2017-09-30 19:23:44 -05:00
Dane Everitt
281337943f
Fix SQL call 2017-09-30 19:04:36 -05:00
Dane Everitt
1216f950e2
Prevent deletion of options that have children attached to them.
closes 
2017-09-30 12:54:09 -05:00
Dane Everitt
d5bf8734ef
Add unit tests for RunTaskJob. 2017-09-30 12:40:07 -05:00
Dane Everitt
238ce435d6
interface_exists does not work how I expected, switch to is_subclass_of 2017-09-30 12:06:16 -05:00
Dane Everitt
048784607d
Minor bug fixes 2017-09-30 11:45:24 -05:00
Dane Everitt
28d838eccd
Fix subuser auth token again 2017-09-29 21:57:36 -05:00
Dane Everitt
0e0a8d4347
Fix 404 when trying to view a server 2017-09-29 21:54:00 -05:00
Dane Everitt
fb7ef2d775
test post please ignore 2017-09-26 22:54:34 -05:00
Dane Everitt
65d63804ab
Pass in what the test says it passes in. 2017-09-26 22:23:19 -05:00
Dane Everitt
774c9680a3
More test suite coverage 2017-09-26 22:16:26 -05:00
Dane Everitt
8908a758ca
More tests for daemon keys 2017-09-26 20:49:05 -05:00
Dane Everitt
85e35f0bdf
More tests 2017-09-25 23:46:36 -05:00
Dane Everitt
6efecaeb69
Merge branch 'develop' into feature/api-daemon-changes 2017-09-25 21:55:02 -05:00
Dane Everitt
6915ecb4f1
Literally fix everything. 💯 2017-09-25 21:53:44 -05:00
Dane Everitt
fb8a26f141
Merge branch 'develop' into feature/api-daemon-changes 2017-09-25 21:46:44 -05:00
Dane Everitt
e56f4cdd33
Update license headers on files. 2017-09-25 21:43:01 -05:00
Dane Everitt
75fd3d985c Merge pull request from lancepioch/class-string
Use class string instead of magic string
2017-09-25 16:03:36 -10:00
Dane Everitt
1a88b00675
Update CHANGELOG 2017-09-25 21:02:52 -05:00
Lance Pioch
09d958249d Add togglable 2FA user requirements () 2017-09-25 15:58:16 -10:00
Lance Pioch
6ffa4e62e0 Merge branch 'develop' into class-string 2017-09-25 11:10:50 -04:00
Dane Everitt
55ae9138f6
Fix failing builds due to SQL changes 2017-09-24 22:34:30 -05:00
Dane Everitt
dd456a4c9c
Fix all currently failing tests 2017-09-24 22:28:16 -05:00
Lance Pioch
02cabf73a0 Use class string instead of magic string 2017-09-24 22:59:34 -04:00
Dane Everitt
bc0d0fd6fa
Fix failing migrations 2017-09-24 21:22:14 -05:00
Dane Everitt
3a8bea9588
Fix failing migrations 2017-09-24 21:20:01 -05:00
Dane Everitt
3aa6e4e74e Merge pull request from lancepioch/middleware-changes
Use proper route name instead of using class in route file
2017-09-24 16:14:22 -10:00