Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,968 Commits 530 Branches 157 Tags 485 MiB
dd92bb756a
Commit Graph

1519 Commits

Author SHA1 Message Date
Florian Renaud
3786bd9c65 changelog 2022-09-21 09:36:07 +02:00
Florian Renaud
8624199be3
Merge pull request #7154 from vector-im/bugfix/fre/start_dm_app_layout 
Deferred DMs - Handle the local rooms within the new AppLayout
 2022-09-20 10:53:51 +02:00
Benoit Marty
b7c63907ea
Merge pull request #7108 from vector-im/feature/bma/trybuildjet 
Use `buildjet-4vcpu-ubuntu-2204` runner instead of `macos-latest` to …
 2022-09-20 09:51:46 +02:00
Benoit Marty
d8ff688e76
Fix typo in changelog. 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2022-09-20 09:51:22 +02:00
Eric Decanini
7d2cbf5263
Merge pull request #7166 from vector-im/feature/eric/enable-app-layout-labs 
Enables New App Layout in Labs
 2022-09-19 13:35:40 -04:00
Florian Renaud
b4ca16735d
Merge pull request #7125 from vector-im/feature/fre/start_dm_loading 
Deferred DM - Add a loading wheel while creating the DM
 2022-09-19 17:04:56 +02:00
Florian Renaud
c28271dd8b Add changelog 2022-09-19 15:58:14 +02:00
Nikita Fedrunov
830e5ffa9f
room summary now has constant height (#7145) 2022-09-19 15:22:16 +02:00
Onuray Sahin
32d7516dcb Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-19 12:02:22 +03:00
Florian Renaud
10b5e8fd04 Changelog 2022-09-19 09:38:05 +02:00
ericdecanini
57c9161e00 Adds changelog file 2022-09-17 13:17:39 -04:00
Benoit Marty
0685fb1e1a Changelog 2022-09-16 19:03:39 +02:00
Benoit Marty
73e061e472
Merge pull request #7130 from vector-im/feature/bma/fix_verification 
Fix empty verification bottom sheet
 2022-09-16 19:00:39 +02:00
Adam Brown
9a298a6e3e
Merge pull request #7157 from vector-im/feature/adm/cache-misses 
Fix build cache misses
 2022-09-16 17:19:49 +01:00
Benoit Marty
a919989fd4
Merge pull request #7132 from vector-im/bugfix/eric/dismiss-new-chat 
Adds dismissal to new chat bottom sheet actions
 2022-09-16 18:14:08 +02:00
Adam Brown
1669320698 adding changelog entry 2022-09-16 15:03:24 +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
Adam Brown
ae50f5a006 adding changelog entry 2022-09-16 11:37:39 +01:00
Adam Brown
b05d52bb6d
Merge pull request #6788 from vector-im/feature/adm/app-level-variant-v2 
`:vector-app` level variants
 2022-09-16 10:36:58 +01:00
Florian Renaud
0ce72057dc
Merge pull request #7123 from vector-im/bugfix/fre/start_dm_room_list_glitch 
Start DM - Fix glitch in the room list
 2022-09-15 16:55:47 +02:00
ericdecanini
13b1722060 Merge remote-tracking branch 'origin/develop' into bugfix/eric/dismiss-new-chat 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt
 2022-09-15 10:05:13 -04:00
Eric Decanini
01e1d74c72
Merge pull request #7103 from vector-im/bugfix/eric/landscape-bottom-sheet-peek 
[New Layout] Adds peek height (min height) to new layout bottom sheets
 2022-09-15 10:03:11 -04:00
ericdecanini
e9b3d29128 Merge remote-tracking branch 'origin/develop' into bugfix/eric/dismiss-new-chat 2022-09-15 10:02:41 -04:00
Adam Brown
32a15bee04 adding changelog entry 2022-09-15 14:50:08 +01:00
Adam Brown
e53972cf2d adding changelog entry 2022-09-15 14:42:56 +01:00
Onuray Sahin
81cc8ab98b Code review fixes. 2022-09-15 15:14:46 +03:00
ericdecanini
a3fff0777d Adds changelog file 2022-09-14 17:25:38 -04:00
Nikita Fedrunov
1d3c191153
scroll recents carouse to start when item added/moved to start (#7120) 2022-09-14 22:55:01 +02:00
Nikita Fedrunov
7631c7ac9f
room leaving prompt dialog now waits user to confirm leaving before do so (#7124) 2022-09-14 22:54:40 +02:00
Benoit Marty
42fc601c59 changelog 2022-09-14 20:32:31 +02:00
Florian Renaud
e792228879 Changelog 2022-09-14 16:41:09 +02:00
ericdecanini
50b042ee98 Merge remote-tracking branch 'origin/develop' into bugfix/eric/landscape-bottom-sheet-peek 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/NewChatBottomSheet.kt
 2022-09-14 09:46:43 -04:00
Maxime NATUREL
583cc29472 Adding changelog entry 2022-09-14 10:31:21 +02:00
Benoit Marty
8dbfafb324
Merge pull request #7102 from vector-im/feature/eric/double-space-click-fix 
Fixes Crash On Double Click Of Space FABs
 2022-09-14 10:15:08 +02:00
Onuray Sahin
2763ebdd5a Merge branch 'develop' into feature/ons/device_manager_filter 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesAction.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewModel.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/DevicesViewState.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/GetCurrentSessionCrossSigningInfoUseCase.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
 2022-09-13 17:20:44 +03:00
ericdecanini
55c60c9a40 Adds changelog file 2022-09-12 17:49:06 -04:00
ericdecanini
db83099dc3 Adds changelog file 2022-09-12 12:29:33 -04:00
Benoit Marty
7f766eef2a
Merge pull request #7092 from pt2121/pt/5424-qr 
Fix add by QR code layout (#5424)
 2022-09-12 17:28:17 +02:00
Benoit Marty
ec0770434d
Merge pull request #7035 from vector-im/feature/bma/space_response_model 
Space response model
 2022-09-12 17:24:10 +02:00
Prat T
73eb63a35e
Fix add by QR code layout (#5424) 
Signed-off-by: Prat T <pt2121@users.noreply.github.com>
 2022-09-10 10:53:34 -07:00
Benoit Marty
4de62d84b4 towncrier 2022-09-10 08:04:20 +02:00
Benoit Marty
4b63f4b9bf
Merge pull request #7085 from vector-im/feature/bma/fix_push 
Feature/bma/fix push
 2022-09-09 18:03:10 +02:00
Benoit Marty
f88039b7fd
Merge pull request #7068 from p1gp1g/fix/fcm-push2 
Use firebaseReceiver with FCM
 2022-09-09 09:46:06 +02:00
Maxime NATUREL
41f75eed50 Adding changelog entry 2022-09-09 09:25:36 +02:00
Benoit Marty
de17c47a7d
Merge pull request #7038 from vector-im/feature/eric/new-layout-labs 
New Layout - Labs Flag (to replace feature flag)
 2022-09-08 14:35:38 +02:00
sim
7bdcacf489 Merge branch 'misc/refactor-uphelper' into fix/fcm-push2 2022-09-08 10:49:53 +02:00
Maxime NATUREL
f2891b74c5 Adding changelog entry 2022-09-08 09:48:45 +02:00
Maxime NATUREL
6c2bf35d60
Merge pull request #7005 from vector-im/feature/mna/session-overview-screen 
[Devices Management] Session overview screen (PSG-691, PSG-693)
 2022-09-08 09:18:31 +02:00
sim
5b46c803b2 Add changelog detail 
Signed-off-by: sim <git@sgougeon.fr>
 2022-09-07 18:19:06 +02:00
Onuray Sahin
643f99b8e0 Merge branch 'feature/mna/clean-vm-for-dm-v2' into feature/ons/device_manager_filter 
* feature/mna/clean-vm-for-dm-v2:
  RefreshDevicesOnCryptoDevicesChangeUseCase unit tests
  Adding changelog entry
  Fix some coding style issues
  DevicesViewModel unit tests
  GetDeviceFullInfoListUseCase unit tests
  GetCurrentSessionCrossSigningInfoUseCase unit tests
  RefreshDevicesUseCase unit tests
  Updating existing unit tests
  Listen verification + refresh devices use cases
  Moving recently created use cases inside v2 package
  Inject new ViewModel in the fragment V2 + add use cases
  Declare MarkAsManuallyVerified action
  Empty ViewModel V2

# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
 2022-09-07 18:31:30 +03:00