Skip to content

Commit 65e0a98

Browse files
committed
Merge branch 'develop'
2 parents 39c2655 + b67e41f commit 65e0a98

22 files changed

+970
-323
lines changed

.gitignore

Lines changed: 120 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11

2-
# Created by https://www.gitignore.io/api/node,macos,linux,windows
2+
3+
# Created by https://www.gitignore.io/api/vim,code,node,macos,linux,windows,webstorm,sublimetext
4+
5+
### Code ###
6+
# Visual Studio Code - https://code.visualstudio.com/
7+
.settings/
8+
.vscode/
9+
tsconfig.json
10+
jsconfig.json
311

412
### Linux ###
513
*~
@@ -104,6 +112,113 @@ typings/
104112
.env
105113

106114

115+
### SublimeText ###
116+
# cache files for sublime text
117+
*.tmlanguage.cache
118+
*.tmPreferences.cache
119+
*.stTheme.cache
120+
121+
# workspace files are user-specific
122+
*.sublime-workspace
123+
124+
# project files should be checked into the repository, unless a significant
125+
# proportion of contributors will probably not be using SublimeText
126+
# *.sublime-project
127+
128+
# sftp configuration file
129+
sftp-config.json
130+
131+
# Package control specific files
132+
Package Control.last-run
133+
Package Control.ca-list
134+
Package Control.ca-bundle
135+
Package Control.system-ca-bundle
136+
Package Control.cache/
137+
Package Control.ca-certs/
138+
Package Control.merged-ca-bundle
139+
Package Control.user-ca-bundle
140+
oscrypto-ca-bundle.crt
141+
bh_unicode_properties.cache
142+
143+
# Sublime-github package stores a github token in this file
144+
# https://packagecontrol.io/packages/sublime-github
145+
GitHub.sublime-settings
146+
147+
### Vim ###
148+
# swap
149+
[._]*.s[a-v][a-z]
150+
[._]*.sw[a-p]
151+
[._]s[a-v][a-z]
152+
[._]sw[a-p]
153+
# session
154+
Session.vim
155+
# temporary
156+
.netrwhist
157+
# auto-generated tag files
158+
tags
159+
160+
### WebStorm ###
161+
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
162+
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
163+
164+
# User-specific stuff:
165+
.idea/**/workspace.xml
166+
.idea/**/tasks.xml
167+
.idea/dictionaries
168+
169+
# Sensitive or high-churn files:
170+
.idea/**/dataSources/
171+
.idea/**/dataSources.ids
172+
.idea/**/dataSources.xml
173+
.idea/**/dataSources.local.xml
174+
.idea/**/sqlDataSources.xml
175+
.idea/**/dynamic.xml
176+
.idea/**/uiDesigner.xml
177+
178+
# Gradle:
179+
.idea/**/gradle.xml
180+
.idea/**/libraries
181+
182+
# CMake
183+
cmake-build-debug/
184+
185+
# Mongo Explorer plugin:
186+
.idea/**/mongoSettings.xml
187+
188+
## File-based project format:
189+
*.iws
190+
191+
## Plugin-specific files:
192+
193+
# IntelliJ
194+
/out/
195+
196+
# mpeltonen/sbt-idea plugin
197+
.idea_modules/
198+
199+
# JIRA plugin
200+
atlassian-ide-plugin.xml
201+
202+
# Cursive Clojure plugin
203+
.idea/replstate.xml
204+
205+
# Crashlytics plugin (for Android Studio and IntelliJ)
206+
com_crashlytics_export_strings.xml
207+
crashlytics.properties
208+
crashlytics-build.properties
209+
fabric.properties
210+
211+
### WebStorm Patch ###
212+
# Comment Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-215987721
213+
214+
# *.iml
215+
# modules.xml
216+
# .idea/misc.xml
217+
# *.ipr
218+
219+
# Sonarlint plugin
220+
.idea/sonarlint
221+
107222
### Windows ###
108223
# Windows thumbnail cache files
109224
Thumbs.db
@@ -125,15 +240,14 @@ $RECYCLE.BIN/
125240
# Windows shortcuts
126241
*.lnk
127242

128-
# End of https://www.gitignore.io/api/node,macos,linux,windows
243+
# End of https://www.gitignore.io/api/vim,code,node,macos,linux,windows,webstorm,sublimetext
129244

130245
## Project
131246

132-
.idea
133-
134-
test
135247
lib
136248

137249
*.zip
250+
*.tgz
138251
lambda-config.json
139-
lambda-aws-config.json
252+
lambda-secrets.json
253+
lambda-tests.json

.idea/aws-node-lambda-helper.iml

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyleSettings.xml

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jsLibraryMappings.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 30 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/modules.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/typescript-compiler.xml

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/vcs.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/watcherTasks.xml

Lines changed: 4 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)