Fixes for composer:

- ./vendor/ is being prepared by executing `utils/composer.phar install`, no
  need to have it around
- converted .gitignore to LF line-ending (more common over the whole project)
- no need to have them around ...

Signed-off-by: Roland Haeder <roland@mxchange.org>
This commit is contained in:
Roland Haeder 2017-04-02 21:29:06 +02:00 committed by Roland Häder
parent 8e42e797cc
commit 7525b8fefe
No known key found for this signature in database
GPG Key ID: B72F8185C6C7BD78

117
.gitignore vendored
View File

@ -1,61 +1,56 @@
favicon.* favicon.*
.htconfig.php .htconfig.php
.htpreconfig.php .htpreconfig.php
\#* \#*
include/jquery-1.4.2.min.js include/jquery-1.4.2.min.js
*.log *.log
*.out *.out
*.version* *.version*
favicon.* favicon.*
home.html home.html
addon addon
*.orig *~
*~ robots.txt
robots.txt
#ignore documentation, it should be newly built
#ignore documentation, it should be newly built doc/html
doc/html
#ignore reports, should be generted with every build
#ignore reports, should be generted with every build report/
report/
#ignore config files from eclipse, we don't want IDE files in our repository
#ignore config files from eclipse, we don't want IDE files in our repository .project
.project .buildpath
.buildpath .externalToolBuilders
.externalToolBuilders .settings
.settings #ignore OSX .DS_Store files
#ignore OSX .DS_Store files .DS_Store
.DS_Store
/nbproject/private/
/nbproject/private/
#ignore smarty cache
#ignore smarty cache /view/smarty3/compiled/
/view/smarty3/compiled/
#ignore cache folders
#ignore cache folders /privacy_image_cache/
/privacy_image_cache/ /photo/
/photo/ /proxy/
/proxy/ nbproject
nbproject
#ignore vagrant dir
#ignore vagrant dir .vagrant/
.vagrant/
#ignore local folder
#ignore local folder /local/
/local/
#ignore config files from Visual Studio
#ignore config files from Visual Studio /.vs/
/.vs/ /php_friendica.phpproj
/php_friendica.phpproj /php_friendica.sln
/php_friendica.sln /php_friendica.phpproj.user
/php_friendica.phpproj.user
#ignore things from transifex-client
#ignore things from transifex-client venv/
venv/
#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
#ignore Composer dependencies vendor/*
/vendor
/view/asset
#ignore config files from JetBrains
/.idea