Merge branch 'main' into master

This commit is contained in:
Brian Douglas 2021-12-04 15:12:29 -08:00 committed by GitHub
commit c9e02960b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 112 additions and 90 deletions

View File

@ -1,4 +1,5 @@
**Reasons for making this change:** **Reasons for making this change:**
<!-- Include your relationship to the project and what you expect to get from this change. -->
_TODO_ _TODO_

View File

@ -1,22 +1,3 @@
# Built application files
*.apk
*.aar
*.ap_
*.aab
# Files for the ART/Dalvik VM
*.dex
# Java class files
*.class
# Generated files
bin/
gen/
out/
# Uncomment the following line in case you need and you don't have the release build type files in your app
# release/
# Gradle files # Gradle files
.gradle/ .gradle/
build/ build/
@ -24,66 +5,26 @@ build/
# Local configuration file (sdk path, etc) # Local configuration file (sdk path, etc)
local.properties local.properties
# Proguard folder generated by Eclipse # Log/OS Files
proguard/
# Log Files
*.log *.log
# Android Studio Navigation editor temp files # Android Studio generated files and folders
.navigation/
# Android Studio captures folder
captures/ captures/
.externalNativeBuild/
.cxx/
*.apk
output.json
# IntelliJ # IntelliJ
*.iml *.iml
.idea/workspace.xml .idea/
.idea/tasks.xml
.idea/gradle.xml
.idea/assetWizardSettings.xml
.idea/dictionaries
.idea/libraries
.idea/jarRepositories.xml
# Android Studio 3 in .gitignore file.
.idea/caches
.idea/modules.xml
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
.idea/navEditor.xml
# Keystore files # Keystore files
# Uncomment the following lines if you do not want to check your keystore files in. *.jks
#*.jks *.keystore
#*.keystore
# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
.cxx/
# Google Services (e.g. APIs or Firebase) # Google Services (e.g. APIs or Firebase)
# google-services.json google-services.json
# Freeline
freeline.py
freeline/
freeline_project_description.json
# fastlane
fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
fastlane/readme.md
# Version control
vcs.xml
# lint
lint/intermediates/
lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/
# Android Profiling # Android Profiling
*.hprof *.hprof

11
Global/AL.gitignore Normal file
View File

@ -0,0 +1,11 @@
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
*.code-workspace
# Local History for Visual Studio Code
.history/
*.app
.snapshots/*

View File

@ -13,3 +13,6 @@
# Dependency directories (remove the comment below to include it) # Dependency directories (remove the comment below to include it)
# vendor/ # vendor/
# Go workspace file
go.work

View File

@ -1,2 +1,7 @@
# Idris 2
*.ttc
*.ttm
# Idris 1
*.ibc *.ibc
*.o *.o

View File

@ -21,3 +21,4 @@
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid* hs_err_pid*
replay_pid*

View File

@ -1,5 +1,5 @@
# For PCBs designed using KiCad: http://www.kicad-pcb.org/ # For PCBs designed using KiCad: https://www.kicad.org/
# Format documentation: http://kicad-pcb.org/help/file-formats/ # Format documentation: https://kicad.org/help/file-formats/
# Temporary files # Temporary files
*.000 *.000

View File

@ -54,6 +54,9 @@ web_modules/
# Optional eslint cache # Optional eslint cache
.eslintcache .eslintcache
# Optional stylelint cache
.stylelintcache
# Microbundle cache # Microbundle cache
.rpt2_cache/ .rpt2_cache/
.rts2_cache_cjs/ .rts2_cache_cjs/
@ -95,6 +98,10 @@ dist
# vuepress build output # vuepress build output
.vuepress/dist .vuepress/dist
# vuepress v2.x temp and cache directory
.temp
.cache
# Serverless directories # Serverless directories
.serverless/ .serverless/

View File

@ -136,3 +136,10 @@ dmypy.json
# Cython debug symbols # Cython debug symbols
cython_debug/ cython_debug/
# PyCharm
# JetBrains specific template is maintainted in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/master/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/

View File

@ -4,6 +4,7 @@
# Session Data files # Session Data files
.RData .RData
.RDataTmp
# User-specific files # User-specific files
.Ruserdata .Ruserdata

View File

@ -27,7 +27,7 @@ config/master.key
# dotenv, dotenv-rails # dotenv, dotenv-rails
# TODO Comment out these rules if environment variables can be committed # TODO Comment out these rules if environment variables can be committed
.env .env
.env.* .env*.local
## Environment normalization: ## Environment normalization:
/.bundle /.bundle

View File

@ -111,6 +111,9 @@ acs-*.bib
*.glsdefs *.glsdefs
*.lzo *.lzo
*.lzs *.lzs
*.slg
*.slo
*.sls
# uncomment this for glossaries-extra (will ignore makeindex's style files!) # uncomment this for glossaries-extra (will ignore makeindex's style files!)
# *.ist # *.ist

View File

@ -14,6 +14,9 @@
# They also could contain extremely sensitive data # They also could contain extremely sensitive data
/[Mm]emoryCaptures/ /[Mm]emoryCaptures/
# Recordings can get excessive in size
/[Rr]ecordings/
# Asset meta data should only be ignored when the corresponding asset is also ignored # Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta !/[Aa]ssets/**/*.meta
@ -59,6 +62,7 @@ sysinfo.txt
*.apk *.apk
*.aab *.aab
*.unitypackage *.unitypackage
*.app
# Crashlytics generated file # Crashlytics generated file
crashlytics-build.properties crashlytics-build.properties

View File

@ -294,6 +294,17 @@ node_modules/
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
*.vbw *.vbw
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
*.vbp
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
*.dsw
*.dsp
# Visual Studio 6 technical files
*.ncb
*.aps
# Visual Studio LightSwitch build output # Visual Studio LightSwitch build output
**/*.HTMLClient/GeneratedArtifacts **/*.HTMLClient/GeneratedArtifacts
**/*.DesktopClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts
@ -381,5 +392,4 @@ FodyWeavers.xsd
*.msp *.msp
# JetBrains Rider # JetBrains Rider
.idea/
*.sln.iml *.sln.iml

View File

@ -1,23 +1,48 @@
# ignore everything in the root except the "wp-content" directory. # Wordpress - ignore core, configuration, examples, uploads and logs.
!wp-content/ # https://github.com/github/gitignore/blob/master/WordPress.gitignore
# ignore everything in the "wp-content" directory, except: # Core
# "mu-plugins", "plugins", "themes" directory #
wp-content/* # Note: if you want to stage/commit WP core files
!wp-content/mu-plugins/ # you can delete this whole section/until Configuration.
!wp-content/plugins/ /wp-admin/
!wp-content/themes/ /wp-content/index.php
/wp-content/languages
/wp-content/plugins/index.php
/wp-content/themes/index.php
/wp-includes/
/index.php
/license.txt
/readme.html
/wp-*.php
/xmlrpc.php
# ignore these plugins # Configuration
wp-content/plugins/hello.php wp-config.php
# ignore specific themes # Example themes
wp-content/themes/twenty*/ /wp-content/themes/twenty*/
# ignore node dependency directories # Example plugin
node_modules/ /wp-content/plugins/hello.php
# ignore log files and databases # Uploads
/wp-content/uploads/
# Log files
*.log *.log
*.sql
*.sqlite # htaccess
/.htaccess
# All plugins
#
# Note: If you wish to whitelist plugins,
# uncomment the next line
#/wp-content/plugins
# All themes
#
# Note: If you wish to whitelist themes,
# uncomment the next line
#/wp-content/themes

View File

@ -6,3 +6,6 @@
hugo.exe hugo.exe
hugo.darwin hugo.darwin
hugo.linux hugo.linux
# Temporary lock file while building
/.hugo_build.lock