Skip to content

Commit 687e822

Browse files
authored
Merge branch 'main' into patch-1
2 parents ea2c3d4 + 0f33384 commit 687e822

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+780
-156
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
**Reasons for making this change:**
2+
<!-- Include your relationship to the project and what you expect to get from this change. -->
23

34
_TODO_
45

Android.gitignore

Lines changed: 12 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,30 @@
1-
# Built application files
2-
*.apk
3-
*.aar
4-
*.ap_
5-
*.aab
6-
7-
# Files for the ART/Dalvik VM
8-
*.dex
9-
10-
# Java class files
11-
*.class
12-
13-
# Generated files
14-
bin/
15-
gen/
16-
out/
17-
# Uncomment the following line in case you need and you don't have the release build type files in your app
18-
# release/
19-
201
# Gradle files
212
.gradle/
223
build/
234

245
# Local configuration file (sdk path, etc)
256
local.properties
267

27-
# Proguard folder generated by Eclipse
28-
proguard/
29-
30-
# Log Files
8+
# Log/OS Files
319
*.log
3210

33-
# Android Studio Navigation editor temp files
34-
.navigation/
35-
36-
# Android Studio captures folder
11+
# Android Studio generated files and folders
3712
captures/
13+
.externalNativeBuild/
14+
.cxx/
15+
*.apk
16+
output.json
3817

3918
# IntelliJ
4019
*.iml
41-
.idea/workspace.xml
42-
.idea/tasks.xml
43-
.idea/gradle.xml
44-
.idea/assetWizardSettings.xml
45-
.idea/dictionaries
46-
.idea/libraries
47-
# Android Studio 3 in .gitignore file.
48-
.idea/caches
49-
.idea/modules.xml
50-
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
51-
.idea/navEditor.xml
20+
.idea/
5221

5322
# Keystore files
54-
# Uncomment the following lines if you do not want to check your keystore files in.
55-
#*.jks
56-
#*.keystore
57-
58-
# External native build folder generated in Android Studio 2.2 and later
59-
.externalNativeBuild
60-
.cxx/
23+
*.jks
24+
*.keystore
6125

6226
# Google Services (e.g. APIs or Firebase)
63-
# google-services.json
64-
65-
# Freeline
66-
freeline.py
67-
freeline/
68-
freeline_project_description.json
69-
70-
# fastlane
71-
fastlane/report.xml
72-
fastlane/Preview.html
73-
fastlane/screenshots
74-
fastlane/test_output
75-
fastlane/readme.md
76-
77-
# Version control
78-
vcs.xml
27+
google-services.json
7928

80-
# lint
81-
lint/intermediates/
82-
lint/generated/
83-
lint/outputs/
84-
lint/tmp/
85-
# lint/reports/
29+
# Android Profiling
30+
*.hprof

Autotools.gitignore

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Makefile.in
77
/test-driver
88
/ylwrap
99
.deps/
10+
.dirstamp
1011

1112
# http://www.gnu.org/software/autoconf
1213

@@ -15,6 +16,7 @@ autom4te.cache
1516
/autoscan-*.log
1617
/aclocal.m4
1718
/compile
19+
/config.cache
1820
/config.guess
1921
/config.h.in
2022
/config.log
@@ -43,8 +45,8 @@ m4/ltsugar.m4
4345
m4/ltversion.m4
4446
m4/lt~obsolete.m4
4547

46-
# Generated Makefile
47-
# (meta build system like autotools,
48+
# Generated Makefile
49+
# (meta build system like autotools,
4850
# can automatically generate from config.status script
4951
# (which is called by configure script))
5052
Makefile

Coq.gitignore

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*.glob
1111
*.ml.d
1212
*.ml4.d
13+
*.mlg.d
1314
*.mli.d
1415
*.mllib.d
1516
*.mlpack.d
@@ -20,7 +21,7 @@
2021
*.vo
2122
*.vok
2223
*.vos
23-
.coq-native/
24+
.coq-native
2425
.csdp.cache
2526
.lia.cache
2627
.nia.cache
@@ -31,3 +32,14 @@ lia.cache
3132
nia.cache
3233
nlia.cache
3334
nra.cache
35+
native_compute_profile_*.data
36+
37+
# generated timing files
38+
*.timing.diff
39+
*.v.after-timing
40+
*.v.before-timing
41+
*.v.timing
42+
time-of-build-after.log
43+
time-of-build-before.log
44+
time-of-build-both.log
45+
time-of-build-pretty.log

Dart.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ pubspec.lock
1111
# If you don't generate documentation locally you can remove this line.
1212
doc/api/
1313

14+
# dotenv environment variables file
15+
.env*
16+
1417
# Avoid committing generated Javascript files:
1518
*.dart.js
1619
*.info.json # Produced by the --dump-info flag.
@@ -19,3 +22,6 @@ doc/api/
1922
*.js_
2023
*.js.deps
2124
*.js.map
25+
26+
.flutter-plugins
27+
.flutter-plugins-dependencies

Drupal.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,25 @@
2323

2424
# Ignore drupal core (if not versioning drupal sources)
2525
/core
26+
/vendor
2627
/modules/README.txt
2728
/profiles/README.txt
29+
/themes/README.txt
2830
/sites/README.txt
2931
/sites/example.sites.php
3032
/sites/example.settings.local.php
3133
/sites/development.services.yml
32-
/themes/README.txt
33-
/vendor
3434
/.csslintrc
3535
/.editorconfig
3636
/.eslintignore
3737
/.eslintrc.json
3838
/.gitattributes
39+
/.ht.router.php
3940
/.htaccess
4041
/autoload.php
41-
/composer.json
42-
/composer.lock
4342
/example.gitignore
4443
/index.php
44+
/INSTALL.txt
4545
/LICENSE.txt
4646
/README.txt
4747
/robots.txt

Global/AL.gitignore

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
.vscode/*
2+
!.vscode/settings.json
3+
!.vscode/tasks.json
4+
!.vscode/launch.json
5+
!.vscode/extensions.json
6+
*.code-workspace
7+
8+
# Local History for Visual Studio Code
9+
.history/
10+
*.app
11+
.snapshots/*

Global/JetBrains.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
1+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
22
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
33

44
# User-specific stuff
@@ -8,6 +8,9 @@
88
.idea/**/dictionaries
99
.idea/**/shelf
1010

11+
# AWS User-specific
12+
.idea/**/aws.xml
13+
1114
# Generated files
1215
.idea/**/contentModel.xml
1316

Global/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ This directory contains globally useful gitignores,
44
e.g. OS-specific and editor specific.
55

66
For more on global gitignores:
7-
<https://help.github.com/articles/ignoring-files/#create-a-global-gitignore>
7+
<https://help.github.com/en/github/using-git/ignoring-files#configuring-ignored-files-for-all-repositories-on-your-computer>
88

99
And a good blog post about 'em:
1010
<http://augustl.com/blog/2009/global_gitignores>

Global/VisualStudioCode.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,6 @@
44
!.vscode/launch.json
55
!.vscode/extensions.json
66
*.code-workspace
7+
8+
# Local History for Visual Studio Code
9+
.history/

0 commit comments

Comments
 (0)