Skip to content

Commit

Permalink
Merge pull request #1507 from kiwix/release/3.0
Browse files Browse the repository at this point in the history
Release/3.0
  • Loading branch information
macgills authored Sep 23, 2019
2 parents a8930a3 + f9e722f commit e0d5bd7
Show file tree
Hide file tree
Showing 604 changed files with 29,913 additions and 11,977 deletions.
49 changes: 32 additions & 17 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,20 +1,35 @@
# EditorConfig is awesome: https://EditorConfig.org
[*]
charset=utf-8
end_of_line=lf
insert_final_newline=true
indent_style=space
indent_size=2

# top-most EditorConfig file
root = true
[{*.sht,*.html,*.shtm,*.shtml,*.htm}]
indent_style=space
indent_size=4

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
indent_style = space
indent_size = 2
insert_final_newline = true
charset = utf-8
# android studio / intellij specific, also in squares android style guide:
# https://github.com/kiwix/kiwix-android/blob/master/docs/codestyle.md
continuation_indent_size = 4

# windows command files need windows newline
[*.{bat, cmd}]
end_of_line = crlf
[*.json]
indent_style=space
indent_size=2

[*.properties]
indent_style=space
indent_size=4

[.editorconfig]
indent_style=space
indent_size=4

[{*.pyw,*.py}]
indent_style=space
indent_size=4

[{*.yml,*.yaml}]
indent_style=space
indent_size=2

[{*.markdown,*.md,*.mkd}]
indent_style=space
indent_size=4

27 changes: 27 additions & 0 deletions .github/move.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Configuration for Move Issues - https://github.com/dessant/move-issues

# Delete the command comment when it contains no other content
deleteCommand: true

# Close the source issue after moving
closeSourceIssue: true

# Lock the source issue after moving
lockSourceIssue: false

# Mention issue and comment authors
mentionAuthors: true

# Preserve mentions in the issue content
keepContentMentions: true

# Move labels that also exist on the target repository
moveLabels: true

# Set custom aliases for targets
# aliases:
# r: repo
# or: owner/repo

# Repository to extend settings from
# _extends: repo
20 changes: 15 additions & 5 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
daysUntilStale: 60
daysUntilClose: false
staleLabel: stale
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be now be reviewed manually. Thank you
for your contributions.

issues:
daysUntilStale: 60
markComment: >
This issue has been automatically marked as stale because it has not had
recent activity. It will be now be reviewed manually. Thank you
for your contributions.
pulls:
daysUntilStale: 7
markComment: >
This pull request has been automatically marked as stale because it has not had
recent activity. It will be now be reviewed manually. Thank you
for your contributions.
21 changes: 16 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ proguard/
### Android Patch ###
gen-external-apklibs

# IDE
.idea
.settings
*.iml

# Mac OS X
.DS_Store

Expand All @@ -55,3 +50,19 @@ glassify

.vscode
captures/

# IDEA/Android Studio ignores
*.iml
*.ipr
*.iws
/.idea/*

# IDEA/Android Studio Ignore exceptions
!/.idea/vcs.xml
!/.idea/fileTemplates/
!/.idea/inspectionProfiles/
!/.idea/scopes/
!/.idea/codeStyles/
!/.idea/encodings.xml
!/.idea/copyright/
!/.idea/compiler.xml
Loading

0 comments on commit e0d5bd7

Please sign in to comment.