mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-28 05:31:21 +03:00
Code Issues Projects Releases Packages Wiki Activity
10252 commits 161 branches 158 tags 270 MiB
Commit graph

6476 commits

Author SHA1 Message Date
Benoit Marty
8189fc0b66
Merge pull request #3920 from vector-im/feature/bma/string_cleanup 
Improve documentation about string resource
 2021-08-30 14:31:24 +02:00
Benoit Marty
23e3241b95
Merge pull request #1809 from dkter/conversation-features 
Support Android 11 Conversation features
 2021-08-30 14:15:42 +02:00
Benoit Marty
2a89e2b4ac
Merge pull request #3908 from vector-im/feature/fga/fix_jitsi_widget 
Fix Jitsi-hosted jitsi conferences not loading
 2021-08-30 13:57:39 +02:00
Benoit Marty
b6d3689475 Fix warning as per #3901 2021-08-30 12:30:11 +02:00
Benoit Marty
42915a93db Fix warning "Multiple substitutions specified in non-positional format" 2021-08-30 11:52:43 +02:00
Benoit Marty
d349656b34 Remove translations without original source 2021-08-30 11:42:08 +02:00
Weblate
ed9e9336e0 Merge branch 'origin/develop' into Weblate. 2021-08-30 09:00:46 +00:00
Benoit Marty
7a766ddb92 Temporary revert to fix Weblate merge conflict 2021-08-30 10:59:49 +02:00
Graeme Power
7ab0e22c51 Translated using Weblate (Irish) 
Currently translated at 7.6% (195 of 2565 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ga/
 2021-08-30 08:24:01 +00:00
lvre
8ebe6a9989 Translated using Weblate (Portuguese (Brazil)) 
Currently translated at 100.0% (2565 of 2565 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/pt_BR/
 2021-08-30 08:23:56 +00:00
Benoit Marty
0f2191a8b1 Translated using Weblate (Frisian) 
Currently translated at 38.4% (986 of 2565 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/fy/
 2021-08-28 16:25:20 +00:00
David Teresi
15217d98ac Only set SHORTCUT_CATEGORY_CONVERSATION above API 25 2021-08-27 18:49:45 -04:00
Benoit Marty
65c8ae3597
Merge pull request #3739 from vector-im/feature/bca/accept_unbound_3pid_invite 
support email invite
 2021-08-27 19:02:42 +02:00
Benoit Marty
5b2478a34f
Merge pull request #3894 from vector-im/feature/dla/keyword_notification_settings 
Feature/dla/keyword notification settings
 2021-08-27 18:19:17 +02:00
Valere
67295c6bdd Fix compilation 2021-08-27 17:55:52 +02:00
Benoit Marty
54a4a84ac0
Merge pull request #3741 from vector-im/dependabot/gradle/daggerVersion-2.38.1 
Bump daggerVersion from 2.38 to 2.38.1
 2021-08-27 17:37:03 +02:00
Valere
efa9ff0959 unused param 2021-08-27 17:30:32 +02:00
Valere
819e7c49b0 Code review 2021-08-27 17:30:32 +02:00
Valere
69c84a2460 support email invite 2021-08-27 17:30:09 +02:00
Valere
4107d2643c
Merge pull request #3704 from vector-im/feature/bca/promote_restricted 
Promote restricted join rule to admins
 2021-08-27 17:27:57 +02:00
Benoit Marty
6dccc3e752
Merge pull request #3913 from vector-im/feature/bma/3910_fix_crash 
Feature/bma/3910 fix crash
 2021-08-27 17:09:13 +02:00
David Langley
0dd89e650c Remove host pattern. 2021-08-27 16:07:34 +01:00
David Langley
21c2b0b2dd Lint 2021-08-27 15:49:13 +01:00
David Langley
68eaefbc9c Show error dialog rather than toast. Add validation to keyword field for slashes and dots. 2021-08-27 15:48:11 +01:00
Benoit Marty
0046de576e
Merge pull request #3767 from vector-im/dependabot/gradle/androidx.constraintlayout-constraintlayout-2.1.0 
Bump constraintlayout from 2.1.0-beta02 to 2.1.0
 2021-08-27 16:39:34 +02:00
dependabot[bot]
7a44c6980c
Bump daggerVersion from 2.38 to 2.38.1 
Bumps `daggerVersion` from 2.38 to 2.38.1.

Updates `dagger` from 2.38 to 2.38.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38...dagger-2.38.1)

Updates `dagger-compiler` from 2.38 to 2.38.1
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.38...dagger-2.38.1)

---
updated-dependencies:
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-27 14:33:17 +00:00
Benoit Marty
fa1a6b141a
Merge pull request #3832 from vector-im/dependabot/gradle/com.jakewharton.timber-timber-5.0.1 
Bump timber from 4.7.1 to 5.0.1
 2021-08-27 16:32:29 +02:00
Benoit Marty
c6c66ccf31
Merge pull request #3903 from vector-im/feature/ons/fix_voice_message_lollipop_crash 
Crash on opening a room on Android 5.0 and 5.1 - Regression with Voice message
 2021-08-27 16:31:49 +02:00
Benoit Marty
72a6d6c9a6
Update vector/src/main/java/im/vector/app/features/home/room/detail/composer/VoiceMessageRecorderView.kt 2021-08-27 16:31:20 +02:00
Benoit Marty
33a3813e87 Fix a crash at start-up if translated string is empty 2021-08-27 16:05:16 +02:00
Valere
b9e2374a4c cleaning 
review


fix string warning
 2021-08-27 15:56:07 +02:00
Valere
6f45ba575b post rebase cleaning 2021-08-27 15:56:07 +02:00
Valere
e8d01becfe Code review 2021-08-27 15:56:07 +02:00
Valere
1f6b8d2b12 Check that is admin 2021-08-27 15:56:07 +02:00
Valere
de6b5af6ba Promote restricted join rule to admins 2021-08-27 15:56:07 +02:00
Benoit Marty
e78434d25c
Merge pull request #3900 from vector-im/feature/fre/expired_account_error 
Add expired account error code
 2021-08-27 15:09:08 +02:00
Florian Renaud
1ca4b3b78a Add expired account error code 
For synapse instances which have activated and configured the email account validity module, an error code (ORG_MATRIX_EXPIRED_ACCOUNT) is triggered for any request authenticated by the user's access token which is expired.
This change only add the error code in the matrix SDK but does not handle it for now in the client side.

More documentation can be found in the dedicated Synapse plugin module repository: https://github.com/matrix-org/synapse-email-account-validity
 2021-08-27 14:28:07 +02:00
ganfra
afa2f13dda Merge branch 'develop' into feature/fga/fix_jitsi_widget 2021-08-27 14:22:48 +02:00
David Langley
9d663413a9 Don't auto focus and only scroll to preference when focused. 2021-08-27 13:16:19 +01:00
ganfra
84e6a67a51 Jitsi widget: refact a bit so we use data instead of url when possible 2021-08-27 14:03:52 +02:00
David Langley
9b3fe7449b Move scrollToPreference to the right place. 2021-08-27 12:11:11 +01:00
David Langley
dbc76c7aee No ned to add/remove chips locally in KeywordPreference. 2021-08-27 11:52:00 +01:00
David Langley
1127a05a3e Enable keywords by default if none exist. Add "Add" Button. 2021-08-27 11:40:15 +01:00
Benoit Marty
5b908c404e
Merge pull request #3863 from vector-im/feature/fga/new_voip_design 
Feature/fga/new voip design
 2021-08-27 12:02:35 +02:00
Benoit Marty
1815acf1ae
Merge pull request #3765 from vector-im/feature/bca/m11.12 
Spaces | Default to 'Home' in settings
 2021-08-27 12:01:52 +02:00
ganfra
dae035aa76 Fix Jitsi-hosted jitsi conferences not loading (#2846) 2021-08-26 17:14:25 +02:00
ganfra
fd25813862 Merge branch 'develop' into feature/fga/new_voip_design 2021-08-26 15:15:16 +02:00
Onuray Sahin
41c0d4d14f Fix crash on lollipop devices due to onVisibilityChanged is called before constructor. 2021-08-26 13:50:23 +03:00
ganfra
26d2694301 Call: fix outgoing ring issue 2021-08-26 11:44:29 +02:00
Benoit Marty
97bdd14880
Merge pull request #3854 from vector-im/feature/fga/call_end_reasons_dialog 
Call ended: handle busy reason and invite timeout.
 2021-08-26 11:40:27 +02:00