diff options
| author | Paolo T <tuscanhobbit@users.noreply.github.com> | 2015-03-22 16:34:40 +0100 |
|---|---|---|
| committer | Paolo T <tuscanhobbit@users.noreply.github.com> | 2015-03-22 16:34:40 +0100 |
| commit | 82fb1ca0caaae72b77b641d22e51d5ae1b188183 (patch) | |
| tree | a2ecee4e65bc80300c62b5b327965b8118117ad3 /.gitignore | |
| parent | ff5c3b009fa25e87e294cd458d3de4b677270c64 (diff) | |
| parent | e345d6793d5f6910dd230f661ca5d1a837b1b504 (diff) | |
| download | volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.tar.gz volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.tar.bz2 volse-hubzilla-82fb1ca0caaae72b77b641d22e51d5ae1b188183.zip | |
Merge pull request #8 from friendica/master
merging red master into nuvola.red
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 88 |
1 files changed, 46 insertions, 42 deletions
diff --git a/.gitignore b/.gitignore index e6c628e74..b01074eaa 100755 --- a/.gitignore +++ b/.gitignore @@ -1,62 +1,66 @@ -favicon.* -.htconfig.php -\#* -include/jquery-1.4.2.min.js +## Ignore tmp, backup, logs and other junk files +*~ *.gz -*.log *.out -*.version* -home.html -addon -*~ -.*.swp -compiled/ -custom/ -/store/ - -# site apps -apps/ - +*.bak +*.swp +*.log +*.lock +*.kate-swp +#Ignore emacs tempfiles +\#* # patch attempts *.orig *.rej +# OSX .DS_Store files +.DS_Store +Thumbs.db + +## Ignore RedMatrix site specific files and folders +.htconfig.php +favicon.* +addon/ +custom/ +/store/ +# site apps +apps/ +# default startpage +home.html +# Ignore site TOS +doc/SiteTOS.md # themes except for redbasic view/theme/* ! view/theme/redbasic - +# site theme schemas +view/theme/redbasic/schema/default.php +# Doxygen API documentation, run 'doxygen util/Doxyfile' to generate it +doc/html/ +# zotsh configuration files +.zotshrc # external repositories for themes/addons extend/ -# composer files (for fetching sabre) -composer.* - -#ignore documentation, it should be newly built -doc/api -#ignore reports, should be generted with every build -report/ - -#ignore config files from eclipse, we don't want IDE files in our repository +## exclude IDE files +# config files and folders from Eclipse .project .buildpath .externalToolBuilders -.settings - -#ignore OSX .DS_Store files -.DS_Store - -#netbeans project folder -nbproject - -#Kdevelop project files +.settings/ +# NetBeans project folder +nbproject/ +# Kdevelop project files *.kdev4 +# PHPStorm +.idea/ -# Ignore site TOS -doc/SiteTOS.md -#Ingore site theme schemas -view/theme/redbasic/schema/default.php +# composer files (at the moment composer is not officially supported and only used to add SabreDAV, we should add these) +composer.* -#Ignore emacs tempfiles -.#* +# When we include composer we should exclude vendor/ +#vendor/ +# Exclude at least some vendor test files, examples, etc. +vendor/sabre/*/tests/ +vendor/sabre/*/examples/ |