merging upstream changes

This commit is contained in:
Patrick Rauland 2013-11-08 13:54:35 -06:00
commit 1f4bf1f36d
68 changed files with 499 additions and 345 deletions

View File

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

View File

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

View File

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

View File

@ -1,5 +1,8 @@
# Object files # Object files
*.o *.o
*.ko
*.obj
*.elf
# Libraries # Libraries
*.lib *.lib
@ -15,3 +18,4 @@
*.exe *.exe
*.out *.out
*.app *.app
*.hex

34
CONTRIBUTING.md Normal file
View File

@ -0,0 +1,34 @@
# Contributing guidelines
Wed love you to help us improve this project. To help us keep this collection
high quality, we request that contributions adhere to the following guidelines.
- **Provide a link to the application or projects homepage**. Unless its
extremely popular, theres a chance the maintainers dont know about or use
the language, framework, editor, app, or project your change applies to.
- **Provide links to documentation** supporting the change youre making.
Current, canonical documentation mentioning the files being ignored is best.
If documentation isnt available to support your change, do the best you can
to explain what the files being ignored are for.
- **Explain why youre making a change**. Even if it seems self-evident, please
take a sentence or two to tell us why your change or addition should happen.
Its especially helpful to articulate why this change applies to *everyone*
who works with the applicable technology, rather than just you or your team.
- **Please consider the scope of your change**. If your change specific to a
certain language or framework, then make sure the change is made to the
template for that language or framework, rather than to the template for an
editor, tool, or operating system.
- **Please only modify *one template* per pull request**. This helps keep pull
requests and feedback focused on a specific project or technology.
In general, the more you can do to help us understand the change youre making,
the more likely well be to accept your contribution quickly.
Please also understand that we cant list every tool that ever existed.
Our aim is to curate a collection of the *most common and helpful* templates,
not to make sure we cover every project possible. If we choose not to
include your language, tool, or project, its not because its not awesome.

View File

@ -4,4 +4,4 @@ tmp/*
app/tmp/* app/tmp/*
app/[Cc]onfig/core.php app/[Cc]onfig/core.php
app/[Cc]onfig/database.php app/[Cc]onfig/database.php
!empty !empty

View File

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

View File

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

16
Dart.gitignore Normal file
View File

@ -0,0 +1,16 @@
// Dont commit the following files and directories created by pub, Dart Editor, and dart2js
packages/
.project
.buildlog
*.js_
*.js.deps
*.js.map
// Include when developing application packages
pubspec.lock
// Avoid committing generated JavaScript files
*.dart.js
// Check for any other incovenient files generated by OS
// and other tools such as Eclipse, IntelliJ, etc.

View File

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

View File

@ -34,4 +34,4 @@ xmlrpc.php
/modules /modules
/profiles /profiles
/scripts /scripts
/themes /themes

4
EPiServer.gitignore Normal file
View File

@ -0,0 +1,4 @@
######################
## EPiServer Files
######################
*License.config

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

@ -2,4 +2,5 @@
deps deps
*.o *.o
*.beam *.beam
*.plt *.plt
erl_crash.dump

View File

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

2
Fancy.gitignore Normal file
View File

@ -0,0 +1,2 @@
*.rbc
*.fyc

View File

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

View File

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

View File

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

View File

@ -9,6 +9,7 @@
*.bz2 *.bz2
*.xz *.xz
*.lzma *.lzma
*.cab
#packing-only formats #packing-only formats
*.iso *.iso
@ -21,3 +22,6 @@
*.egg *.egg
*.deb *.deb
*.rpm *.rpm
*.msi
*.msm
*.msp

View File

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

View File

@ -1,6 +1,6 @@
*.pydevproject *.pydevproject
.project
.metadata .metadata
.gradle
bin/** bin/**
tmp/** tmp/**
tmp/**/* tmp/**/*
@ -9,7 +9,6 @@ tmp/**/*
*.swp *.swp
*~.nib *~.nib
local.properties local.properties
.classpath
.settings/ .settings/
.loadpath .loadpath
@ -24,3 +23,6 @@ local.properties
# PDT-specific # PDT-specific
.buildpath .buildpath
# TeXlipse plugin
.texlipse

View File

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

View File

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

View File

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

View File

@ -0,0 +1,2 @@
*.kdev4
.kdev4/

View File

@ -1,3 +1 @@
.*
!.gitignore
*~ *~

View File

@ -12,5 +12,5 @@
# Compiled MEX binaries (all platforms) # Compiled MEX binaries (all platforms)
*.mex* *.mex*
# Simulink Code Generation # Simulink Code Generation
slprj/ slprj/

View File

@ -1,12 +1,13 @@
.DS_Store .DS_Store
.AppleDouble .AppleDouble
.LSOverride .LSOverride
Icon
# Icon must ends with two \r.
Icon
# Thumbnails
._* # Thumbnails
._*
# Files that might appear on external disk
.Spotlight-V100 # Files that might appear on external disk
.Trashes .Spotlight-V100
.Trashes

View File

@ -1 +1 @@
.idea/ .idea/

View File

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

View File

@ -4,4 +4,6 @@
target/ target/
lib_managed/ lib_managed/
src_managed/ src_managed/
project/boot/ project/boot/
.history
.cache

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/
tags tags
!tags/ !tags/
gtags.files
GTAGS
GRTAGS
GPATH
cscope.files
cscope.out
cscope.in.out
cscope.po.out

1
Global/Vagrant.gitignore Normal file
View File

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

View File

@ -1,108 +0,0 @@
## 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/
build/
[Tt]est[Rr]esult
[Bb]uild[Ll]og.*
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc
# 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*/
*.[Rr]e[Ss]harper
# 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
*.[Pp]ublish.xml
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
# NuGet
packages/

View File

@ -7,3 +7,9 @@ Desktop.ini
# Recycle Bin used on file shares # Recycle Bin used on file shares
$RECYCLE.BIN/ $RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msm
*.msp

View File

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

View File

@ -20,3 +20,4 @@ _cgo_export.*
_testmain.go _testmain.go
*.exe *.exe
*.test

View File

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

View File

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

View File

@ -1,2 +1,2 @@
application/cache/* 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,14 @@
*.alg *.alg
*.aux *.aux
*.bbl *.bbl
*.bcf
*.blg *.blg
*-blx.aux
*-blx.bib
*.brf
*.dvi *.dvi
*.fdb_latexmk *.fdb_latexmk
*.fls
*.glg *.glg
*.glo *.glo
*.gls *.gls
@ -13,7 +18,9 @@
*.ilg *.ilg
*.ind *.ind
*.ist *.ist
*.loa
*.lof *.lof
*.lol
*.log *.log
*.lot *.lot
*.maf *.maf
@ -24,8 +31,10 @@
*.out *.out
*.pdfsync *.pdfsync
*.ps *.ps
*.run.xml
*.snm *.snm
*.synctex.gz *.synctex.gz
*.thm
*.toc *.toc
*.vrb *.vrb
*.xdy *.xdy

View File

@ -4,3 +4,5 @@ pom.xml
/classes/ /classes/
/targets/ /targets/
.lein-deps-sum .lein-deps-sum
.lein-repl-history
.lein-plugins/

View File

@ -18,4 +18,4 @@ install.php
/modules/shop/* /modules/shop/*
/modules/system/* /modules/system/*
/modules/users/* /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

@ -15,14 +15,18 @@ app/etc/modules/Enterprise_*
app/etc/modules/Find_Feed.xml app/etc/modules/Find_Feed.xml
app/etc/modules/Mage_All.xml app/etc/modules/Mage_All.xml
app/etc/modules/Mage_Api.xml app/etc/modules/Mage_Api.xml
app/etc/modules/Mage_Api2.xml
app/etc/modules/Mage_Authorizenet.xml app/etc/modules/Mage_Authorizenet.xml
app/etc/modules/Mage_Bundle.xml app/etc/modules/Mage_Bundle.xml
app/etc/modules/Mage_Captcha.xml
app/etc/modules/Mage_Centinel.xml app/etc/modules/Mage_Centinel.xml
app/etc/modules/Mage_Compiler.xml app/etc/modules/Mage_Compiler.xml
app/etc/modules/Mage_Connect.xml app/etc/modules/Mage_Connect.xml
app/etc/modules/Mage_CurrencySymbol.xml
app/etc/modules/Mage_Downloadable.xml app/etc/modules/Mage_Downloadable.xml
app/etc/modules/Mage_ImportExport.xml app/etc/modules/Mage_ImportExport.xml
app/etc/modules/Mage_LoadTest.xml app/etc/modules/Mage_LoadTest.xml
app/etc/modules/Mage_Oauth.xml
app/etc/modules/Mage_PageCache.xml app/etc/modules/Mage_PageCache.xml
app/etc/modules/Mage_Persistent.xml app/etc/modules/Mage_Persistent.xml
app/etc/modules/Mage_Weee.xml app/etc/modules/Mage_Weee.xml
@ -78,6 +82,7 @@ LICENSE.txt
LICENSE_EE* LICENSE_EE*
mage mage
media/customer/ media/customer/
media/dhl/
media/downloadable/ media/downloadable/
media/.htaccess media/.htaccess
media/import/ media/import/

View File

@ -11,4 +11,4 @@ pids
logs logs
results results
npm-debug.log node_modules

View File

@ -1,5 +1,7 @@
# Xcode # OS X
.DS_Store .DS_Store
# Xcode
build/ build/
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
@ -9,10 +11,14 @@ build/
!default.mode2v3 !default.mode2v3
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
*.xcworkspace
!default.xcworkspace
xcuserdata xcuserdata
*.xccheckout
profile profile
*.moved-aside *.moved-aside
DerivedData DerivedData
.idea/ .idea/
*.hmap
*.xccheckout
# CocoaPods
Pods

View File

@ -1,5 +1,5 @@
blib/ /blib/
.build/ /.build/
_build/ _build/
cover_db/ cover_db/
inc/ inc/
@ -7,10 +7,13 @@ Build
!Build/ !Build/
Build.bat Build.bat
.last_cover_stats .last_cover_stats
Makefile /Makefile
Makefile.old /Makefile.old
MANIFEST.bak /MANIFEST.bak
META.yml /META.yml
MYMETA.yml /META.json
/MYMETA.*
nytprof.out nytprof.out
pm_to_blib /pm_to_blib
*.o
*.bs

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 # # Ignore Play! working directory #
db db
eclipse eclipse

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

@ -1,30 +1,33 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod] *.py[cod]
# C extensions # C extensions
*.so *.so
# Packages # Distribution / packaging
*.egg bin/
*.egg-info build/
dist develop-eggs/
build dist/
eggs eggs/
parts lib/
bin lib64/
var parts/
sdist sdist/
develop-eggs var/
*.egg-info/
.installed.cfg .installed.cfg
lib *.egg
lib64
# Installer logs # Installer logs
pip-log.txt pip-log.txt
# Unit test / coverage reports # Unit test / coverage reports
.tox/
.coverage .coverage
.tox
nosetests.xml nosetests.xml
coverage.xml
# Translations # Translations
*.mo *.mo

View File

@ -16,5 +16,6 @@
*.pro.user.* *.pro.user.*
moc_*.cpp moc_*.cpp
qrc_*.cpp qrc_*.cpp
Makefile ui_*.h
Makefile*
*-build-* *-build-*

View File

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

104
README.md
View File

@ -1,41 +1,79 @@
# A Collection of Useful .gitignore Templates # A collection of `.gitignore` templates
That's what we're trying to build. Please contribute This is GitHubs collection of [`.gitignore`][man] file templates.
by [forking][fk] and sending a [pull request][pr]. We use this list to populate the `.gitignore` template choosers available
in the GitHub.com interface when creating new repositories and files.
Also **please** only modify **one file** per commit. This'll For more information about how `.gitignore` files work, and how to use them,
make merging easier for everyone. the following resources are a great place to start:
Global gitignores (OS-specific, editor-specific) should go into the - The [Ignoring Files chapter][chapter] of the [Pro Git][progit] book.
`Global/` directory. - The [Ignoring Files article][help] on the GitHub Help site.
- The [gitignore(5)][man] manual page.
For more information on gitignore: [gitignore(5)][g5] [man]: http://git-scm.com/docs/gitignore
[help]: https://help.github.com/articles/ignoring-files
[chapter]: http://git-scm.com/book/en/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files
[progit]: http://git-scm.com/book
[fk]: http://help.github.com/forking/ ## Folder structure
The files in the root directory are for `.gitignore` templates that are
project specific, such as language or framework specific templates.
Global (operating system or editor specific) templates should go into the
[`Global/`](./Global) directory.
## Contributing guidelines
Wed love you to help us improve this project. To help us keep this collection
high quality, we request that contributions adhere to the following guidelines.
- **Provide a link to the application or projects homepage**. Unless its
extremely popular, theres a chance the maintainers dont know about or use
the language, framework, editor, app, or project your change applies to.
- **Provide links to documentation** supporting the change youre making.
Current, canonical documentation mentioning the files being ignored is best.
If documentation isnt available to support your change, do the best you can
to explain what the files being ignored are for.
- **Explain why youre making a change**. Even if it seems self-evident, please
take a sentence or two to tell us why your change or addition should happen.
Its especially helpful to articulate why this change applies to *everyone*
who works with the applicable technology, rather than just you or your team.
- **Please consider the scope of your change**. If your change specific to a
certain language or framework, then make sure the change is made to the
template for that language or framework, rather than to the template for an
editor, tool, or operating system.
- **Please only modify *one template* per pull request**. This helps keep pull
requests and feedback focused on a specific project or technology.
In general, the more you can do to help us understand the change youre making,
the more likely well be to accept your contribution quickly.
Please also understand that we cant list every tool that ever existed.
Our aim is to curate a collection of the *most common and helpful* templates,
not to make sure we cover every project possible. If we choose not to
include your language, tool, or project, its not because its not awesome.
## Contributing workflow
Heres how we suggest you go about proposing a change to this project:
1. [Fork this project][fork] to your account.
2. [Create a branch][branch] for the change you intend to make.
3. Make your changes to your fork.
4. [Send a pull request][pr] from your forks branch to our `master` branch.
Using the web-based interface to make changes is fine too, and will help you
by automatically forking the project and prompting to send a pull request too.
[fork]: http://help.github.com/forking/
[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository
[pr]: http://help.github.com/pull-requests/ [pr]: http://help.github.com/pull-requests/
[g5]: http://man.cx/gitignore
## Pull Requests ## License
Since this repo includes a large and diverse [MIT](./LICENSE).
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
your projects. For example:
git config --global core.excludesfile ~/.global_ignore
... will apply the rules in ~/.global_ignore for all of your repos.
This is useful if you use an editor (like Emacs) that drops backup files,
or if you work in an environment that generates binary or intermediate
files that are always ignored.

View File

@ -3,14 +3,16 @@
.sass-cache .sass-cache
capybara-*.html capybara-*.html
.rspec .rspec
.rvmrc
/.bundle /.bundle
/vendor/bundle /vendor/bundle
/log/* /log
/tmp/* /tmp
/db/*.sqlite3 /db/*.sqlite3
/public/system/* /public/system
/coverage/ /coverage/
/spec/tmp/* /spec/tmp
**.orig **.orig
rerun.txt rerun.txt
pickle-email-*.html pickle-email-*.html
config/initializers/secret_token.rb

20
RubyMotion.gitignore Normal file
View File

@ -0,0 +1,20 @@
.dat*
.repl_history
build/
tags
# Editor files
.DS_Store
nbproject
.redcar
*.swp
*.swo
~
.eprj
vendor/Pods
*.nib
# YARD artifacts
.yardoc
_yardoc
doc/

View File

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

View File

@ -6,4 +6,3 @@
*.rel *.rel
*.rst *.rst
*.sym *.sym

View File

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

View File

@ -11,3 +11,6 @@ web/bundles/*
# Configuration files # Configuration files
app/config/parameters.ini app/config/parameters.ini
app/config/parameters.yml app/config/parameters.yml
# Composer
composer.phar

18
Typo3.gitignore Normal file
View File

@ -0,0 +1,18 @@
## TYPO3 v4
# 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,99 +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
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.log
*.vspscc
*.vssscc
.builds
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
# Visual Studio profiler
*.psess
*.vsp
*.vspx
# 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,10 +1,3 @@
# 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 ## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons. ## files generated by popular Visual Studio add-ons.
@ -14,11 +7,24 @@ TestResults
*.sln.docstates *.sln.docstates
# Build results # Build results
[Dd]ebug/ [Dd]ebug/
[Rr]elease/ [Rr]elease/
x64/ x64/
build/
[Bb]in/
[Oo]bj/
# Enable "build/" folder in the NuGet Packages folder since NuGet packages use it for MSBuild targets
!packages/*/build/
# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
*_i.c *_i.c
*_p.c *_p.c
*_i.h
*.ilk *.ilk
*.meta *.meta
*.obj *.obj
@ -32,10 +38,14 @@ x64/
*.tli *.tli
*.tlh *.tlh
*.tmp *.tmp
*.tmp_proj
*.log *.log
*.vspscc *.vspscc
*.vssscc *.vssscc
.builds .builds
*.pidb
*.svclog
*.scc
# Visual C++ cache files # Visual C++ cache files
ipch/ ipch/
@ -43,24 +53,37 @@ ipch/
*.ncb *.ncb
*.opensdf *.opensdf
*.sdf *.sdf
*.cachefile
# Visual Studio profiler # Visual Studio profiler
*.psess *.psess
*.vsp *.vsp
*.vspx *.vspx
# TFS 2012 Local Workspace
$tf/
# Guidance Automation Toolkit # Guidance Automation Toolkit
*.gpState *.gpState
# ReSharper is a .NET coding add-in # ReSharper is a .NET coding add-in
_ReSharper* _ReSharper*/
*.[Rr]e[Ss]harper
*.DotSettings.user
# TeamCity is a build add-in
_TeamCity*
# DotCover is a Code Coverage Tool
*.dotCover
# NCrunch # NCrunch
*.ncrunch* *.ncrunch*
_NCrunch_*
.*crunch*.local.xml .*crunch*.local.xml
# Installshield output folder # Installshield output folder
[Ee]xpress [Ee]xpress/
# DocProject is a documentation generator add-in # DocProject is a documentation generator add-in
DocProject/buildhelp/ DocProject/buildhelp/
@ -73,13 +96,14 @@ DocProject/Help/Html2
DocProject/Help/html DocProject/Help/html
# Click-Once directory # Click-Once directory
publish publish/
# Publish Web Output # Publish Web Output
*.Publish.xml *.Publish.xml
# NuGet Packages Directory # NuGet Packages Directory
packages ## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/
# Windows Azure Build Output # Windows Azure Build Output
csx csx
@ -89,20 +113,53 @@ csx
AppPackages/ AppPackages/
# Others # Others
[Bb]in sql/
[Oo]bj
sql
TestResults
[Tt]est[Rr]esult*
*.Cache *.Cache
ClientBin ClientBin/
[Ss]tyle[Cc]op.* [Ss]tyle[Cc]op.*
~$* ~$*
*~
*.dbmdl *.dbmdl
Generated_Code #added for RIA/Silverlight projects *.dbproj.schemaview
*.[Pp]ublish.xml
*.pfx
*.publishsettings
# RIA/Silverlight projects
Generated_Code/
# Backup & report files from converting an old project file to a newer # Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-) # Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/ _UpgradeReport_Files/
Backup*/ Backup*/
UpgradeLog*.XML UpgradeLog*.XML
UpgradeLog*.htm
# SQL Server files
App_Data/*.mdf
App_Data/*.ldf
# Business Intelligence projects
*.rdl.data
*.bim.layout
*.bim_*.settings
# Microsoft Fakes
FakesAssemblies/
# =========================
# 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

View File

@ -9,5 +9,4 @@ sitemap.xml
*.log *.log
wp-content/cache/ wp-content/cache/
wp-content/backups/ wp-content/backups/
sitemap.xml sitemap.xml.gz
sitemap.xml.gz

View File

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

View File

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