mobile/element-android
mobile/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-07-21 10:05:45 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity
18927 commits 157 branches 155 tags 496 MiB
Commit graph

1508 commits

Author SHA1 Message Date
Onuray Sahin 32d7516dcb Merge branch 'develop' into feature/ons/device_manager_filter 2022-09-19 12:02:22 +03: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
Benoit Marty 5143ef9deb
Merge pull request #6727 from anoadragon453/patch-2 
Clarify that setting up a FCM Rewrite Proxy is not necessary for use of the UnifiedPush FCM distributor.
 2022-09-07 15:51:04 +02:00
Benoit Marty 59e6fa98c9
Merge pull request #7000 from pt2121/pt/6529-room 
Suggest @room when @channel, @everyone, or @here is typed in composer
 2022-09-07 15:49:18 +02:00
Onuray Sahin 8dcbd3710d Merge branch 'feature/mna/session-overview-screen' into feature/ons/device_manager_filter 
* feature/mna/session-overview-screen: (57 commits)
  Fix missing mapper in CryptoStoreHelper for tests
  Fix unused string warning
  Update unit tests
  Rendering inactive status in SessionInfoView
  Adding comment with examples of some parametrized strings
  Fix post rebase
  Fixing wrong copyright title
  Adding last seen details + fix observation of wrong deviceId in ViewModel
  Adding learn more link in verification status details
  Unit tests for computing trust level of device
  Unit tests for GetCurrentSessionCrossSigningInfoUseCase
  Updating existing unit tests
  Navigation from other session item
  Show info in overview screen
  Renaming CurrentSessionView into SessionInfoView to be more generic
  Introducing some reusable usecases
  Adding unit tests for viewModel
  Adding unit tests for mapper
  Adding unit tests for the new use case
  Adding use case to get full device info for a given device id
  ...

# 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/VectorSettingsDevicesFragment.kt
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesViewNavigator.kt
 2022-09-07 16:33:35 +03:00
ericdecanini 37b216393e Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 2022-09-07 14:02:10 +02:00
Benoit Marty c408621bd5
Merge pull request #7054 from vector-im/feature/bma/fix_invite_to_room_in_space 
Fix invite to room in space
 2022-09-07 11:53:34 +02:00
Benoit Marty 8c32b08505 Changelog 2022-09-07 11:06:49 +02:00
Benoit Marty 199195dcbd
Merge pull request #7039 from vector-im/feature/eric/new-layout-update-icons 
New Layout - Replace space icon (and release notes image)
 2022-09-07 10:57:23 +02:00
ericdecanini 64c8789ef2 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs 2022-09-07 10:35:44 +02:00
Maxime NATUREL 7d549a311f Adding changelog entry 2022-09-07 09:44:45 +02:00
Maxime NATUREL e2aa66e4c2 Adding changelog entry 2022-09-07 09:32:09 +02:00
Onuray Sahin 1a5db3cc2c Add changelog. 2022-09-06 18:49:15 +03:00