Commit Graph

16087 Commits

Author SHA1 Message Date
Benoit Marty 46e8737426
Merge pull request #6039 from vector-im/feature/dla/fix-sip-on-unhold
Direction and track need to be set for hold/unhold
2022-05-17 14:33:02 +02:00
Onuray Sahin 4c079cc0ac Write unit tests for poll end event aggregation. 2022-05-17 14:59:14 +03:00
Benoit Marty 32573881e4 Renames ids for clarity 2022-05-17 13:42:53 +02:00
Onuray Sahin 00e800459d Write unit tests for poll response event aggregation. 2022-05-17 14:13:38 +03:00
Michael Kaye 868c33a8b4 Correct var -> val for @get:Rules 2022-05-17 12:12:49 +01:00
Aris Kotsomitopoulos 424fb5556d
Merge pull request #5959 from vector-im/feature/aris/threads_post_release_ui_improvements
Feature/aris/threads post release improvements
2022-05-17 13:24:19 +03:00
Benoit Marty 2e189a1ab0 Fix typing rendering #6063 2022-05-17 11:53:44 +02:00
Adam Brown 5f2cb671e2 making comparator override non null as kotlin guards against this 2022-05-17 10:35:14 +01:00
Adam Brown 1ec99ee89e renaming comparator to only specify the matrix.org domain 2022-05-17 10:31:32 +01:00
ariskotsomitopoulos 324856d700 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
2022-05-17 11:55:07 +03:00
Benoit Marty ea1607cf3f Improve preview of the layout in the IDE 2022-05-17 10:28:02 +02:00
Auri B. P 2f03526d37 Translated using Weblate (Catalan)
Currently translated at 81.8% (1821 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/ca/
2022-05-17 02:56:52 +00:00
dependabot[bot] 271bc91303
Bump vanniktechEmoji from 0.9.0 to 0.12.0
Bumps `vanniktechEmoji` from 0.9.0 to 0.12.0.

Updates `emoji-material` from 0.9.0 to 0.12.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.12.0)

Updates `emoji-google` from 0.9.0 to 0.12.0
- [Release notes](https://github.com/vanniktech/Emoji/releases)
- [Changelog](https://github.com/vanniktech/Emoji/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vanniktech/Emoji/compare/0.9.0...0.12.0)

---
updated-dependencies:
- dependency-name: com.vanniktech:emoji-material
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.vanniktech:emoji-google
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-16 23:08:43 +00:00
John Doe 41edd88d03 Translated using Weblate (Spanish)
Currently translated at 99.8% (2221 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/es/
2022-05-16 17:59:45 +00:00
Ihor Hordiichuk baa5c1319d Translated using Weblate (Ukrainian)
Currently translated at 100.0% (2224 of 2224 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.element.io/projects/element-android/element-app/uk/
2022-05-16 17:59:44 +00:00
Adam Brown 444980395e inlining single use extension 2022-05-16 17:26:12 +01:00
Adam Brown 51ffe26a91 renaming comparator to give more context to its usage 2022-05-16 17:17:15 +01:00
Adam Brown 6c3150edb7 using compareTo instead of direct subtraction 2022-05-16 17:16:37 +01:00
Maxime NATUREL 1d6083b2c7 Fix missing dot at end of code documentation 2022-05-16 18:07:08 +02:00
Michael Kaye 1f89cfbe44 Lint fixes 2022-05-16 16:55:36 +01:00
Michael Kaye a19c1d6fbe Make test consistent wiht assert message. 2022-05-16 16:01:21 +01:00
Michael Kaye 096cf9272a Rather than ignore them, put tests on a retry loop.
I'm reliably getting passing tests locally with just these ignores.
2022-05-16 16:01:15 +01:00
Michael Kaye 8950aa38ea Address repeated initializatin of WorkManagerImpl in #5887 2022-05-16 16:01:09 +01:00
Michael Kaye 4ced6ca179 Fix linting error. 2022-05-16 15:59:41 +01:00
Michael Kaye fa26e2a23e Revert "@Ignore all tests currently failing in CI"
This reverts commit 8d234b4b65a7a899abdeed9c5167a8c09c9af3e0.
2022-05-16 15:59:41 +01:00
Michael Kaye 70682b4931 Increase timeout. Log timeout. 2022-05-16 15:59:41 +01:00
Michael Kaye 78140af3f3 Crypto tests are failing due to slow initialSync. Increase timeout by 60s. 2022-05-16 15:59:41 +01:00
Michael Kaye 010be9184c Fix threading UI test failure by adding a sleep 30s. 2022-05-16 15:59:41 +01:00
Michael Kaye 012b20fca6 changelog.d 2022-05-16 15:59:41 +01:00
Michael Kaye e06682dcda @Ignore all tests currently failing in CI 2022-05-16 15:59:41 +01:00
Benoit Marty afd2804ed3
Merge branch 'develop' into feature/mna/PSF-884-location-view 2022-05-16 14:42:38 +02:00
Benoit Marty 3674ae7e63
Merge pull request #6064 from vector-im/feature/bma/detekt_end_period
Detekt: fix end period
2022-05-16 14:24:55 +02:00
Onuray Sahin 4065bce47a Write unit tests for poll start event aggregation. 2022-05-16 15:05:17 +03:00
Adam Brown a893f5acdb applying the manual reordering of the sign up stages only when matrix.org is selected
- lifts the logic up to the view model
2022-05-16 12:33:54 +01:00
Benoit Marty 12eb23b198
Merge branch 'develop' into feature/bma/detekt_end_period 2022-05-16 13:14:37 +02:00
Benoit Marty 955f366690
Merge pull request #5887 from vector-im/feature/bma/Matrix
Improve Matrix class
2022-05-16 13:08:15 +02:00
Benoit Marty dcbc85484c Remove ambiguity 2022-05-16 13:05:26 +02:00
ariskotsomitopoulos 72a945ac13 PR remarks 2022-05-16 13:32:30 +03:00
Benoit Marty 0ed647d379 Add missing end period. 2022-05-16 12:25:10 +02:00
Benoit Marty 5387c9101e Changelog 2022-05-16 12:23:10 +02:00
Benoit Marty ebb9538372 Fix warning and typo 2022-05-16 12:23:10 +02:00
Benoit Marty fce1552349 Fix link 2022-05-16 12:23:10 +02:00
Benoit Marty 480a60a655 Exclude some files from check 2022-05-16 12:23:10 +02:00
Benoit Marty d562ab35ad Setup Knit in the CI to check content of `md` files 2022-05-16 12:23:10 +02:00
Benoit Marty 9e106990c8 Setup knit 2022-05-16 12:23:10 +02:00
Benoit Marty 1eb97f6cb8 Disable the undocumented warnings, there are too many :/ 2022-05-16 12:23:10 +02:00
Benoit Marty dfe75de76e Add links to the doc (I've finally found a way to do it) 2022-05-16 12:23:10 +02:00
Benoit Marty f1995503ff Small improvement on lint.xml file 2022-05-16 12:23:10 +02:00
Benoit Marty 26e6d56cf1 Improve doc 2022-05-16 12:23:10 +02:00
Benoit Marty 6f29a7ab94 Also update TextMatrix 2022-05-16 12:23:10 +02:00