Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
15,682 Commits 530 Branches 157 Tags 485 MiB
27dcb6ef9c
Commit Graph

15682 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ariskotsomitopoulos
5cfe218634 Wrap only cryptoService.decryptEvent with runBlocking instead of the whole methods 2022-04-27 12:38:25 +03:00
ariskotsomitopoulos
51b42929bd Merge branch 'develop' into feature/aris/prevent_decryption_fom_suspend_functions 
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/timeline/TimelineEventDecryptor.kt
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/sync/handler/room/RoomSyncHandler.kt
 2022-04-27 12:26:16 +03:00
ariskotsomitopoulos
780f1ffc8c Merge branch 'develop' into feature/aris/fix_account_deactivation_issue 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
 2022-04-27 12:15:36 +03:00
manuroe
f5973fa840
Merge pull request #5836 from vector-im/feature/manu/pr-2-reviews 
Update the PR process doc with 2 reviewers and a new reviewer team
 2022-04-27 08:47:11 +02:00
Benoit Marty
521fd1fcd7
Merge pull request #5847 from vector-im/bugfix/eric/missing-call-icons 
Fixes Missing Call Icons when threads are enabled
 2022-04-26 22:30:07 +02:00
ericdecanini
9c951687b0 Moves tools ignore AlwaysShowAction to root of menu_timeline 2022-04-26 21:56:56 +02:00
ericdecanini
6548c3cf6f Replaces call title with action_voice_call 2022-04-26 21:54:54 +02:00
ericdecanini
e4cd31d5ab Adds changelog file 2022-04-26 21:13:36 +02:00
ericdecanini
f6a03cdc63 Fixes missing call icons 2022-04-26 21:10:40 +02:00
Benoit Marty
d694ea16a8
Merge pull request #5816 from vector-im/feature/bma/sdk_doc_update 
Implement a more scoped API to the `Session` interface
 2022-04-26 17:00:29 +02:00
Benoit Marty
8ff7acaec5
Merge pull request #5832 from vector-im/feature/manu/elementx_gh_workflow 
Add a GH workflow to push ElementX issues to the global board
 2022-04-26 16:18:57 +02:00
Benoit Marty
6ee0b62272
Merge branch 'develop' into feature/bma/sdk_doc_update 2022-04-26 16:15:07 +02:00
Adam Brown
636f7fdc30
removing comment re-explains what the code is already doing 2022-04-26 15:14:58 +01:00
Benoit Marty
f863bdea37
Merge pull request #5844 from vector-im/cgizard/disable-update-gradle-wrapper 
Disable update-gradle-wrapper for forks
 2022-04-26 16:10:58 +02:00
Claire G
40f3165d7f update comment 2022-04-26 15:13:27 +02:00
Claire G
766059ffd1 disable update-gradle-wrapper for forks 2022-04-26 15:11:18 +02:00
Benoit Marty
f2bd93afe6
Merge pull request #5838 from vector-im/dependabot/gradle/org.jetbrains.dokka-dokka-gradle-plugin-1.6.21 
Bump dokka-gradle-plugin from 1.6.20 to 1.6.21
 2022-04-26 15:02:43 +02:00
dependabot[bot]
66fd100333
Bump dokka-gradle-plugin from 1.6.20 to 1.6.21 
Bumps dokka-gradle-plugin from 1.6.20 to 1.6.21.

---
updated-dependencies:
- dependency-name: org.jetbrains.dokka:dokka-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-26 13:00:14 +00:00
Benoit Marty
9e8e6c8b18
Merge pull request #5839 from vector-im/dependabot/gradle/org.owasp-dependency-check-gradle-7.1.0.1 
Bump dependency-check-gradle from 7.0.4.1 to 7.1.0.1
 2022-04-26 14:59:42 +02:00
Benoit Marty
d4c0575f28 Merge remote-tracking branch 'origin/hotfix/1.4.13' into develop 2022-04-26 11:50:23 +02:00
ariskotsomitopoulos
ba99d5c028 Merge branch 'develop' into feature/aris/fix_account_deactivation_issue 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/account/deactivation/DeactivateAccountViewModel.kt
 2022-04-26 12:49:21 +03:00
Benoit Marty
6059b71015 Merge branch 'hotfix/1.4.13' into main 2022-04-26 11:47:11 +02:00
Benoit Marty
6b5822e3d5 fastlane (same content than for 1.4.12) 2022-04-26 11:35:43 +02:00
Benoit Marty
ebcab189f2 towncrier 2022-04-26 11:31:51 +02:00
Benoit Marty
da656ac470 Changelog 2022-04-26 11:30:53 +02:00
Benoit Marty
b2f9d6778a Version hotfix 1.4.13 2022-04-26 11:29:40 +02:00
Maxime NATUREL
343322ef21
Merge pull request #5814 from vector-im/fix/mna/live-location-beacon-format 
[Live location sharing] - Removing BeaconInfo structure
 2022-04-26 09:57:46 +02:00
dependabot[bot]
17189f2d58
Bump dependency-check-gradle from 7.0.4.1 to 7.1.0.1 
Bumps dependency-check-gradle from 7.0.4.1 to 7.1.0.1.

---
updated-dependencies:
- dependency-name: org.owasp:dependency-check-gradle
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-04-25 23:10:13 +00:00
Kominak Halalu
47c64024ac Added translation using Weblate (Bengali) 2022-04-25 22:29:56 +00:00
Zet
866168af5c Translated using Weblate (Arabic) 
Currently translated at 43.0% (954 of 2217 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ar/
 2022-04-25 18:59:38 +00:00
Benoit Marty
c542619525 We do not need to observe the user here 2022-04-25 18:31:30 +02:00
Benoit Marty
abdfd9deee Format 2022-04-25 18:29:49 +02:00
manuroe
1b387c8242 Update the PR process doc with 2 reviewers and a new reviewer team. 2022-04-25 18:20:16 +02:00
Benoit Marty
d2eca739f4 Apply suggestion 2022-04-25 17:55:31 +02:00
Benoit Marty
fb736281f0 Rename val 2022-04-25 17:49:50 +02:00
Benoit Marty
cd06ba656a Ensure getRootSpaceSummaries() is not called on the main thread. 2022-04-25 16:10:17 +02:00
manuroe
d2f6f0fa92 Add a GH workflow to push ElementX issues to the global board 
https://github.com/orgs/vector-im/projects/43
 2022-04-25 11:11:09 +02:00
Benoit Marty
4af883f5d2 changelog 2022-04-25 09:49:51 +02:00
Benoit Marty
272bdf95cb Use the session SearchService to search in a room. 2022-04-25 09:49:51 +02:00
Benoit Marty
0092a7057e Access the various services with a getter 2022-04-25 09:49:51 +02:00
Benoit Marty
016551f79f This 2 services can also be Lazy 2022-04-25 09:49:05 +02:00
Benoit Marty
0449606f0b Dokka config: try to ignore org.matrix.android.sdk.internal.legacy.riot 2022-04-25 09:49:05 +02:00
Benoit Marty
51f7c68d3f Dokka config: emit a warning for undocumented elements 2022-04-25 09:49:05 +02:00
Benoit Marty
96b2254ac1 Small update of the Matrix documentation 2022-04-25 09:48:57 +02:00
Benoit Marty
a52182490d Add a TODO for next Weblate sync 2022-04-25 09:48:35 +02:00
Benoit Marty
b36955f6e2
Merge pull request #5812 from vector-im/feature/bma/dokka_3 
Feature/bma/dokka 3
 2022-04-25 09:43:17 +02:00
Kat Gerasimova
e3198e5b25 Update issue labelling automation 
Don't label A-Threads with Z-Labs any more because threads have been released
 2022-04-25 08:41:05 +01:00
Benoit Marty
b88a86a0cf
Merge pull request #5824 from vector-im/feature/forked-disable-triage-move-review-requests 
disable triage-move-review-requests for forks
 2022-04-25 09:40:34 +02:00
Henry Jackson
e4b8530356 Updated copy and moved override in profile screen 
- Used display name instead of nick to match other strings in the app.
- Reordered member profile to show DM above changing nick colour.

Fixes #5825

Signed-off-by: Henry Jackson <manicwaspcore@protonmail.com>
 2022-04-24 19:33:11 +01:00
Besnik Bleta
ec0b5a8593 Translated using Weblate (Albanian) 
Currently translated at 100.0% (57 of 57 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/sq/
 2022-04-24 17:00:56 +00:00