Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-25 15:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,263 Commits 530 Branches 158 Tags 486 MiB
8653b74964
Commit Graph

225 Commits

Author SHA1 Message Date
Benoit Marty
214867ad0e
Merge pull request #7248 from vector-im/feature/bca/hotfix_1.5.1_merge 
Feature/bca/hotfix 1.5.1 merge back from main
 2022-09-29 11:58:36 +02:00
Valere
ce86e29122 Merge branch 'main' into develop 2022-09-28 18:16:39 +02:00
Valere
5c442296ef Security fix CVE-2022-39246 CVE-2022-39248 2022-09-28 16:26:47 +02:00
Maxime NATUREL
b2b3ee1fe5 Adding button to trigger sign out 2022-09-27 15:04:33 +02:00
Adam Brown
2c1eef7a59
Merge pull request #7142 from vector-im/feature/adm/dialpad-lib 
Manually including `im.dlg:android-dialer:1.2.5`
 2022-09-26 10:14:56 +01:00
Maxime NATUREL
f0fe636654 Fix file name for styles of session warning info view 2022-09-26 09:46:58 +02:00
Maxime NATUREL
5de097e251 Adding warning info view 2022-09-26 09:46:58 +02:00
Benoit Marty
1ff4a5f212 Ignore AlwaysShowAction lint issue. Also make it an error, so that developer has to explicitly disable the warning. 2022-09-22 16:32:14 +02:00
Adam Brown
739a513f89 moving external library modules to an external directory 2022-09-16 15:15:32 +01:00
Adam Brown
5058f942af manually including the im.dlg:android-dialer:1.2.5 
- avoids using appcompat
- avoids using an artifact without a source repository
 2022-09-16 15:15:32 +01:00
Onuray Sahin
61f5f81305 Merge branch 'develop' into feature/ons/device_manager_filter 
# Conflicts:
#	library/ui-strings/src/main/res/values/strings.xml
#	vector/src/main/AndroidManifest.xml
#	vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/list/SessionsListHeaderView.kt
#	vector/src/main/res/layout/fragment_settings_devices.xml
 2022-09-16 15:25:09 +03:00
Maxime NATUREL
a661f9c3fb Navigation from session overview to session details 2022-09-14 10:31:21 +02:00
Onuray Sahin
41ca662dcc Update device list according to the filter type. 2022-09-08 18:28:17 +03:00
Maxime NATUREL
6e9b2baf6f Rendering inactive status in SessionInfoView 2022-09-07 09:32:48 +02:00
Maxime NATUREL
969663786b Renaming header list view to be consistent 2022-09-07 09:32:09 +02:00
Nikita Fedrunov
7cc7444bd5
applayout release experience (#7003) 2022-09-06 11:32:11 +02:00
Onuray Sahin
e6c9409156 Create generic security recommendations view. 2022-09-02 14:28:01 +02:00
Onuray Sahin
7e8bbda856 Create security recommendations view layout. 2022-09-02 14:28:01 +02:00
Onuray Sahin
6c65b0a9e0
Merge pull request #6807 from vector-im/feature/mna/device-management-header-list 
[Devices Management] Header view for sessions lists in new layout (PSG-668)
 2022-08-15 23:09:53 +03:00
Nikita Fedrunov
e0e21d4282
filtered room list at home (#6724) 2022-08-11 16:26:24 +02:00
Maxime NATUREL
8f218ce773 Custom header view without "Learn more" 2022-08-11 12:11:14 +02:00
ericdecanini
1bf36dce92 Merge remote-tracking branch 'origin/develop' into feature/eric/new_fab 2022-08-05 17:11:00 +02:00
Maxime NATUREL
6972622bc6 Handling map loading error in timeline 2022-08-04 16:58:28 +02:00
Eric Decanini
e2ed4b4ae1
Merge pull request #6655 from vector-im/feature/eric/app-layout-toolbar 
New App Layout Toolbar
 2022-08-02 17:44:53 +02:00
Maxime NATUREL
c616229d53 Missing renaming of stylable file 2022-08-02 09:09:19 +02:00
Maxime NATUREL
be696f5a5c Align naming of components for the live location feature 2022-08-02 09:09:19 +02:00
ericdecanini
d49f104332 Adds fab buttons 2022-07-28 15:09:57 +02:00
ericdecanini
7334d909d5 Adds options menu 2022-07-26 16:00:46 +02:00
ericdecanini
5958559186 Styles collapsed title text 2022-07-26 14:31:02 +02:00
ericdecanini
3df337fa07 Adds new layout toolbar 2022-07-26 12:38:29 +02:00
Maxime NATUREL
e1ea10e0a2 Adding attribute to set the start margin of icon 2022-07-25 14:17:07 +02:00
Maxime NATUREL
5e59eb474a Adding attribute to control alpha of the banner background 2022-07-25 10:36:28 +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
Maxime NATUREL
cda100e596 Using same string key for stop + fix insets in button styles 2022-07-18 09:43:33 +02:00
Benoit Marty
aae6e20f9c Migration to activity 1.5.0. Rework menu management 2022-07-01 17:06:02 +02:00
Adam Brown
c603b780cf extracting common breaker background selection to ftue extensions 2022-06-29 17:47:28 +01:00
Benoit Marty
29d4916a2e
Cleanup of #5187 (#6326) 
Update design and behaviour on widget permission bottom sheet
 2022-06-22 15:04:02 +02:00
Jorge Martín
b5aedd4626 Re-implement lock screen feature using our own implementation. 2022-06-20 17:38:05 +02:00
Onuray Sahin
b455bf04aa Create new styles for map view copyright text. 2022-06-07 15:07:41 +03:00
Onuray Sahin
4ccd242cbf
Merge pull request #6170 from vector-im/feature/ons/live_location_bottom_sheet 
Live Location Sharing - User List Bottom Sheet [PSF-890]
 2022-05-30 21:07:25 +03:00
Onuray Sahin
453aa28380 Add required resources. 2022-05-27 15:25:59 +03:00
Olivér Falvai
9ce9ad6d3a Merge remote-tracking branch 'origin/develop' into dependency-cleanup 2022-05-26 14:04:39 +02:00
Benoit Marty
fd252dbaff
Merge pull request #5856 from ofalvai/bugfix/ofa/read-recept-text-scale 
Use fixed text size in read receipt counter
 2022-05-23 13:41:03 +02:00
Adam Brown
8a53eafa72 adding gradient background to the waiting for verification screen, matching designs 
- renames drawable which redirects to the attribute colorBackground
 2022-05-20 12:11:44 +01:00
Olivér Falvai
f036d35829 Merge branch 'develop' into dependency-cleanup 2022-05-19 12:27:09 +02:00
Maxime NATUREL
738ce18a2f
Merge pull request #5989 from vector-im/feature/mna/PSF-884-location-view 
[Location sharing] - Message for live sharing in timeline (PSF-884)
 2022-05-18 15:39:51 +02:00
Olivér Falvai
2dcc120cf7 Merge remote-tracking branch 'origin/develop' into dependency-cleanup 
# Conflicts:
#	build.gradle
#	dependencies.gradle
 2022-05-18 11:47:21 +02:00
Benoit Marty
57ae714cbe
Merge pull request #6072 from vector-im/feature/bma/fix_typing 
Feature/bma/fix typing
 2022-05-17 15:34:15 +02:00
Benoit Marty
2e189a1ab0 Fix typing rendering #6063 2022-05-17 11:53:44 +02:00