Commit graph

17479 commits

Author SHA1 Message Date
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
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
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
Florian Renaud
909ce290c8
Merge pull request #6051 from vector-im/feature/fre/start_dm_on_first_msg
Start DM on first message (UI)
2022-07-12 15:12:17 +02:00
Adam Brown
46ed9a87e4 removing unused imports 2022-07-12 13:28:19 +01:00
Adam Brown
f3e0ae0819 selecting the space with the empty room before attempt to interact with it 2022-07-12 13:28:19 +01:00
Adam Brown
f501555ff9 adding extra waits for the threads list to appear as it seems to be inconsistent 2022-07-12 13:28:19 +01:00
Adam Brown
c7efd8a6f6 always attempting to close the keyboard to help avoid can't inject events error 2022-07-12 13:28:19 +01:00
Adam Brown
8db704f3b9 naming the threads room creation to avoid multiple rooms with empty room as the name, causing ambiguous assertion errors 2022-07-12 13:28:19 +01:00
Adam Brown
a5bf25f2b4
Merge pull request #6511 from vector-im/feature/rooms-in-space-default
Fixes inconsistent rooms in home behaviour
2022-07-12 13:25:58 +01:00
Florian Renaud
b8cdf9dcaa Merge branch 'develop' into feature/fre/start_dm_on_first_msg
* develop:
  Comment the GHA towncrier, there is a syntax error
2022-07-12 11:56:46 +02:00
Adam Brown
6266b2019b removing legacy migration flag from 12 months ago 2022-07-12 09:57:48 +01:00
Benoit Marty
7ab7d7cc80 Comment the GHA towncrier, there is a syntax error 2022-07-12 10:29:49 +02:00
Florian Renaud
53eb852e3a Merge branch 'develop' into feature/fre/start_dm_on_first_msg
* develop:
  Group if together
  io.element.android:opusencoder:1.0.3 - should fix lint false positive issues
  Indentation, move comment above the block.
  Do the check on towncrier only for PR targeting develop branch
  Format file
  io.element.android:opusencoder:1.0.1
  Add a VectorFeatures to force usage of the library OpusEncoder
  Add dependency to opusencoder and remove module from this project
  shorter name
  Add GitHub action to check for a towncrier file
2022-07-12 09:14:58 +02:00
Benoit Marty
a806991e88
Merge pull request #6489 from vector-im/feature/bma/lib_opusencoder
Add dependency to opusencoder and remove module from this project
2022-07-11 22:39:53 +02:00