filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,065 Commits 7 Branches 121 Tags 228 MiB
Commit Graph

16065 Commits

Author SHA1 Message Date
chagai95 491b3c351b
Create 6047.feature 2022-05-13 14:00:32 +02:00
chagai95 9f033ed623
add presence indicator busy and away 2022-05-13 13:55:10 +02:00
Onuray Sahin 47f43a88f4 Create dummy poll event for tests. 2022-05-13 14:04:33 +03:00
Michael Kaye 2bd89e6ec0 Note in installation section the need to change public_baseurl as well. 2022-05-13 11:44:47 +01:00
Michael Kaye 37db397e06 Remove accidental header 2022-05-13 11:40:26 +01:00
Onuray Sahin 85708b7c60 Fix related event id. 2022-05-13 12:59:41 +03:00
Michael Kaye 251e3a0a83 Ensure we print the user in the post-PR merge tests. 2022-05-13 10:40:03 +01:00
Benoit Marty cf3e34e548 Detekt: add rules about comment 2022-05-13 09:51:14 +02:00
Valere 7d5570fd6f quick format 2022-05-13 09:36:42 +02:00
Benoit Marty d17a273cb4 Changelog 2022-05-12 22:56:09 +02:00
Benoit Marty b70bc20b99 This is now detected by detekt 2022-05-12 22:53:07 +02:00
Benoit Marty 03ec9946ff Detekt: fix ConstructorParameterNaming 
UserProperties fix is also in https://github.com/matrix-org/matrix-analytics-events/pull/62
 2022-05-12 22:17:56 +02:00
Adam Brown cad9d443be
Merge pull request #6013 from vector-im/feature/adm/hide-ftue-ems 
FTUE - Temporarily hide EMS section
 2022-05-12 18:09:28 +01:00
Valere 8077406cba code review 2022-05-12 18:45:35 +02:00
Valere 5a323db7dc Unignore and improve tests 2022-05-12 18:45:35 +02:00
Valere b25b30719a Add test to check MSK signature on backup 2022-05-12 18:45:35 +02:00
Valere 22e0506814 Prevent 4S / megolm backup desync + sign with MSK 2022-05-12 18:45:35 +02:00
David Langley 44e8974c02 direction and track need to be set for hold/unhold 2022-05-12 17:01:44 +01:00
Benoit Marty 6f3b9c78b0 Detekt: fix FunctionParameterNaming 2022-05-12 17:56:05 +02:00
Benoit Marty c303b9afd3 Ignore more rules 2022-05-12 17:54:30 +02:00
Benoit Marty f02bad5c79 Detekt: fix ArrayPrimitive 2022-05-12 17:54:15 +02:00
Benoit Marty c3b5ba5639 Detekt: fix MatchingDeclarationName 2022-05-12 17:44:44 +02:00
Benoit Marty 3bc84f0d38 Detekt: fix MaxLineLength 
@ouchadam your test fun names are too long!
 2022-05-12 17:38:49 +02:00
Benoit Marty aeb6495253 Detekt: fix RethrowCaughtException 2022-05-12 17:32:00 +02:00
Benoit Marty 21904054a5 Detekt: ignore EmptyCatchBlock 2022-05-12 17:29:10 +02:00
Benoit Marty c19563bed2 Detekt: fix UtilityClassWithPublicConstructor 2022-05-12 17:26:11 +02:00
Benoit Marty cdbc9db890 Detekt: fix EmptyDefaultConstructor 2022-05-12 17:25:16 +02:00
Benoit Marty a09e893a0b Detekt: fix MayBeConst 2022-05-12 17:24:15 +02:00
Benoit Marty c5f9546605 Ignore more rules 2022-05-12 17:23:41 +02:00
Benoit Marty 824f029e20 "TODO:" is forbidden by Detekt 2022-05-12 17:06:52 +02:00
Benoit Marty d8cda04e14 We won't use this 2022-05-12 17:05:34 +02:00
Benoit Marty 7d6c27eed5 Ignore rule 2022-05-12 17:05:19 +02:00
Benoit Marty 911bfe2081 Let GA run detekt 2022-05-12 17:02:22 +02:00
Benoit Marty 9834371e18 Detekt: configure and ignore some rules. 2022-05-12 16:56:49 +02:00
Onuray Sahin 817428e295 Refactor ending polls. 2022-05-12 17:53:08 +03:00
Benoit Marty c02fb87bc9 Set up detekt gradle plugin 2022-05-12 16:41:36 +02:00
Jorge Martin Espinosa 3f8ddbec60
Merge pull request #5817 from vector-im/arb/pse-329 
Using the same User Avatar and display name for all messages in the timeline
 2022-05-12 16:23:11 +02:00
Ahmed Radhouane Belkilani 6a523ccc38 Allow using the latest user avatar and display name for all messages in the timeline 
Signed-off-by: Jorge Martín Espinosa <jorgem@element.io>
 2022-05-12 15:43:20 +02:00
Benoit Marty f54c865cf4
Merge pull request #5756 from vector-im/feature/bma/pr_doc_update 
Update doc about PR
 2022-05-12 15:03:03 +02:00
Suguru Hirahara bea8b3d8d1 Translated using Weblate (Japanese) 
Currently translated at 96.7% (2152 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ja/
 2022-05-12 12:59:44 +00:00
Stefan Schmidt 284fb639bf Translated using Weblate (German) 
Currently translated at 97.3% (2166 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/de/
 2022-05-12 12:59:43 +00:00
Sveinn í Felli b95ca0ae53 Translated using Weblate (Icelandic) 
Currently translated at 81.9% (1823 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/is/
 2022-05-12 12:59:43 +00:00
ariskotsomitopoulos 40de685f1a Merge branch 'develop' into feature/aris/threads_post_release_ui_improvements 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
#	vector/src/main/java/im/vector/app/features/home/room/detail/search/SearchResultController.kt
 2022-05-12 14:41:38 +03:00
Benoit Marty 4309fdba7e
Merge pull request #6021 from vector-im/feature/bma/finish_remove_flair 
Remove remaining dead code about flair
 2022-05-12 11:31:42 +02:00
Onuray Sahin 704e86d843 Refactor editing polls. 2022-05-12 12:22:27 +03:00
Adam Brown e56f6e910c
Merge pull request #6030 from vector-im/dependabot/gradle/mockk-1.12.4 
Bump mockk from 1.12.3 to 1.12.4
 2022-05-12 08:42:33 +01:00
dependabot[bot] d3ecc8e5c3
Bump mockk from 1.12.3 to 1.12.4 
Bumps `mockk` from 1.12.3 to 1.12.4.

Updates `mockk` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4)

Updates `mockk-android` from 1.12.3 to 1.12.4
- [Release notes](https://github.com/mockk/mockk/releases)
- [Commits](https://github.com/mockk/mockk/compare/1.12.3...1.12.4)

---
updated-dependencies:
- dependency-name: io.mockk:mockk
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.mockk:mockk-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-05-11 23:11:45 +00:00
Benoit Marty cd509accdb
Merge pull request #5936 from hanthor/develop 
Added themed icon for Android 13
 2022-05-11 17:34:38 +02:00
Benoit Marty deb0f1ad1b
Merge pull request #6000 from vector-im/dependabot/gradle/androidx.preference-preference-ktx-1.2.0 
Bump preference-ktx from 1.1.1 to 1.2.0
 2022-05-11 16:17:17 +02:00
Benoit Marty 1ef5416b50 Use the correct lint rule to ignore. 2022-05-11 15:02:01 +02:00