[BUGFIX] .htaccess: Rename file

[friendica.git] / .gitignore

diff --git a/.gitignore b/.gitignore
old mode 100755 (executable)
new mode 100644 (file)
index 2531fe4..9de700d
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 favicon.*
 .htconfig.php
+.htpreconfig.php
 \#*
 include/jquery-1.4.2.min.js
 *.log
@@ -9,9 +10,10 @@ favicon.*
 home.html
 addon
 *~
+robots.txt
 
-#ignore documentation, it should be newly built 
-doc/api
+#ignore documentation, it should be newly built
+doc/html
 
 #ignore reports, should be generted with every build
 report/
@@ -21,3 +23,42 @@ report/
 .buildpath
 .externalToolBuilders
 .settings
+
+#ignore OSX .DS_Store files
+.DS_Store
+
+#ignore NetBeans IDE's private files (at least)
+/nbproject/private/
+
+#ignore smarty cache
+/view/smarty3/compiled/
+
+#ignore cache folders
+/privacy_image_cache/
+/photo/
+/proxy/
+nbproject
+
+#ignore vagrant dir
+.vagrant/
+
+#ignore local folder
+/local/
+
+#ignore config files from Visual Studio
+/.vs/
+/php_friendica.phpproj
+/php_friendica.sln
+/php_friendica.phpproj.user
+
+#ignore things from transifex-client
+venv/
+
+#ignore all in 'vendor' as `utils/composer.phar install` will bring it back
+vendor/*
+
+#ignore config files from JetBrains
+/.idea
+
+#ignore addons/ directory
+addons/