Skip to content

Commit 56b3e8a

Browse files
author
Onuray Sahin
committed
Merge branch 'develop' into feature/ons/voip_screen_sharing_permission
* develop: (107 commits) Fixes long line and comment lint errors Fixes lint errors Adds changelog file Formats entire project Adds changelog file Makes MediaType internal Bump libphonenumber from 8.12.46 to 8.12.47 updating release version in preparation for next cycle generating changelog Replaces writeAsync with awaitTransaction Replaces doWithRealm with writeAsync Translated using Weblate (Polish) Translated using Weblate (Slovak) Crash: open private room by link. Use RoomId instead of the alias. Translated using Weblate (Arabic) Makes MediaFileUtils function internal Removes runCatching from TemporaryFileCreator using unix end of line character instead of windows as *nix OSes are more common dev environments remove spaces feedback from left panel (#5686) Translated using Weblate (French) ... # Conflicts: # vector/src/main/java/im/vector/app/features/call/VectorCallViewModel.kt
2 parents 949d476 + c21ec98 commit 56b3e8a

File tree

396 files changed

+3317
-1420
lines changed

Some content is hidden

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

396 files changed

+3317
-1420
lines changed

.editorconfig

Lines changed: 901 additions & 14 deletions
Large diffs are not rendered by default.

CHANGES.md

Lines changed: 62 additions & 0 deletions

build.gradle

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ allprojects {
106106
// display the corresponding rule
107107
verbose = true
108108
disabledRules = [
109+
// TODO: Re-enable these 4 rules after reformatting project
110+
"indent",
111+
"experimental:argument-list-wrapping",
112+
"max-line-length",
113+
"parameter-list-wrapping",
114+
109115
"spacing-between-declarations-with-comments",
110116
"no-multi-spaces",
111117
"experimental:spacing-between-declarations-with-annotations",

changelog.d/2396.wip

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/5079.misc

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/5262.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/5279.wip

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/5475.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/5481.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

changelog.d/5554.bugfix

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)