提交 42110464 编写于 作者: R Ray Fang

Merge upstream changes

...@@ -15,7 +15,6 @@ gen/ ...@@ -15,7 +15,6 @@ gen/
# Gradle files # Gradle files
.gradle/ .gradle/
build/ build/
/*/build/
# Local configuration file (sdk path, etc) # Local configuration file (sdk path, etc)
local.properties local.properties
...@@ -25,3 +24,9 @@ proguard/ ...@@ -25,3 +24,9 @@ proguard/
# Log Files # Log Files
*.log *.log
# Android Studio Navigation editor temp files
.navigation/
# Android Studio captures folder
captures/
*.tar *.tar
*.tar.* *.tar.*
*.jar
*.exe
*.msi
*.zip *.zip
*.tgz *.tgz
*.log *.log
*.log.* *.log.*
*.sig *.sig
# AUR metadata
.AURINFO
.SRCINFO
pkg/ pkg/
src/ src/
...@@ -5,9 +5,13 @@ Makefile.in ...@@ -5,9 +5,13 @@ Makefile.in
# http://www.gnu.org/software/autoconf # http://www.gnu.org/software/autoconf
/autom4te.cache /autom4te.cache
/autoscan.log
/autoscan-*.log
/aclocal.m4 /aclocal.m4
/compile /compile
/config.h.in
/configure /configure
/configure.scan
/depcomp /depcomp
/install-sh /install-sh
/missing /missing
......
CMakeCache.txt CMakeCache.txt
CMakeFiles CMakeFiles
CMakeScripts
Makefile Makefile
cmake_install.cmake cmake_install.cmake
install_manifest.txt install_manifest.txt
*/config/development */config/development
*/logs/log-*.php */logs/log-*.php
*/logs/!index.html !*/logs/index.html
*/cache/* */cache/*
*/cache/!index.html !*/cache/index.html
*/cache/!.htaccess !*/cache/.htaccess
composer.phar composer.phar
vendor/ /vendor/
# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file # Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
......
# Compiled Object files
*.o
*.obj
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Compiled Static libraries
*.a
*.lib
# Executables
*.exe
# DUB
.dub
docs.json
__dummy.html
# Don’t commit the following directories created by pub. # See https://www.dartlang.org/tools/private-files.html
# Files and directories created by pub
.buildlog .buildlog
.packages
.project
.pub/ .pub/
build/ build/
packages **/packages/
# Or the files created by dart2js. # Files created by dart2js
# (Most Dart developers will use pub build to compile Dart, use/modify these
# rules if you intend to use dart2js directly
# Convention is to use extension '.dart.js' for Dart compiled to Javascript to
# differentiate from explicit Javascript files)
*.dart.js *.dart.js
*.js_ *.part.js
*.js.deps *.js.deps
*.js.map *.js.map
*.info.json
# Directory created by dartdoc
doc/api/
# Include when developing application packages. # Don't commit pubspec lock file
# (Library packages only! Remove pattern if developing an application package)
pubspec.lock pubspec.lock
...@@ -21,6 +21,10 @@ ...@@ -21,6 +21,10 @@
# Uncomment this if it is not mobile development and you do not use remote debug feature. # Uncomment this if it is not mobile development and you do not use remote debug feature.
#*.deployproj #*.deployproj
# #
# C++ object files produced when C/C++ Output file generation is configured.
# Uncomment this if you are not using external objects (zlib library for example).
#*.obj
#
# Delphi compiler-generated binaries (safe to delete) # Delphi compiler-generated binaries (safe to delete)
*.exe *.exe
...@@ -37,9 +41,13 @@ ...@@ -37,9 +41,13 @@
*.tds *.tds
*.dcu *.dcu
*.lib *.lib
*.a
*.o
*.ocx
# Delphi autogenerated files (duplicated info) # Delphi autogenerated files (duplicated info)
*.cfg *.cfg
*.hpp
*Resource.rc *Resource.rc
# Delphi local files (user-specific info) # Delphi local files (user-specific info)
...@@ -53,5 +61,5 @@ ...@@ -53,5 +61,5 @@
__history/ __history/
*.~* *.~*
# Castalia statistics file # Castalia statistics file (since XE7 Castalia is distributed with Delphi)
*.stat *.stat
...@@ -15,7 +15,7 @@ robots.txt ...@@ -15,7 +15,7 @@ robots.txt
/MAINTAINERS.txt /MAINTAINERS.txt
/UPGRADE.txt /UPGRADE.txt
/README.txt /README.txt
sites/all/README.txt sites/README.txt
sites/all/modules/README.txt sites/all/modules/README.txt
sites/all/themes/README.txt sites/all/themes/README.txt
......
...@@ -11,6 +11,10 @@ ...@@ -11,6 +11,10 @@
# comment the following line if you want to have your project file included. # comment the following line if you want to have your project file included.
eagle.epf eagle.epf
# Autorouter files
*.pro
*.job
# CAM files # CAM files
*.$$$ *.$$$
*.cmp *.cmp
......
/_build /_build
/cover
/deps /deps
erl_crash.dump erl_crash.dump
*.ez *.ez
# elm-package generated files
elm-package.json
elm-stuff/
# elm-repl generated files
repl-temp-*
*.pydevproject
.metadata .metadata
.gradle
bin/ bin/
tmp/ tmp/
*.tmp *.tmp
...@@ -20,17 +19,29 @@ local.properties ...@@ -20,17 +19,29 @@ local.properties
# Locally stored "Eclipse launch configurations" # Locally stored "Eclipse launch configurations"
*.launch *.launch
# CDT-specific # PyDev specific (Python IDE for Eclipse)
*.pydevproject
# CDT-specific (C/C++ Development Tooling)
.cproject .cproject
# JDT-specific (Eclipse Java Development Tools) # JDT-specific (Eclipse Java Development Tools)
.classpath .classpath
# PDT-specific # Java annotation processor (APT)
.factorypath
# PDT-specific (PHP Development Tools)
.buildpath .buildpath
# sbteclipse plugin # sbteclipse plugin
.target .target
# Tern plugin
.tern-project
# TeXlipse plugin # TeXlipse plugin
.texlipse .texlipse
# STS (Spring Tool Suite)
.springBeans
# The compilation directoy # The compilation directory
EIFGENs EIFGENs
...@@ -30,3 +30,6 @@ tramp ...@@ -30,3 +30,6 @@ tramp
# cask packages # cask packages
.cask/ .cask/
# server auth directory
/server/
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
# Reference https://intellij-support.jetbrains.com/entries/23393067 # Reference https://intellij-support.jetbrains.com/entries/23393067
# User-specific stuff: # User-specific stuff:
...@@ -38,3 +38,4 @@ atlassian-ide-plugin.xml ...@@ -38,3 +38,4 @@ atlassian-ide-plugin.xml
com_crashlytics_export_strings.xml com_crashlytics_export_strings.xml
crashlytics.properties crashlytics.properties
crashlytics-build.properties crashlytics-build.properties
fabric.properties
#ignore backup files # Lazarus compiler-generated binaries (safe to delete)
backup/ *.exe
*.dll
#ignore files generated by the compiler *.so
lib/ *.dylib
*.lrs
*.res
*.compiled *.compiled
*.dbg
*.ppu
*.o *.o
*.or *.or
*.ppu *.a
#ignore debug information files # Lazarus autogenerated files (duplicated info)
*.dbg *.rst
*.rsj
*.lrt
#exclude executable output in windows # Lazarus local files (user-specific info)
*.exe *.lps
# Lazarus backups and unit output folders.
# These can be changed by user in Lazarus/project options.
backup/
*.bak
lib/
# Application bundle for Mac OS
*.app/
*~ *~
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences # KDE directory preferences
.directory .directory
......
/.hg/* .hg/
*/.hg/*
.hgignore .hgignore
.hgsigs
.hgsub
.hgsubstate
.hgtags
...@@ -8,3 +8,6 @@ ...@@ -8,3 +8,6 @@
# Excel Backup File # Excel Backup File
*.xlk *.xlk
# PowerPoint temporary
~$*.ppt*
...@@ -4,5 +4,4 @@ nbbuild/ ...@@ -4,5 +4,4 @@ nbbuild/
dist/ dist/
nbdist/ nbdist/
nbactions.xml nbactions.xml
nb-configuration.xml
.nb-gradle/ .nb-gradle/
# Waveforms # Waveform formats
*.vpd
*.vcd *.vcd
*.vpd
*.evcd *.evcd
*.fsdb
# Binary files # Default name of the simulation executable. A different name can be
# specified with this switch (the associated daidir database name is
# also taken from here): -o <path>/<filename>
simv simv
# Directories used for compilation # Generated for Verilog and VHDL top configs
csrc/
simv.daidir/ simv.daidir/
simv.db.dir/
# Log files # Infrastructure necessary to co-simulate SystemC models with
*.log # Verilog/VHDL models. An alternate directory may be specified with this
# switch: -Mdir=<directory_path>
csrc/
# DVE, UCLI related files # Log file - the following switch allows to specify the file that will be
DVEfiles/ # used to write all messages from simulation: -l <filename>
ucli* *.log
*.key
# Coverage related files # Coverage results (generated with urg) and database location. The
# following switch can also be used: urg -dir <coverage_directory>.vdb
simv.vdb/ simv.vdb/
urgReport/ urgReport/
# DVE and UCLI related files.
DVEfiles/
ucli.key
# When the design is elaborated for DirectC, the following file is created
# with declarations for C/C++ functions.
vc_hdrs.h
# Ignore tags created by etags, ctags, gtags (GNU global) and cscope # Ignore tags created by etags, ctags, gtags (GNU global) and cscope
TAGS TAGS
.TAGS
!TAGS/ !TAGS/
tags tags
.tags
!tags/ !tags/
gtags.files gtags.files
GTAGS GTAGS
......
# swap
[._]*.s[a-w][a-z] [._]*.s[a-w][a-z]
[._]s[a-w][a-z] [._]s[a-w][a-z]
# persistent undo
*.un~ *.un~
# session
Session.vim Session.vim
# temporary
.netrwhist .netrwhist
*~ *~
...@@ -4,6 +4,9 @@ ...@@ -4,6 +4,9 @@
[Bb]in [Bb]in
[Ii]nclude [Ii]nclude
[Ll]ib [Ll]ib
[Ll]ib64
[Ll]ocal
[Ss]cripts [Ss]cripts
pyvenv.cfg pyvenv.cfg
.venv
pip-selfcheck.json pip-selfcheck.json
# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated
build/ build/
DerivedData/
## Various settings
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
...@@ -7,8 +15,9 @@ build/ ...@@ -7,8 +15,9 @@ build/
!default.mode2v3 !default.mode2v3
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata xcuserdata/
*.xccheckout
## Other
*.moved-aside *.moved-aside
DerivedData *.xccheckout
*.xcuserstate *.xcscmblueprint
...@@ -42,6 +42,16 @@ ...@@ -42,6 +42,16 @@
*_usage.xml *_usage.xml
*_xst.xrpt *_xst.xrpt
# iMPACT generated files
_impactbatch.log
impact.xsl
impact_impact.xwbt
ise_impact.cmd
webtalk_impact.xml
# Core Generator generated files
xaw2verilog.log
# project-wide generated files # project-wide generated files
*.gise *.gise
par_usage_statistics.html par_usage_statistics.html
......
...@@ -6,3 +6,6 @@ gradle-app.setting ...@@ -6,3 +6,6 @@ gradle-app.setting
# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) # Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
!gradle-wrapper.jar !gradle-wrapper.jar
# Cache of project
.gradletasknamecache
...@@ -6,7 +6,6 @@ cabal-dev ...@@ -6,7 +6,6 @@ cabal-dev
*.chs.h *.chs.h
*.dyn_o *.dyn_o
*.dyn_hi *.dyn_hi
.virtualenv
.hpc .hpc
.hsenv .hsenv
.cabal-sandbox/ .cabal-sandbox/
...@@ -14,3 +13,4 @@ cabal.sandbox.config ...@@ -14,3 +13,4 @@ cabal.sandbox.config
*.prof *.prof
*.aux *.aux
*.hp *.hp
.stack-work/
...@@ -296,6 +296,7 @@ ...@@ -296,6 +296,7 @@
/components/com_wrapper/* /components/com_wrapper/*
/components/index.html /components/index.html
/images/banners/* /images/banners/*
/images/headers/*
/images/sampledata/* /images/sampledata/*
/images/joomla* /images/joomla*
/images/index.html /images/index.html
...@@ -309,6 +310,7 @@ ...@@ -309,6 +310,7 @@
/language/en-GB/en-GB.com_tags.ini /language/en-GB/en-GB.com_tags.ini
/language/en-GB/en-GB.finder_cli.ini /language/en-GB/en-GB.finder_cli.ini
/language/en-GB/en-GB.lib_fof.sys.ini /language/en-GB/en-GB.lib_fof.sys.ini
/language/en-GB/en-GB.lib_fof.ini
/language/en-GB/en-GB.com_content.ini /language/en-GB/en-GB.com_content.ini
/language/en-GB/en-GB.lib_idna_convert.sys.ini /language/en-GB/en-GB.lib_idna_convert.sys.ini
/language/en-GB/en-GB.com_mailto.ini /language/en-GB/en-GB.com_mailto.ini
...@@ -395,21 +397,36 @@ ...@@ -395,21 +397,36 @@
/language/en-GB/install.xml /language/en-GB/install.xml
/language/overrides/* /language/overrides/*
/language/index.html /language/index.html
/layouts/joomla/*
/layouts/libraries/*
/layouts/plugins/*
/layouts/index.html
/libraries/cms.php /libraries/cms.php
/libraries/cms/* /libraries/cms/*
/libraries/fof/*
/libraries/idna_convert/*
/libraries/joomla/* /libraries/joomla/*
/libraries/legacy/*
/libraries/phpass/*
/libraries/phpmailer/* /libraries/phpmailer/*
/libraries/phputf8/* /libraries/phputf8/*
/libraries/simplepie/* /libraries/simplepie/*
/libraries/vendor/*
/libraries/classmap.php
/libraries/import.legacy.php
/libraries/index.html /libraries/index.html
/libraries/import.php /libraries/import.php
/libraries/loader.php /libraries/loader.php
/libraries/platform.php /libraries/platform.php
/logs/* /logs/*
/media/cms/* /media/cms/*
/media/com_contenthistory/*
/media/com_finder/* /media/com_finder/*
/media/com_joomlaupdate/*
/media/com_wrapper/*
/media/contacts/* /media/contacts/*
/media/editors/* /media/editors/*
/media/jui/*
/media/mailto/* /media/mailto/*
/media/media/* /media/media/*
/media/mod_languages/* /media/mod_languages/*
...@@ -439,6 +456,8 @@ ...@@ -439,6 +456,8 @@
/modules/mod_search/* /modules/mod_search/*
/modules/mod_stats/* /modules/mod_stats/*
/modules/mod_syndicate/* /modules/mod_syndicate/*
/modules/mod_tags_popular/*
/modules/mod_tags_similar/*
/modules/mod_users_latest/* /modules/mod_users_latest/*
/modules/mod_weblinks/* /modules/mod_weblinks/*
/modules/mod_whosonline/* /modules/mod_whosonline/*
...@@ -448,6 +467,7 @@ ...@@ -448,6 +467,7 @@
/plugins/authentication/gmail/* /plugins/authentication/gmail/*
/plugins/authentication/joomla/* /plugins/authentication/joomla/*
/plugins/authentication/ldap/* /plugins/authentication/ldap/*
/plugins/authentication/cookie/*
/plugins/authentication/index.html /plugins/authentication/index.html
/plugins/captcha/recaptcha/* /plugins/captcha/recaptcha/*
/plugins/captcha/index.html /plugins/captcha/index.html
...@@ -523,3 +543,4 @@ ...@@ -523,3 +543,4 @@
/index.php /index.php
/joomla.xml /joomla.xml
/*.txt /*.txt
/robots.txt.dist
...@@ -3,6 +3,8 @@ ...@@ -3,6 +3,8 @@
# Temporary files # Temporary files
*.000 *.000
*.bak *.bak
*.bck
*.kicad_pcb-bak
# Netlist files (exported from Eeschema) # Netlist files (exported from Eeschema)
*.net *.net
......
Copyright (c) 2014 GitHub, Inc. Copyright (c) 2016 GitHub, Inc.
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
......
/bootstrap/compiled.php vendor/
node_modules/
# Laravel 4 specific
bootstrap/compiled.php
app/storage/
# Laravel 5 & Lumen specific
bootstrap/cache/
storage/
.env.*.php .env.*.php
.env.php .env.php
.env .env
.env.example
\ No newline at end of file
.meteor/local
.meteor/meteorite
# Logs # Logs
logs logs
*.log *.log
npm-debug.log*
# Runtime data # Runtime data
pids pids
...@@ -23,5 +24,10 @@ coverage ...@@ -23,5 +24,10 @@ coverage
build/Release build/Release
# Dependency directory # Dependency directory
# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
node_modules node_modules
# Optional npm cache directory
.npm
# Optional REPL history
.node_repl_history
# Xcode # Xcode
# #
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated
build/ build/
DerivedData/
## Various settings
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
...@@ -9,18 +15,38 @@ build/ ...@@ -9,18 +15,38 @@ build/
!default.mode2v3 !default.mode2v3
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata xcuserdata/
*.xccheckout
## Other
*.moved-aside *.moved-aside
DerivedData *.xccheckout
*.xcscmblueprint
## Obj-C/Swift specific
*.hmap *.hmap
*.ipa *.ipa
*.xcuserstate
# CocoaPods # CocoaPods
# #
# We recommend against adding the Pods directory to your .gitignore. However # We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at: # you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
# #
#Pods/ # Pods/
# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts
Carthage/Build
# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
fastlane/report.xml
fastlane/screenshots
...@@ -9,3 +9,5 @@ image/data/ ...@@ -9,3 +9,5 @@ image/data/
image/cache/ image/cache/
system/cache/ system/cache/
system/logs/ system/logs/
system/storage/
...@@ -5,13 +5,11 @@ bin/ ...@@ -5,13 +5,11 @@ bin/
/lib/ /lib/
/logs/ /logs/
/modules /modules
/project/project
/project/target /project/target
/target /target
tmp/ tmp/
test-result test-result
server.pid server.pid
*.iml
*.eml *.eml
/dist/ /dist/
.cache .cache
# Directories content # Private files
cache/class_index.php # The following files contain your database credentials and other personal data.
cache/smarty/cache/*
!cache/smarty/cache/index.php
cache/smarty/compile/*
!cache/smarty/compile/index.php
cache/tcpdf/*
!cache/tcpdf/index.php
config/xml/*.xml config/settings.*.php
config/settings.inc.php
log/*.log
img/* # Cache, temp and generated files
!img/index.php # The following files are generated by PrestaShop.
!img/*/index.php
tools/smarty*/cache/*.php admin-dev/autoupgrade/
!tools/smarty*/cache/index.php /cache/*
tools/smarty*/compile/*.php config/xml/*.xml
!tools/smarty*/compile/index.php /log/*
*sitemap.xml
themes/*/cache/
modules/*/config*.xml
themes/default/cache/*.js # Site content
themes/default/cache/*.css # The following folders contain product images, virtual products, CSV's, etc.
# Ignore files on root directory admin-dev/backups/
robots.txt admin-dev/export/
sitemap.xml admin-dev/import/
download/
/img/*
upload/
# Byte-compiled / optimized / DLL files # Byte-compiled / optimized / DLL files
__pycache__/ __pycache__/
*.py[cod] *.py[cod]
*$py.class
# C extensions # C extensions
*.so *.so
...@@ -42,6 +43,7 @@ htmlcov/ ...@@ -42,6 +43,7 @@ htmlcov/
nosetests.xml nosetests.xml
coverage.xml coverage.xml
*,cover *,cover
.hypothesis/
# Translations # Translations
*.mo *.mo
...@@ -49,9 +51,13 @@ coverage.xml ...@@ -49,9 +51,13 @@ coverage.xml
# Django stuff: # Django stuff:
*.log *.log
local_settings.py
# Sphinx documentation # Sphinx documentation
docs/_build/ docs/_build/
# PyBuilder # PyBuilder
target/ target/
#Ipython Notebook
.ipynb_checkpoints
...@@ -23,7 +23,7 @@ moc_*.cpp ...@@ -23,7 +23,7 @@ moc_*.cpp
qrc_*.cpp qrc_*.cpp
ui_*.h ui_*.h
Makefile* Makefile*
*-build-* *build-*
# QtCreator # QtCreator
...@@ -32,3 +32,7 @@ Makefile* ...@@ -32,3 +32,7 @@ Makefile*
#QtCtreator Qml #QtCtreator Qml
*.qmlproject.user *.qmlproject.user
*.qmlproject.user.* *.qmlproject.user.*
#QtCtreator CMake
CMakeLists.txt.user
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
.Rhistory .Rhistory
.Rapp.history .Rapp.history
# Session Data files
.RData
# Example code in package build process # Example code in package build process
*-Ex.R *-Ex.R
...@@ -11,3 +14,6 @@ ...@@ -11,3 +14,6 @@
# produced vignettes # produced vignettes
vignettes/*.html vignettes/*.html
vignettes/*.pdf vignettes/*.pdf
# OAuth2 token, see https://github.com/hadley/httr/releases/tag/v0.3
.httr-oauth
...@@ -70,9 +70,9 @@ Here’s how we suggest you go about proposing a change to this project: ...@@ -70,9 +70,9 @@ Here’s how we suggest you go about proposing a change to this project:
Using the web-based interface to make changes is fine too, and will help you 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. by automatically forking the project and prompting to send a pull request too.
[fork]: http://help.github.com/forking/ [fork]: https://help.github.com/articles/fork-a-repo/
[branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository [branch]: https://help.github.com/articles/creating-and-deleting-branches-within-your-repository
[pr]: http://help.github.com/pull-requests/ [pr]: https://help.github.com/articles/using-pull-requests/
## License ## License
......
...@@ -16,11 +16,11 @@ pickle-email-*.html ...@@ -16,11 +16,11 @@ pickle-email-*.html
config/initializers/secret_token.rb config/initializers/secret_token.rb
config/secrets.yml config/secrets.yml
## Environment normalisation: ## Environment normalization:
/.bundle /.bundle
/vendor/bundle /vendor/bundle
# these should all be checked in to normalise the environment: # these should all be checked in to normalize the environment:
# Gemfile.lock, .ruby-version, .ruby-gemset # Gemfile.lock, .ruby-version, .ruby-gemset
# unless supporting rvm < 1.11.0 or doing something fancy, ignore this: # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
...@@ -33,3 +33,6 @@ bower.json ...@@ -33,3 +33,6 @@ bower.json
# Ignore pow environment settings # Ignore pow environment settings
.powenv .powenv
# Ignore Byebug command history file.
.byebug_history
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
/InstalledFiles /InstalledFiles
/pkg/ /pkg/
/spec/reports/ /spec/reports/
/spec/examples.txt
/test/tmp/ /test/tmp/
/test/version_tmp/ /test/version_tmp/
/tmp/ /tmp/
...@@ -20,7 +21,7 @@ build/ ...@@ -20,7 +21,7 @@ build/
/doc/ /doc/
/rdoc/ /rdoc/
## Environment normalisation: ## Environment normalization:
/.bundle/ /.bundle/
/vendor/bundle /vendor/bundle
/lib/bundler/man/ /lib/bundler/man/
......
...@@ -9,3 +9,7 @@ ...@@ -9,3 +9,7 @@
# Generated by Cargo # Generated by Cargo
/target/ /target/
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
Cargo.lock
.sass-cache .sass-cache/
*.css.map *.css.map
# Xcode # Xcode
# #
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
## Build generated
build/ build/
DerivedData/
## Various settings
*.pbxuser *.pbxuser
!default.pbxuser !default.pbxuser
*.mode1v3 *.mode1v3
...@@ -9,19 +15,32 @@ build/ ...@@ -9,19 +15,32 @@ build/
!default.mode2v3 !default.mode2v3
*.perspectivev3 *.perspectivev3
!default.perspectivev3 !default.perspectivev3
xcuserdata xcuserdata/
*.xccheckout
## Other
*.moved-aside *.moved-aside
DerivedData *.xccheckout
*.xcscmblueprint
## Obj-C/Swift specific
*.hmap *.hmap
*.ipa *.ipa
*.xcuserstate
## Playgrounds
timeline.xctimeline
playground.xcworkspace
# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.build/
# CocoaPods # CocoaPods
# #
# We recommend against adding the Pods directory to your .gitignore. However # We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at: # you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
# #
# Pods/ # Pods/
...@@ -31,3 +50,13 @@ DerivedData ...@@ -31,3 +50,13 @@ DerivedData
# Carthage/Checkouts # Carthage/Checkouts
Carthage/Build Carthage/Build
# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/docs/Gitignore.md
fastlane/report.xml
fastlane/screenshots
...@@ -26,6 +26,9 @@ ...@@ -26,6 +26,9 @@
/web/bundles/ /web/bundles/
/web/uploads/ /web/uploads/
# Assets managed by Bower
/web/assets/vendor/
# PHPUnit # PHPUnit
/app/phpunit.xml /app/phpunit.xml
/phpunit.xml /phpunit.xml
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
*.fls *.fls
*.out *.out
*.toc *.toc
*.fmt
## Intermediate documents: ## Intermediate documents:
*.dvi *.dvi
...@@ -32,7 +33,6 @@ ...@@ -32,7 +33,6 @@
*.pdfsync *.pdfsync
## Auxiliary and intermediate files from other packages: ## Auxiliary and intermediate files from other packages:
# algorithms # algorithms
*.alg *.alg
*.loa *.loa
...@@ -48,6 +48,9 @@ acs-*.bib ...@@ -48,6 +48,9 @@ acs-*.bib
*.snm *.snm
*.vrb *.vrb
# cprotect
*.cpt
#(e)ledmac/(e)ledpar #(e)ledmac/(e)ledpar
*.end *.end
*.[1-9] *.[1-9]
...@@ -92,8 +95,11 @@ acs-*.bib ...@@ -92,8 +95,11 @@ acs-*.bib
# minitoc # minitoc
*.maf *.maf
*.mlf
*.mlt
*.mtc *.mtc
*.mtc0 *.mtc[0-9]
*.mtc[1-9][0-9]
# minted # minted
_minted* _minted*
...@@ -102,6 +108,9 @@ _minted* ...@@ -102,6 +108,9 @@ _minted*
# morewrites # morewrites
*.mw *.mw
# mylatexformat
*.fmt
# nomencl # nomencl
*.nlo *.nlo
...@@ -115,12 +124,38 @@ _minted* ...@@ -115,12 +124,38 @@ _minted*
*.sympy *.sympy
sympy-plots-for-*.tex/ sympy-plots-for-*.tex/
# pdfcomment
*.upa
*.upb
#pythontex
*.pytxcode
pythontex-files-*/
# Texpad
.texpadtmp
# TikZ & PGF
*.dpth
*.md5
*.auxlock
# todonotes # todonotes
*.tdo *.tdo
# xindy # xindy
*.xdy *.xdy
# xypic precompiled matrices
*.xyc
# WinEdt # WinEdt
*.bak *.bak
*.sav *.sav
# endfloat
*.ttt
*.fff
# Latexian
TSWLatexianTemp*
## TYPO3 v4 ## TYPO3 v6.2
# Ignore serveral upload and file directories. # Ignore several upload and file directories.
/fileadmin/user_upload/ /fileadmin/user_upload/
/fileadmin/_temp_/ /fileadmin/_temp_/
/fileadmin/_processed_/
/uploads/ /uploads/
# Ignore cache # Ignore cache
/typo3conf/temp_CACHED* /typo3conf/temp_CACHED*
/typo3conf/temp_fieldInfo.php /typo3conf/temp_fieldInfo.php
# Ignore local config which overrides typo3 config. /typo3conf/deprecation_*.log
# You should include your local stuff with `@include('localconf_local.php');` at the end of localconf.php. /typo3conf/AdditionalConfiguration.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. # Ignore system folders, you should have them symlinked.
# If not comment out the following two entries. # If not comment out the following entries.
/typo3 /typo3
/t3lib /typo3_src
/typo3_src-*
/.htaccess
/index.php
# Ignore temp directory. # Ignore temp directory.
/typo3temp/ /typo3temp/
# Note: VisualStudio gitignore rules may also be relevant # Note: VisualStudio gitignore rules may also be relevant
# Umbraco
# Ignore unimportant folders generated by Umbraco # Ignore unimportant folders generated by Umbraco
**/App_Data/ClientDependency/
**/App_Data/ExamineIndexes/
**/App_Data/Logs/ **/App_Data/Logs/
**/App_Data/[Pp]review/ **/App_Data/[Pp]review/
**/App_Data/TEMP/ **/App_Data/TEMP/
Cached/ **/App_Data/NuGetBackup/
# Ignore Umbraco content cache file # Ignore Umbraco content cache file
**/App_Data/umbraco.config **/App_Data/umbraco.config
...@@ -15,3 +14,6 @@ Cached/ ...@@ -15,3 +14,6 @@ Cached/
# Make sure to include details from VisualStudio.gitignore BEFORE this # Make sure to include details from VisualStudio.gitignore BEFORE this
!**/App_Data/[Pp]ackages/ !**/App_Data/[Pp]ackages/
!**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages !**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages
# ImageProcessor DiskCache
**/App_Data/cache/
[Ll]ibrary/ /[Ll]ibrary/
[Tt]emp/ /[Tt]emp/
[Oo]bj/ /[Oo]bj/
[Bb]uild/ /[Bb]uild/
/[Bb]uilds/
/Assets/AssetStoreTools*
# Autogenerated VS/MD solution and project files # Autogenerated VS/MD solution and project files
ExportedObj/
*.csproj *.csproj
*.unityproj *.unityproj
*.sln *.sln
...@@ -13,9 +16,15 @@ ...@@ -13,9 +16,15 @@
*.userprefs *.userprefs
*.pidb *.pidb
*.booproj *.booproj
*.svd
# Unity3D generated meta files # Unity3D generated meta files
*.pidb.meta *.pidb.meta
# Unity3D Generated File On Crash Reports # Unity3D Generated File On Crash Reports
sysinfo.txt sysinfo.txt
# Builds
*.apk
*.unitypackage
# Compiled Object files
*.slo
*.lo
*.o
*.obj
# Precompiled Headers
*.gch
*.pch
# Compiled Dynamic libraries
*.so
*.dylib
*.dll
# Fortran module files
*.mod
# Compiled Static libraries
*.lai
*.la
*.a
*.lib
# Executables
*.exe
*.out
*.app
*.ipa
# These project files can be generated by the engine
*.xcodeproj
*.sln
*.suo
*.opensdf
*.sdf
*.VC.opendb
# Precompiled Assets
SourceArt/**/*.png
SourceArt/**/*.tga
# Binary Files
Binaries/*
# Builds
Build/*
# Don't ignore icon files in Build
!Build/**/*.ico
# Configuration files generated by the Editor
Saved/*
# Compiled source files for the engine to use
Intermediate/*
# Cache files for the editor to use
DerivedDataCache/*
...@@ -17,13 +17,15 @@ ...@@ -17,13 +17,15 @@
[Rr]eleases/ [Rr]eleases/
x64/ x64/
x86/ x86/
build/
bld/ bld/
[Bb]in/ [Bb]in/
[Oo]bj/ [Oo]bj/
[Ll]og/
# Visual Studo 2015 cache/options directory # Visual Studio 2015 cache/options directory
.vs/ .vs/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/
# MSTest test Results # MSTest test Results
[Tt]est[Rr]esult*/ [Tt]est[Rr]esult*/
...@@ -38,6 +40,10 @@ TestResult.xml ...@@ -38,6 +40,10 @@ TestResult.xml
[Rr]eleasePS/ [Rr]eleasePS/
dlldata.c dlldata.c
# DNX
project.lock.json
artifacts/
*_i.c *_i.c
*_p.c *_p.c
*_i.h *_i.h
...@@ -70,6 +76,7 @@ _Chutzpah* ...@@ -70,6 +76,7 @@ _Chutzpah*
ipch/ ipch/
*.aps *.aps
*.ncb *.ncb
*.opendb
*.opensdf *.opensdf
*.sdf *.sdf
*.cachefile *.cachefile
...@@ -78,6 +85,7 @@ ipch/ ...@@ -78,6 +85,7 @@ ipch/
*.psess *.psess
*.vsp *.vsp
*.vspx *.vspx
*.sap
# TFS 2012 Local Workspace # TFS 2012 Local Workspace
$tf/ $tf/
...@@ -90,7 +98,7 @@ _ReSharper*/ ...@@ -90,7 +98,7 @@ _ReSharper*/
*.[Rr]e[Ss]harper *.[Rr]e[Ss]harper
*.DotSettings.user *.DotSettings.user
# JustCode is a .NET coding addin-in # JustCode is a .NET coding add-in
.JustCode .JustCode
# TeamCity is a build add-in # TeamCity is a build add-in
...@@ -102,6 +110,7 @@ _TeamCity* ...@@ -102,6 +110,7 @@ _TeamCity*
# NCrunch # NCrunch
_NCrunch_* _NCrunch_*
.*crunch*.local.xml .*crunch*.local.xml
nCrunchTemp_*
# MightyMoose # MightyMoose
*.mm.* *.mm.*
...@@ -142,18 +151,33 @@ publish/ ...@@ -142,18 +151,33 @@ publish/
!**/packages/build/ !**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed # Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config #!**/packages/repositories.config
# NuGet v3's project.json files produces more ignoreable files
*.nuget.props
*.nuget.targets
# Windows Azure Build Output # Microsoft Azure Build Output
csx/ csx/
*.build.csdef *.build.csdef
# Microsoft Azure Emulator
ecf/
rcf/
# Microsoft Azure ApplicationInsights config file
ApplicationInsights.config
# Windows Store app package directory # Windows Store app package directory
AppPackages/ AppPackages/
BundleArtifacts/
# Others # Visual Studio cache files
# files ending in .cache can be ignored
*.[Cc]ache *.[Cc]ache
# but keep track of directories ending in .cache
!*.[Cc]ache/
# Others
ClientBin/ ClientBin/
[Ss]tyle[Cc]op.*
~$* ~$*
*~ *~
*.dbmdl *.dbmdl
...@@ -161,7 +185,7 @@ ClientBin/ ...@@ -161,7 +185,7 @@ ClientBin/
*.pfx *.pfx
*.publishsettings *.publishsettings
node_modules/ node_modules/
bower_components/ orleans.codegen.cs
# RIA/Silverlight projects # RIA/Silverlight projects
Generated_Code/ Generated_Code/
...@@ -186,6 +210,9 @@ UpgradeLog*.htm ...@@ -186,6 +210,9 @@ UpgradeLog*.htm
# Microsoft Fakes # Microsoft Fakes
FakesAssemblies/ FakesAssemblies/
# GhostDoc plugin setting file
*.GhostDoc.xml
# Node.js Tools for Visual Studio # Node.js Tools for Visual Studio
.ntvs_analysis.dat .ntvs_analysis.dat
...@@ -194,3 +221,17 @@ FakesAssemblies/ ...@@ -194,3 +221,17 @@ FakesAssemblies/
# Visual Studio 6 workspace options file # Visual Studio 6 workspace options file
*.opt *.opt
# Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts
**/*.DesktopClient/ModelManifest.xml
**/*.Server/GeneratedArtifacts
**/*.Server/ModelManifest.xml
_Pvt_Extensions
# Paket dependency manager
.paket/paket.exe
# FAKE - F# Make
.fake/
# for projects that use Waf for building: http://code.google.com/p/waf/ # for projects that use Waf for building: http://code.google.com/p/waf/
.waf-* .waf-*
.waf3-*
.lock-* .lock-*
...@@ -11,3 +11,8 @@ wp-content/cache/ ...@@ -11,3 +11,8 @@ wp-content/cache/
wp-content/upgrade/ wp-content/upgrade/
wp-content/uploads/ wp-content/uploads/
wp-content/wp-cache-config.php wp-content/wp-cache-config.php
wp-content/plugins/hello.php
/readme.html
/license.txt
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册