Commit graph

17491 commits

Author SHA1 Message Date
ericdecanini
6f9b5c010d Deletes migration test 2022-07-19 13:49:21 +02:00
ericdecanini
e926871570 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
2022-07-19 11:17:14 +02:00
Benoit Marty
ade1b7be8c Add some punctuation to please detekt. 2022-07-19 09:49:34 +02:00
Benoit Marty
ba9c1dde32
Merge pull request #6551 from vector-im/dependabot/gradle/kotlinCoroutines-1.6.4
Bump kotlinCoroutines from 1.6.3 to 1.6.4
2022-07-18 18:27:54 +02:00
Benoit Marty
b0237a4e22
Merge pull request #6538 from vector-im/feature/bma/more_migration_log
More DB migration log
2022-07-18 17:24:25 +02:00
Benoit Marty
428942d407 Changelog 2022-07-18 17:22:49 +02:00
Benoit Marty
3f8cbd1b9c Create a parent MatrixRealmMigration and improve the logs. 2022-07-18 17:22:49 +02:00
Benoit Marty
ae8f977d6b Log the end of the migration and it's duration 2022-07-18 17:21:49 +02:00
Kat Gerasimova
069c0c7cb4
Update issue automation for the design team (#6577)
* Update issue automation for the design team

The design team would like to see all of their issues on their board for triage now

* Update triage-labelled.yml
2022-07-18 17:14:34 +03:00
ericdecanini
bc5c53b70d Fixes copyright lint error 2022-07-18 15:53:51 +02:00
ericdecanini
e6475a3f83 Fixes copyright lint error 2022-07-18 15:47:19 +02:00
ericdecanini
7bb7a085a8 Fixes copyright lint error 2022-07-18 15:38:03 +02:00
ganfra
0a4595df5b
Merge pull request #6552 from vector-im/dependabot/gradle/flipper-0.154.0
Bump flipper from 0.153.0 to 0.154.0
2022-07-18 15:35:37 +02:00
ericdecanini
7d29fbc68c Fixes post merge errors 2022-07-18 15:06:25 +02:00
ericdecanini
c73c36eb26 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent
# Conflicts:
#	matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/database/migration/MigrateSessionTo032.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderGroup.kt
#	vector/src/main/java/im/vector/app/features/home/room/list/RoomListSectionBuilderSpace.kt
2022-07-18 15:05:04 +02:00
ericdecanini
67dd250f83 Merge remote-tracking branch 'origin/develop' into task/eric/replace_flatten_with_direct_parent 2022-07-18 15:03:42 +02:00
ericdecanini
1ae5965632 Fixes import order 2022-07-18 14:48:10 +02:00
ericdecanini
13b9b5b5d6 Changes string into plural 2022-07-18 14:47:09 +02:00
Benoit Marty
4ed24b5571
Merge pull request #6478 from vector-im/feature/bma/nightly
Nightly build published on Firebase
2022-07-18 14:22:15 +02:00
Maxime NATUREL
6b403ec224
Merge pull request #6542 from vector-im/feature/mna/lls-standardise-stop-text
[Location Share] - Standardise "Stop" texts for live (PSG-622)
2022-07-18 10:43:43 +02:00
Nikita Fedrunov
79762d9133
font scale setting screen (#6453) 2022-07-18 09:49:57 +02:00
Benoit Marty
cdbc197426
Merge pull request #6549 from vector-im/feature/bma/fix_6514
Just go back to the timeline if the user is already viewing the DM with the other user.
2022-07-18 09:48:44 +02:00
Maxime NATUREL
cedeb8fa50 Adding changelog entry 2022-07-18 09:43:33 +02:00
Maxime NATUREL
cda100e596 Using same string key for stop + fix insets in button styles 2022-07-18 09:43:33 +02:00
Valere
90c177cdb9
Merge pull request #6535 from vector-im/feature/bca/crypto_olm_proliferation
fix olm session proliferation
2022-07-15 16:03:25 +02:00
Valere
4c554e4e85 fix unused import 2022-07-15 14:18:35 +02:00
Valere
e8bd7ea967 fix olm session proliferation 2022-07-15 14:17:44 +02:00
Nikita Fedrunov
c7b54b8d3d
legacy groups removal (#6268) 2022-07-15 12:25:10 +02:00
dependabot[bot]
92801f625d Bump opusencoder from 1.0.3 to 1.0.4
Bumps [opusencoder](https://github.com/vector-im/libopusencoder-android) from 1.0.3 to 1.0.4.
- [Release notes](https://github.com/vector-im/libopusencoder-android/releases)
- [Commits](https://github.com/vector-im/libopusencoder-android/compare/v1.0.3...v1.0.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-15 10:13:35 +02:00
Jorge Martín
6c1016caff Fixes wrong voice message being displayed and played on the timeline. 2022-07-14 17:21:16 +02:00
Adam Brown
ac7aa9f31d
Merge pull request #6512 from vector-im/feature/adm/ui-test-stabilization
UI test stabilization
2022-07-14 15:47:28 +01:00
Jorge Martín
50f8d0a667 Ignore forwardPaginationTest to unblock the CI 2022-07-14 15:42:20 +02:00
dependabot[bot]
4b7069f47c
Bump flipper from 0.153.0 to 0.154.0
Bumps `flipper` from 0.153.0 to 0.154.0.

Updates `flipper` from 0.153.0 to 0.154.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.153.0...v0.154.0)

Updates `flipper-network-plugin` from 0.153.0 to 0.154.0
- [Release notes](https://github.com/facebook/flipper/releases)
- [Commits](https://github.com/facebook/flipper/compare/v0.153.0...v0.154.0)

---
updated-dependencies:
- dependency-name: com.facebook.flipper:flipper
  dependency-type: direct:production
  update-type: version-update:semver-minor
- dependency-name: com.facebook.flipper:flipper-network-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-13 23:07:14 +00:00
dependabot[bot]
840b8847d9
Bump kotlinCoroutines from 1.6.3 to 1.6.4
Bumps `kotlinCoroutines` from 1.6.3 to 1.6.4.

Updates `kotlinx-coroutines-core` from 1.6.3 to 1.6.4
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.3...1.6.4)

Updates `kotlinx-coroutines-android` from 1.6.3 to 1.6.4
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.3...1.6.4)

Updates `kotlinx-coroutines-test` from 1.6.3 to 1.6.4
- [Release notes](https://github.com/Kotlin/kotlinx.coroutines/releases)
- [Changelog](https://github.com/Kotlin/kotlinx.coroutines/blob/master/CHANGES.md)
- [Commits](https://github.com/Kotlin/kotlinx.coroutines/compare/1.6.3...1.6.4)

---
updated-dependencies:
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-android
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.jetbrains.kotlinx:kotlinx-coroutines-test
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-07-13 23:07:00 +00:00
Benoit Marty
d10d8d740f Changelog 2022-07-13 22:48:58 +02:00
Benoit Marty
2c10678263 Just go back to the timeline if the user is already viewing the DM with the other user.
Fix #6514
2022-07-13 22:19:34 +02:00
Benoit Marty
4c496bb148 Version++ 2022-07-13 12:46:32 +02:00
Benoit Marty
78eb11fea8 Merge branch 'release/1.4.28' into develop 2022-07-13 12:45:39 +02:00
Benoit Marty
f117d41374 fastlane file 2022-07-13 12:43:25 +02:00
Benoit Marty
9b60bc0ad4 Command changed with towncrier 21.9.0 2022-07-13 12:42:20 +02:00
Benoit Marty
a85ebbfc34 Run towncrier 2022-07-13 12:42:20 +02:00
Benoit Marty
9d89c60177
Merge pull request #6533 from vector-im/feature/bma/post_weblate
Delete unused key `error_attachment`
2022-07-13 11:58:48 +02:00
Benoit Marty
384f95a180 Generated file by fastlane 2022-07-13 11:40:53 +02:00
Benoit Marty
4c31bd0639 Reduce title length. 2022-07-13 11:40:18 +02:00
Benoit Marty
3a80880ac7 Delete unused key error_attachment 2022-07-13 11:33:54 +02:00
Benoit Marty
e40b646adb
Merge pull request #6527 from RiotTranslateBot/weblate-element-android-element-app
Translations update from Weblate
2022-07-13 11:30:05 +02:00
Adam Brown
257f41dbf1
Merge pull request #6471 from vector-im/feature/adm/sharing-tests
Adding tests around the share intent handling
2022-07-13 10:12:09 +01:00
Weblate
39a41f6b4e Merge branch 'origin/develop' into Weblate. 2022-07-13 08:52:01 +00:00
Linerly
484606bfa4 Translated using Weblate (Indonesian)
Currently translated at 100.0% (68 of 68 strings)

Translation: Element Android/Element Android Store
Translate-URL: https://translate.element.io/projects/element-android/element-store/id/
2022-07-13 08:51:54 +00:00
Adam Brown
2c843985ca updating variable to include name (as it's holding the space name 2022-07-13 09:17:50 +01:00