Commit Graph

10293 Commits

Author SHA1 Message Date
Benoit Marty b6d3689475 Fix warning as per #3901 2021-08-30 12:30:11 +02:00
Benoit Marty 381fc75d7e Update instruction about string resources 2021-08-30 12:15:42 +02:00
Benoit Marty bf0b5e05dd Update link to Weblate 2021-08-30 12:00:50 +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
Benoit Marty 93970d7833
Merge pull request #3918 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2021-08-30 11:41:13 +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
dependabot[bot] 7cc1de0eb2
Bump realm-gradle-plugin from 10.7.1 to 10.8.0
Bumps [realm-gradle-plugin](https://github.com/realm/realm-java) from 10.7.1 to 10.8.0.
- [Release notes](https://github.com/realm/realm-java/releases)
- [Changelog](https://github.com/realm/realm-java/blob/master/CHANGELOG.md)
- [Commits](https://github.com/realm/realm-java/compare/v10.7.1...v10.8.0)

---
updated-dependencies:
- dependency-name: io.realm:realm-gradle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-08-27 23:06:59 +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 1ffacd1788 Code review 2021-08-27 17:30:32 +02:00
Valere 819e7c49b0 Code review 2021-08-27 17:30:32 +02:00
Valere f2ab0987cc Add change log + cleaning 2021-08-27 17:30:09 +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
Benoit Marty 048800684c
Merge pull request #3914 from vector-im/feature/bma/enabled_body
PushRule enabling request is not following the spec
2021-08-27 16:58:51 +02: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 276b89b8b7 PushRule enabling request is not following the spec 2021-08-27 16:15:08 +02:00
Benoit Marty 840b9e50af Fix bad name in file, generated changelog will contain mistakes 2021-08-27 16:07:03 +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 b408d7346f Fix / use unstable prefix for room_capabilities 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 8faee24d00 Update change log 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 7714cc41f7 Attach documentation reference to expired account error 2021-08-27 14:33:12 +02:00
Florian Renaud cb3ce2708f Add towncrier 2021-08-27 14:28:07 +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