fb2c41cb21
Automatic color correction
...
Change-Id: I3c041cc23e768ed2479143ec573e9d9243228f42
2021-05-02 12:13:16 +02:00
39359f7d24
Merge remote-tracking branch 'upstream/develop' into spaces
...
Change-Id: I10235a7a808ae66f5b00ad2e58c2aedf395e8e25
Conflicts:
matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/session/room/summary/RoomAggregateNotificationCount.kt
sdk-android/src/main/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration.kt
matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryDataSource.kt
vector/build.gradle
vector/src/main/java/im/vector/app/core/extensions/TimelineEvent.kt
vector/src/main/java/im/vector/app/features/configuration/VectorConfiguration.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
vector/src/main/java/im/vector/app/features/home/HomeDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/HomeDrawerFragment.kt
vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/MessageInformationDataFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListAction.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListFragment.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModel.kt
vector/src/main/java/im/vector/app/features/home/room/list/RoomListViewModelFactory.kt
vector/src/main/java/im/vector/app/features/home/room/list/SectionHeaderAdapter.kt
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileActivity.kt
vector/src/main/java/im/vector/app/features/ui/SharedPreferencesUiStateRepository.kt
2021-05-02 12:12:52 +02:00
0d06914efc
[TMP] Automatic upstream merge preparation
...
Change-Id: I2586ef477e9e1dc31e16abd7ca535d03a0115fe7
2021-05-02 10:13:16 +02:00
a70d94c81e
Automatic revert to unchanged upstream strings, pt.1
...
Change-Id: I47b13444500e027ab4f6f560c9c529549e9f355b
2021-05-02 10:13:16 +02:00
ca21a3fc43
Increment version
...
Change-Id: I046fe728801113e31b8590f7b18422d0f9f85fba
2021-05-02 10:03:17 +02:00
e3204c32a1
Fix updating read marker automatically
...
Co-authored-by: Benoit Marty <benoitm@matrix.org>
2021-05-01 13:33:53 +02:00
35a9c8a12f
Fix updating read marker automatically
...
Change-Id: I84a51127dc7b434622ecdcab350c788ee3d623be
2021-05-01 11:56:03 +02:00
2605c6ac9b
Properly sort rooms according to events previewed in summary
...
Change-Id: Id17385a4d17869b0356aa7242407581e2193845e
2021-05-01 11:56:03 +02:00
3ee98f3c94
Fix missing sender information after edits
...
Fixes https://github.com/vector-im/element-android/issues/3184
Change-Id: I27de01c29b31fbd49c8d2b0d4dacf13ba932d5b9
2021-05-01 11:56:03 +02:00
8edbd323de
Merge pull request #3266 from SpiritCroc/missing_sender
...
Fix missing sender information after edits
2021-05-01 10:53:59 +02:00
47aa787ecb
Fix missing sender information after edits
...
Fixes https://github.com/vector-im/element-android/issues/3184
2021-05-01 10:11:15 +02:00
c4a4a5d41c
Merge pull request #3258 from vector-im/feature/bma/fix_3250
...
Delete and react to stickers (#3250 )
2021-04-30 18:11:55 +02:00
aa9f4c2e6e
Merge pull request #3166 from tobymurray/patch-1
...
Related to #1793 , allow cleartext to LAN domains
2021-04-30 18:09:07 +02:00
589be8b15f
Update vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
2021-04-30 11:56:45 +02:00
6180076512
Delete and react to stickers ( #3250 )
2021-04-30 11:14:36 +02:00
257d5cd55a
Bump sonarqube-gradle-plugin from 3.1.1 to 3.2.0
...
Bumps sonarqube-gradle-plugin from 3.1.1 to 3.2.0.
Signed-off-by: dependabot[bot] <support@github.com>
2021-04-30 07:07:27 +00:00
5a53838194
Bump PhotoView from 2.1.4 to 2.3.0
...
Bumps [PhotoView](https://github.com/Baseflow/PhotoView ) from 2.1.4 to 2.3.0.
- [Release notes](https://github.com/Baseflow/PhotoView/releases )
- [Commits](https://github.com/Baseflow/PhotoView/compare/2.1.4...2.3.0 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-04-30 07:06:20 +00:00
33337bd772
Allow cleartext to some LAN domains
...
This functionality exists in the desktop client, so hoping to mirror that as much as Android allows
This addresses a number of the use cases touched on in #1793 . Enabling clear text to various official and standard LAN-only domains means it's easier to develop the Android application, as a Matrix server can be deployed locally without much fuss anywhere on the developer's LAN. This can reduce the reliance on a DNS or SSL certificates when neither are really relevant to the functionality of the client/server. In particular, managing SSL certs without a public domain is a pain in the butt.
At the same time, this does not significantly diminish the security of Element Android, as at the current time these domains are either explicitly not valid TLDs or conventionally not TLDs (so would be an unexpected change if they were to become so). In the event e.g. `.home` becomes a TLD, it would be appropriate to remove it from this list.
2021-04-30 00:47:57 -04:00
38e83e1f35
Merge pull request #3249 from vector-im/feature/bma/fixwl
...
Feature/bma/fixwl
2021-04-29 20:55:22 +02:00
5d9d984c73
Merge pull request #3235 from vector-im/feature/bca/spaces_justme_beta
...
Just me spaces support
2021-04-29 17:47:19 +02:00
90f4a9490d
Fix lint issues
2021-04-29 17:33:14 +02:00
d28c6039c0
Fix issue in string template
2021-04-29 17:06:46 +02:00
bea9abd9a6
Merge pull request #3248 from RiotTranslateBot/weblate-element-android-element-app
...
Translations update from Weblate
2021-04-29 17:05:00 +02:00
b3ac1a1e8b
Using /register/available also fixes #1410
...
(See https://github.com/matrix-org/synapse/pull/7625 )
2021-04-29 17:02:14 +02:00
c09f7e0d7d
Fix compilation issue after rebase
2021-04-29 16:10:52 +02:00
258a378f39
Add back link to learn more on EMS
2021-04-29 15:57:52 +02:00
63a59dbc0c
Defensive code against invalid userId
2021-04-29 15:57:52 +02:00
ef55ddd683
Do not repeat password fields for account creation or reset password
2021-04-29 15:57:52 +02:00
d235d1be15
More improvements
2021-04-29 15:57:52 +02:00
6e9c16a889
Naming convention
2021-04-29 15:57:52 +02:00
5d65a290d2
Bugfix
2021-04-29 15:57:52 +02:00
af3893cdc9
Bugfix
2021-04-29 15:57:52 +02:00
4486181669
Sort social logins buttons
2021-04-29 15:57:52 +02:00
7117427686
Bugfix
2021-04-29 15:57:52 +02:00
f0433fd27d
Fix issue after rebase
2021-04-29 15:57:52 +02:00
d812ed72d0
Improve layout and add a fake date
2021-04-29 15:57:52 +02:00
2d7bface27
Better solution
2021-04-29 15:57:52 +02:00
faef2fba9a
Enable login v2 by default, but keep the possibility to use v1
2021-04-29 15:57:52 +02:00
adae66aa43
Login UX flow: UI iso
2021-04-29 15:57:22 +02:00
51a39909dc
Login UX flow: warning if no profile can ba found
2021-04-29 15:57:22 +02:00
c141b26212
Login UX flow: set avatar and display name after account creation
2021-04-29 15:57:22 +02:00
408a0fc010
Login UX flow v2
2021-04-29 15:57:22 +02:00
344a7e5b3d
Add facility to get profile info to the login wizard
2021-04-29 15:56:25 +02:00
9972ab5d2e
Cleanup
2021-04-29 15:56:25 +02:00
01b0c7a036
Use the navigator to open the LoginActivity
2021-04-29 15:56:25 +02:00
ab68903d7f
Fix wording issue ( #3242 )
2021-04-29 15:47:31 +02:00
79f125cccd
Merge branch 'origin/develop' into Weblate.
2021-04-29 13:38:14 +00:00
98177da6b1
Merge pull request #3197 from vector-im/feature/bma/crashfix
...
WIP - introduce sessionScope
2021-04-29 15:34:42 +02:00
659d012e13
Merge pull request #3247 from vector-im/feature/bma/master_main
...
`master` branch has been renamed to `main`
2021-04-29 14:29:49 +02:00
55f1f56fec
`master` branch has been renamed to `main`
...
Also in project vector-im/jitsi_libre_maven
2021-04-29 12:29:52 +02:00
SpiritCroc
Benoit Marty
Benoit Marty
dependabot[bot]
Toby Murray
Weblate