Commit graph

40 commits

Author SHA1 Message Date
Dane Everitt
874e7afce3
Merge branch 'dane/sanctum' into v2 2021-08-07 16:19:19 -07:00
Dane Everitt
7169b481b1
Fix broken php-cs-fixer config 2021-08-07 16:00:14 -07:00
Dane Everitt
5b33a6a434
Update .gitignore 2021-08-07 09:21:19 -07:00
Dane Everitt
d60e8a193b
Very basic working implementation of sanctum for API validation 2021-08-04 21:15:16 -07:00
Matthew Penner
64110d84af tests(unit): add RequireTwoFactorAuthenticationTest 2021-07-18 11:28:14 -06:00
Matthew Penner
3a3caee715 yarn: upgrade to yarn 2 2021-07-11 14:01:42 -06:00
Dane Everitt
a043071e3c
Update to Laravel 8
Co-authored-by: Matthew Penner <me@matthewp.io>
2021-01-23 12:12:54 -08:00
Dane Everitt
a5d9faf6b2
Get database unit tests back into passing shape 2020-06-24 20:47:52 -07:00
Dane Everitt
d1880af18d
New login page design 2019-06-22 13:53:41 -07:00
Dane Everitt
136e4b5b7b
Fix some issues 2018-12-30 12:45:57 -08:00
Dane Everitt
b6205463db
Merge branch 'develop' into feature/vuejs 2018-09-23 13:14:46 -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
Dane Everitt
5ca13839cf
Merge branch 'develop' into feature/vue-serverview 2018-09-05 21:34:59 -07: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
63b76c60fb dockerfile changes 2018-08-04 19:21:51 -04:00
Asherslab
42e3eecf80 Add docker files 2018-07-08 11:19:24 -04:00
stanjg
941897f918
Deleted the coverage.xml file and added it to the .gitignore 2018-05-04 14:21:39 +02:00
Dane Everitt
eade81f89b
Untrack build assets 2018-04-07 14:06:30 -05:00
Dane Everitt
8d704ae5c8
Inital commit with gulp and base asset setup 2018-03-27 00:44:14 -05:00
Nils-Börge Margotti
85290ee3cd Update php to version 7.2 in vagrant file () 2018-02-25 10:56:47 -06:00
ShadowKitten
d8be167a9c Add support for allowing subusers to access SFTP. () 2018-02-17 16:10:44 -06:00
Dane Everitt
78c8b8d8ea
Upgrade PHPCS 2017-08-21 22:06:52 -05:00
Dane Everitt
65957e7ea5 Begin implementation of new request validation, closes 2017-06-03 18:41:35 -05:00
Dane Everitt
8c6e8912b1 Implement new php-cs-fixer into PHPStorm project to improve development 2017-06-03 17:05:31 -05:00
Jakob Schrettenbrunner
2de3243040 add docker compose to gitignore 2017-05-12 13:07:03 +02:00
Jakob Schrettenbrunner
f2f834af49 update gitignore to ignore docker files 2017-03-28 00:13:24 +02:00
Dane Everitt
c98d1dda26
Store sami configuration for others to use. 2017-03-19 19:51:26 -04:00
Dane Everitt
0312c974f5
Update doc blocks for all app/ 2017-03-19 19:36:50 -04:00
Dane Everitt
1852018397
Add back missing node creation page. 2017-03-15 21:38:09 -04:00
Dane Everitt
4730309589
Add IDE helper for all functions 2017-03-15 19:47:44 -04:00
Dane Everitt
871b735464
Ignore VSCode files 2017-03-11 14:44:18 -05:00
Jakob Schrettenbrunner
3a88deb97a Merge branch 'develop' into feature/new-theme
# Conflicts:
#	.gitignore
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js
#	public/themes/pterodactyl/js/frontend/files/filemanager.min.js.map
#	public/themes/pterodactyl/js/frontend/serverlist.js
#	resources/themes/pterodactyl/server/files/list.blade.php
2017-03-03 23:08:24 +01:00
Dane Everitt
e18391e98a
Commit composer lock and use config:cache for security purposes. 2017-02-02 15:01:15 -05:00
Jakob Schrettenbrunner
c62312b8af redesign parts of the file manager
ignore yarn.lock file
2017-01-27 00:44:59 +01:00
Dane Everitt
130aa6cc8a
Transpile ES6 to ES5 for filemanager. Closes 2017-01-03 17:32:23 -05:00
Dane Everitt
77198b48df
Support folders within folders for JS path 2016-10-06 17:27:30 -04:00
Dane Everitt
09d9f2a064 add setup command; closes 2016-01-16 00:37:08 -05:00
Dane Everitt
f8d13e311a Change homestead file method 2016-01-11 22:46:42 -05:00
Dane Everitt
24fadc0cb2 Add homestead support 2016-01-11 22:37:12 -05:00
Dane Everitt
1489f7a694 Initial Commit of Files
PufferPanel v0.9 (Laravel) is now Pterodactyl 1.0
2015-12-06 13:58:49 -05:00