Merge branch '3.3.x'

This commit is contained in:
Marc Alexander 2021-10-29 21:29:58 +02:00
commit aee5e373bc
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

33
.gitignore vendored
View file

@ -1,36 +1,57 @@
*~ # Excludes cache
/phpunit.xml
/phpBB/cache/* /phpBB/cache/*
!/phpBB/cache/.htaccess !/phpBB/cache/.htaccess
!/phpBB/cache/index.html !/phpBB/cache/index.html
/phpBB/composer.phar
# Excludes user data
/phpBB/config*.php* /phpBB/config*.php*
/phpBB/ext/* /phpBB/ext/*
/phpBB/files/* /phpBB/files/*
/phpBB/images/avatars/gallery/* /phpBB/images/avatars/gallery/*
/phpBB/images/avatars/upload/* /phpBB/images/avatars/upload/*
/phpBB/images/ranks/* /phpBB/images/ranks/*
/phpBB/install/schemas/schema.json /phpBB/store/*
# Excludes all custom langages
/phpBB/language/* /phpBB/language/*
!/phpBB/language/en !/phpBB/language/en
/phpBB/store/*
# Excludes all custom styles
/phpBB/styles/* /phpBB/styles/*
!/phpBB/styles/prosilver !/phpBB/styles/prosilver
!/phpBB/styles/prosilver/theme/en !/phpBB/styles/prosilver/theme/en
!/phpBB/styles/prosilver/theme/images !/phpBB/styles/prosilver/theme/images
!/phpBB/styles/all !/phpBB/styles/all
node_modules
# Excludes all custom env
/phpBB/config/*
!/phpBB/config/default
!/phpBB/config/development
!/phpBB/config/installer
!/phpBB/config/production
!/phpBB/config/test
!/phpBB/config/.htaccess
# Excludes vendors
/phpBB/vendor /phpBB/vendor
/phpBB/vendor-ext/* /phpBB/vendor-ext/*
!/phpBB/vendor-ext/.git-keep !/phpBB/vendor-ext/.git-keep
/phpBB/composer-ext.json /phpBB/composer-ext.json
/phpBB/composer-ext.lock /phpBB/composer-ext.lock
# Excludes test / dev files
/phpunit.xml
/phpBB/composer.phar
/tests/phpbb_unit_tests.sqlite* /tests/phpbb_unit_tests.sqlite*
/tests/test_config*.php /tests/test_config*.php
/tests/tmp/* /tests/tmp/*
/tests/vendor /tests/vendor
/vagrant/phpbb-install-config.yml /vagrant/phpbb-install-config.yml
.vagrant .vagrant
node_modules
# Excludes IDE / editors files
*~
.idea .idea
*.DS_Store* *.DS_Store*
/.vscode /.vscode