Commit graph

17578 commits

Author SHA1 Message Date
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
ericdecanini
b769eafcc3 Adds changelog file 2022-07-18 16:57:54 +02:00
ericdecanini
fbd1763dcf Adds new app layout enabled feature flag 2022-07-18 16:49:42 +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
Onuray Sahin
55a5752e3b Remove unused import. 2022-07-18 14:40:44 +03:00
Onuray Sahin
82fed20145 Changelog added. 2022-07-18 13:53:18 +03:00
Onuray Sahin
ac3285001f Do not log the live location of the user. 2022-07-18 13:50:35 +03: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
Adam Brown
92f8dd971d promoting ftue strings for translation 2022-07-15 18:10:33 +01:00
Adam Brown
42ceb1f7f2 Merge branch 'feature/adm/ftue-combined-register-copy-review' into feature/adm/ftue-copy-review 2022-07-15 18:09:40 +01:00
Adam Brown
0879e1581c adding changelog entry 2022-07-15 18:09:04 +01:00
Adam Brown
347c07ec35 adding changelog entry 2022-07-15 16:02:46 +01:00
Adam Brown
86b0c9cd78 removing display name subtitle 2022-07-15 15:58:11 +01:00
Adam Brown
91a63194ef fixing formatting 2022-07-15 15:42:14 +01:00
Adam Brown
5f6654b696 removing display name subtitle 2022-07-15 15:42:14 +01:00
Adam Brown
b1ef4dd60c defaulting the display name to the username segment of the account the user has created 2022-07-15 15:42:14 +01:00
Adam Brown
ee5cc19c23 updating login copy 2022-07-15 15:42:14 +01:00
Adam Brown
677818a18e updating reset password copy 2022-07-15 15:42:14 +01:00
Adam Brown
c4a1d213b8 updating personalisation complete copy 2022-07-15 15:42:14 +01:00
Adam Brown
a6e6f68a1e updating profile picture copy 2022-07-15 15:42:14 +01:00
Adam Brown
2fe1b57297 updating captcha copy and removing subtitle 2022-07-15 15:42:14 +01:00
Adam Brown
8e4e70aaf9 updating terms copy 2022-07-15 15:42:14 +01:00
Adam Brown
548a243d64 updating phone number entry to include the homeserver and reduced confirmation copy 2022-07-15 15:42:14 +01:00
Adam Brown
3140867252 bolding the account created username 2022-07-15 15:42:14 +01:00
Adam Brown
be92fe2564 updating email entry copy to include the current homeserver 2022-07-15 15:42:14 +01:00
Adam Brown
d8d0d6f2d9 removing the server url footer text 2022-07-15 15:42:14 +01:00
Adam Brown
e3708be04e updating server url selection copy 2022-07-15 15:42:14 +01:00
Adam Brown
95c6b88e12 updating use case screen copy 2022-07-15 15:42:13 +01: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
Onuray Sahin
619da0e84d Changelog added. 2022-07-15 15:45:00 +03:00
Onuray Sahin
ab151cddd1 Implement share location popup. 2022-07-15 15:27:49 +03:00
Onuray Sahin
d7e1cba45c Create popup resources. 2022-07-15 15:25:52 +03:00