Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 19 additions & 41 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,47 +1,25 @@
# Generated files
bin/
gen/

# Gradle files
.gradle/
build/
.cxx

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

# Proguard folder generated by Eclipse
proguard/

# Log Files
*.log

# Android Studio Navigation editor temp files
.navigation/

# Android Studio captures folder
captures/

# Android Studio files
# From Android Studio template
*.iml
.gradle
/local.properties
/.idea/caches
/.idea/libraries
/.idea/modules.xml
/.idea/workspace.xml
/.idea/navEditor.xml
/.idea/assetWizardSettings.xml
.DS_Store
/build
/captures
.externalNativeBuild
.cxx
local.properties

# Intellij
*.iml
.idea/workspace.xml
.idea/libraries
.idea/misc.xml
.idea/caches/*
.idea/codeStyles/codeStyleConfig.xml

# Custom settings
/.idea/misc.xml
/release
/docker-mailserver/maildata_volume/
# Keystore files
*.jks

# keystore info
FlowCrypt/keystore.properties

FlowCrypt/src/main/assets/.idea/vcs.xml
FlowCrypt/src/main/assets/.idea/workspace.xml

release/*.apk
docker-mailserver/maildata_volume/
/FlowCrypt/keystore.properties
16 changes: 16 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/codeStyles/codeStyleConfig.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ blocks:

- name: 'Testing'
execution_time_limit:
minutes: 30
minutes: 40
task:
jobs:
- name: 'JUnit tests'
Expand Down
1 change: 0 additions & 1 deletion FlowCrypt/src/main/assets/.idea/.name

This file was deleted.

This file was deleted.

8 changes: 0 additions & 8 deletions FlowCrypt/src/main/assets/.idea/modules.xml

This file was deleted.