Merge remote-tracking branch 'upstream/master'

Conflicts:
	CSharp.gitignore
	VB.Net.gitignore
This commit is contained in:
James Cowgill 2013-11-04 14:39:21 +00:00
commit 3523237d7b
69 changed files with 453 additions and 313 deletions

View File

@ -3,8 +3,9 @@ bin/
bin-debug/
bin-release/
# Project property files
.actionScriptProperties
.flexProperties
# Other files and folders
.settings/
.project
# Project files, i.e. `.project`, `.actionScriptProperties` and `.flexProperties`
# should NOT be excluded as they contain compiler settings and other important
# information for Eclipse / Flash Builder.

View File

@ -18,3 +18,12 @@ local.properties
# Eclipse project files
.classpath
.project
# Proguard folder generated by Eclipse
proguard/
# Intellij project files
*.iml
*.ipr
*.iws
.idea/

View File

@ -0,0 +1,3 @@
# Build folder and log file
build/
build.log

16
Bancha.gitignore Normal file
View File

@ -0,0 +1,16 @@
#Logs
application/logs/*.php
# Content types
/application/xml/types/*.xml
# Custom builds and generated php files
/core/documentation/build
/core/views/admin/content/translations.php
# Attachs and cache files #
*.tmp
/attach/cache/
/attach/
/application/cache/_bancha/*.css
/application/cache/_bancha/*.js

View File

@ -2,11 +2,20 @@
*.slo
*.lo
*.o
*.obj
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app

View File

@ -1,14 +1,19 @@
# Object files
*.o
*.ko
*.obj
# Libraries
*.lib
*.a
# Shared objects (inc. Windows DLLs)
*.dll
*.so
*.so.*
*.dylib
# Executables
*.exe
*.out
*.app

3
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,3 @@
Since this repo includes a large and diverse number of programming languages, frameworks, editors, and ecosystems, it's *very helpful* if you can provide a link to information supporting your pull request. Up-to-date, canonical documentation that mentions the files to be ignored is best.
This ensures we can efficiently go through pull requests and keep quality high.

View File

@ -1,97 +0,0 @@
# Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
[Bb]in/
[Oo]bj/
# mstest test results
TestResults
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
# User-specific files
*.suo
*.user
*.sln.docstates
# Build results
[Dd]ebug/
[Rr]elease/
x64/
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.vspscc
*.vssscc
.builds
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
# Visual Studio profiler
*.psess
*.vsp
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*
# NCrunch
*.ncrunch*
.*crunch*.local.xml
# Installshield output folder
[Ee]xpress
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish
# Publish Web Output
*.Publish.xml
# Others
[Bb]in
[Oo]bj
sql
TestResults
[Tt]est[Rr]esult*
*.Cache
ClientBin
[Ss]tyle[Cc]op.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects
# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML

View File

@ -1,5 +1,7 @@
tmp/*
config/database.php
[Cc]onfig/core.php
[Cc]onfig/database.php
app/tmp/*
app/config/database.php
!empty
app/[Cc]onfig/core.php
app/[Cc]onfig/database.php
!empty

View File

@ -1,2 +1,3 @@
config/site.php
files/cache/*
files/tmp/*

View File

@ -1,4 +1,3 @@
*.vo
*.glob
*.v.d

4
Dart.gitignore Normal file
View File

@ -0,0 +1,4 @@
.DS_Store
packages
.project
pubspec.lock

View File

@ -7,4 +7,4 @@ __history
*.map
*.exe
*.dll
bin/*
bin/*

View File

@ -1,23 +1,29 @@
sites/default/files
sites/default/private
sites/default/settings.php
# Ignore configuration files that may contain sensitive information.
sites/*/*settings*.php
# Ignore paths that contain generated content.
cache/
files/
/README.txt
sites/*/files
sites/*/private
# Ignore default text files
.htaccess
robots.txt
/CHANGELOG.txt
/COPYRIGHT.txt
/INSTALL*.txt
/LICENSE.txt
/MAINTAINERS.txt
/UPGRADE.txt
robots.txt
/README.txt
sites/all/README.txt
sites/all/modules/README.txt
sites/all/themes/README.txt
.htaccess
#for non core developer
#only include "sites" folder without exclusions before
# Ignore everything but the "sites" folder ( for non core developer )
web.config
authorize.php
cron.php
index.php
install.php
@ -29,4 +35,3 @@ xmlrpc.php
/profiles
/scripts
/themes

36
Eagle.gitignore Normal file
View File

@ -0,0 +1,36 @@
# Ignore list for Eagle, a PCB layout tool
# Backup files
*.s#?
*.b#?
*.l#?
# Eagle project file
# It contains a serial number and references to the file structure
# on your computer.
# comment the following line if you want to have your project file included.
eagle.epf
# CAM files
*.$$$
*.cmp
*.ly2
*.l15
*.sol
*.plc
*.stc
*.sts
*.crc
*.crs
*.dri
*.drl
*.gpi
*.pls
*.drd
*.drd.*
*.info
*.eps

View File

@ -1,6 +1,6 @@
.eunit
deps
priv
*.o
*.beam
*.plt
*.plt
erl_crash.dump

View File

@ -12,4 +12,4 @@ images/pm_attachments/
sized/
thumbs/
_thumbs/
*/expressionengine/cache/*
*/expressionengine/cache/*

View File

@ -11,4 +11,3 @@
# Some versions of Finale have a bug and randomly save extra copies of
# the music source as "<Filename> copy.mus"
*copy.mus

View File

@ -1,4 +1,4 @@
.project
.settings
salesforce.schema
Referenced Packages
Referenced Packages

View File

@ -14,4 +14,3 @@ gwt-unitCache/
# more caches and things from deploy #
war/WEB-INF/deploy/
war/WEB-INF/classes/

View File

@ -6,8 +6,10 @@
*.zip
*.gz
*.bzip
*.bz2
*.xz
*.lzma
*.cab
#packing-only formats
*.iso
@ -19,4 +21,7 @@
*.gem
*.egg
*.deb
*.rpm
*.rpm
*.msi
*.msm
*.msp

View File

@ -1,4 +1,4 @@
/CVS/*
*/CVS/*
.cvsignore
*/.cvsignore
*/.cvsignore

View File

@ -1 +1 @@
*.esproj
*.esproj

View File

@ -1,2 +1,2 @@
bin/
bin-debug/
bin-debug/

View File

@ -2,3 +2,4 @@
*.ipr
*.iws
.idea/
out/

View File

@ -1,6 +1 @@
.*
!.gitignore
*~
# KDE
.directory

View File

@ -9,3 +9,8 @@
# OSX / *nix default autosave extension
*.m~
# Compiled MEX binaries (all platforms)
*.mex*
# Simulink Code Generation
slprj/

View File

@ -1,4 +1,9 @@
.DS_Store
.AppleDouble
.LSOverride
# Icon must ends with two \r.
Icon
# Thumbnails
._*

View File

@ -0,0 +1 @@
.idea/

4
Global/PyCharm.gitignore Normal file
View File

@ -0,0 +1,4 @@
# PyCharm
# http://www.jetbrains.com/pycharm/webhelp/project.html
.idea
.iml

View File

@ -1,2 +1,2 @@
### SASS Ignores - "Sassy CSS" http://sass-lang.com/
.sass-cache
*.sass-cache

View File

@ -4,4 +4,4 @@
target/
lib_managed/
src_managed/
project/boot/
project/boot/

View File

@ -1,3 +1,2 @@
# SublimeText project files
/*.sublime-project
*.sublime-workspace

View File

@ -1,5 +1,14 @@
# Ignore tags created by etags and ctags
# Ignore tags created by etags, ctags, gtags (GNU global) and cscope
TAGS
!TAGS/
tags
!tags/
gtags.files
GTAGS
GRTAGS
GPATH
cscope.files
cscope.out
cscope.in.out
cscope.po.out

View File

@ -0,0 +1,7 @@
# Virtualenv
# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
.Python
[Bb]in
[Ii]nclude
[Ll]ib
[Ss]cripts

View File

@ -1,8 +1,15 @@
# Windows image file caches
Thumbs.db
Thumbs.db
ehthumbs.db
# Folder config file
Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msm
*.msp

View File

@ -1,3 +1,6 @@
.*.sw[a-z]
.*.s[a-w][a-z]
.s[a-w][a-z]
*.un~
Session.vim
.netrwhist
*~

View File

@ -41,4 +41,3 @@
# other
*.iws

View File

@ -393,4 +393,4 @@ tmp/*
configuration.php
index.php
joomla.xml
*.txt
*.txt

View File

@ -1,2 +1,2 @@
application/cache/*
application/logs/*
application/logs/*

19
LICENSE Normal file
View File

@ -0,0 +1,19 @@
Copyright (c) 2013 GitHub, Inc.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.

View File

@ -3,9 +3,13 @@
*.alg
*.aux
*.bbl
*.bcf
*.blg
*-blx.aux
*-blx.bib
*.dvi
*.fdb_latexmk
*.fls
*.glg
*.glo
*.gls
@ -29,3 +33,4 @@
*.toc
*.vrb
*.xdy
*.tdo

View File

@ -2,4 +2,5 @@ pom.xml
*jar
/lib/
/classes/
/targets/
.lein-deps-sum

View File

@ -18,4 +18,4 @@ install.php
/modules/shop/*
/modules/system/*
/modules/users/*
# add content_*.php if you don't want erase client changes to content
# add content_*.php if you don't want erase client changes to content

View File

@ -1,2 +1,2 @@
app/libraries/*
app/resources/tmp/*
libraries/*
resources/tmp/*

View File

@ -12,3 +12,4 @@ logs
results
npm-debug.log
node_modules

View File

@ -1,5 +1,6 @@
# Xcode
build/*
.DS_Store
*/build/*
*.pbxuser
!default.pbxuser
*.mode1v3
@ -8,9 +9,14 @@ build/*
!default.mode2v3
*.perspectivev3
!default.perspectivev3
*.xcworkspace
!default.xcworkspace
xcuserdata
*.xccheckout
profile
*.moved-aside
DerivedData
DerivedData
.idea/
*.hmap
*.xccheckout
#CocoaPods
Pods

View File

@ -4,6 +4,7 @@ _build/
cover_db/
inc/
Build
!Build/
Build.bat
.last_cover_stats
Makefile

View File

@ -1,9 +1,3 @@
# Extracted from https://github.com/ulrich/macaron-factory/blob/master/.gitignore
# Ignore all dotfiles...
.*
# except for .gitignore
!.gitignore
# Ignore Play! working directory #
db
eclipse
@ -12,7 +6,11 @@ log
logs
modules
precompiled
project/project
project/target
target
tmp
test-result
server.pid
modules
*.iml
*.eml

34
Plone.gitignore Normal file
View File

@ -0,0 +1,34 @@
*~
*.pyc
*.pyo
*.tmp*
*.mo
*.egg
*.EGG
*.egg-info
*.EGG-INFO
*.kpf
*.swp
*.wpr
.*.cfg
.installed.cfg
.mr.developer.cfg
.hg/
.bzr/
.svn/
.project
.pydevproject
bin/
build/
develop-eggs/
downloads/
eggs/
fake-eggs/
parts/
dist/
var/
# OSX
.DS_Store

7
Processing.gitignore Normal file
View File

@ -0,0 +1,7 @@
.DS_Store
applet
application.linux32
application.linux64
application.windows32
application.windows64
application.macosx

View File

@ -17,6 +17,7 @@ develop-eggs
.installed.cfg
lib
lib64
__pycache__
# Installer logs
pip-log.txt
@ -26,9 +27,10 @@ pip-log.txt
.tox
nosetests.xml
#Translations
# Translations
*.mo
#Mr Developer
# Mr Developer
.mr.developer.cfg
.project
.pydevproject

20
Qt.gitignore Normal file
View File

@ -0,0 +1,20 @@
# C++ objects and libs
*.slo
*.lo
*.o
*.a
*.la
*.lai
*.so
*.dll
*.dylib
# Qt-es
*.pro.user
*.pro.user.*
moc_*.cpp
qrc_*.cpp
Makefile
*-build-*

View File

@ -2,4 +2,4 @@
.Rhistory
# Example code in package build process
*-Ex.R
*-Ex.R

View File

@ -15,6 +15,18 @@ For more information on gitignore: [gitignore(5)][g5]
[pr]: http://help.github.com/pull-requests/
[g5]: http://man.cx/gitignore
## Pull Requests
Since this repo includes a large and diverse
number of programming languages, frameworks, editors,
and ecosystems, it's **very helpful** if you can provide
a link to information supporting your pull request.
Up-to-date, canonical documentation that mentions the files
to be ignored is best.
This ensures we can efficiently go through pull requests
and keep quality high.
## Global Ignores
git has a global configuration that applies rules to all of

View File

@ -3,6 +3,7 @@
.sass-cache
capybara-*.html
.rspec
.rvmrc
/.bundle
/vendor/bundle
/log/*
@ -13,4 +14,6 @@ capybara-*.html
/spec/tmp/*
**.orig
rerun.txt
pickle-email-*.html
pickle-email-*.html
.project
config/initializers/secret_token.rb

13
RubyMotion.gitignore Normal file
View File

@ -0,0 +1,13 @@
.repl_history
build
tags
# common annoyance editors
.DS_Store
nbproject
.redcar
*.swp
*.swo
~
.eprj

View File

@ -2,6 +2,7 @@
*.log
# sbt specific
.lib/
dist/*
target/
lib_managed/
@ -10,4 +11,4 @@ project/boot/
project/plugins/project/
# Scala-IDE specific
.scala_dependencies
.scala_dependencies

8
Sdcc.gitignore Normal file
View File

@ -0,0 +1,8 @@
# SDCC stuff
*.lnk
*.lst
*.map
*.mem
*.rel
*.rst
*.sym

View File

@ -1,13 +1,24 @@
/bootstrap/data
/bootstrap/tmp
/classes/ # all class files
/dist/ # contains generated war files for deployment
/exploded-archives/ # war content generation during deploy (or explode)
/test-build/ # test compilation (ant target for Seam)
/test-output/ # test results
/test-report/ # test report generation for, e.g., Hudson
/target/ # maven output folder
temp-testng-customsuite.xml # generated when running test cases under Eclipse
/classes/
/dist/
/exploded-archives/
/test-build/
/test-output/
/test-report/
/target/
temp-testng-customsuite.xml
# based on http://stackoverflow.com/a/8865858/422476 I am removing inline comments
#/classes/ all class files
#/dist/ contains generated war files for deployment
#/exploded-archives/ war content generation during deploy (or explode)
#/test-build/ test compilation (ant target for Seam)
#/test-output/ test results
#/test-report/ test report generation for, e.g., Hudson
#/target/ maven output folder
#temp-testng-customsuite.xml generated when running test cases under Eclipse
# Thanks to @VonC and @kraftan for their helpful answers on a related question
# on StackOverflow.com:

View File

@ -12,4 +12,4 @@ lib/model/doctrine/base/Base*
lib/model/doctrine/*Plugin/base/Base*
lib/model/om/*
lib/model/map/*
web/*Plugin/*
web/*Plugin/*

18
Typo3.gitignore Normal file
View File

@ -0,0 +1,18 @@
## Typo3
# Ignore serveral upload and file directories.
/fileadmin/user_upload/
/fileadmin/_temp_/
/uploads/
# Ignore cache
/typo3conf/temp_CACHED*
/typo3conf/temp_fieldInfo.php
# Ignore local config which overrides typo3 config.
# You should include your local stuff with `@include('localconf_local.php');` at the end of localconf.php.
# See http://stackoverflow.com/questions/11905360/how-best-to-manage-typo3-installations-using-git for details.
/typo3conf/localconf_local.php
# Ignore system folders, you should have them symlinked.
# If not comment out the following two entries.
/typo3/
/t3lib/
# Ignore temp directory.
/typo3temp/

View File

@ -1,98 +0,0 @@
# Build and Object Folders
bin/
obj/
#User Specific Files
*.user
*.suo
## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
# User-specific files
*.suo
*.user
*.sln.docstates
# Build results
[Dd]ebug/
[Rr]elease/
x64/
*_i.c
*_p.c
*_i.h
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.vspscc
*.vssscc
.builds
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
# Visual Studio profiler
*.psess
*.vsp
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*
# NCrunch
*.ncrunch*
.*crunch*.local.xml
# Installshield output folder
[Ee]xpress
# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish
# Publish Web Output
*.Publish.xml
# Others
[Bb]in
[Oo]bj
sql
TestResults
[Tt]est[Rr]esult*
*.Cache
ClientBin
[Ss]tyle[Cc]op.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects
# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML

View File

@ -8,13 +8,18 @@
# Build results
[Dd]ebug*/
[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/
[Tt]est[Rr]esult
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
*_i.c
@ -33,39 +38,48 @@ build/
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.svclog
*.scc
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile
# Visual Studio profiler
*.psess
*.vsp
*.vspx
# Guidance Automation Toolkit
*.gpState
# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# NCrunch
*.ncrunch*
.*crunch*.local.xml
# Installshield output folder
[Ee]xpress
[Ee]xpress/
# DocProject is a documentation generator add-in
DocProject/buildhelp/
@ -78,32 +92,67 @@ DocProject/Help/Html2
DocProject/Help/html
# Click-Once directory
publish
publish/
# Publish Web Output
*.Publish.xml
# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/
# Windows Azure Build Output
csx
*.build.csdef
# Windows Store app package directory
AppPackages/
# Others
[Bb]in
[Oo]bj
sql
TestResults
[Tt]est[Rr]esult*
sql/
*.Cache
ClientBin
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.dbproj.schemaview
*.[Pp]ublish.xml
*.pfx
*.publishsettings
Generated_Code #added for RIA/Silverlight projects
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm
# NuGet
packages/
# SQL Server files
App_Data/*.mdf
App_Data/*.ldf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
# =========================
# Windows detritus
# =========================
# Windows image file caches
Thumbs.db
ehthumbs.db
# Folder config file
Desktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Mac crap
.DS_Store

13
WordPress.gitignore Normal file
View File

@ -0,0 +1,13 @@
.htaccess
wp-config.php
wp-content/uploads/
wp-content/blogs.dir/
wp-content/upgrade/
wp-content/backup-db/
wp-content/advanced-cache.php
wp-content/wp-cache-config.php
sitemap.xml
*.log
wp-content/cache/
wp-content/backups/
sitemap.xml.gz

View File

@ -1,17 +0,0 @@
.htaccess
wp-*.php
xmlrpc.php
wp-admin/
wp-includes/
wp-content/uploads/
wp-content/blogs.dir/
wp-content/upgrade/*
wp-content/backup-db/*
wp-content/advanced-cache.php
wp-content/wp-cache-config.php
wp-content/cache/*
wp-content/cache/supercache/*
sitemap.xml
sitemap.xml.gz
readme.html
license.txt

View File

@ -1,3 +1,3 @@
assets/
protected/runtime/
themes/classic/views/
themes/classic/views/

View File

@ -3,4 +3,3 @@ LICENSE.txt
README.txt
demos/
extras/documentation

View File

@ -1,10 +1,10 @@
image/cache
system/cache
system/database
system/engine
system/logs
system/library
system/helper
download/
config.php
admin/config.php
!index.html
download
image/cache/*.jpg
image/cache/data/*
system/cache
system/logs