mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 10:55:55 +03:00
Code Issues Projects Releases Packages Wiki Activity
19133 commits 6 branches 120 tags 229 MiB
Commit graph

1545 commits

Author SHA1 Message Date
Adam Brown
bddb37ef7a
Merge pull request #6981 from vector-im/feature/adm/allow-optional-emails 
Allowing optional email registration
 2022-09-01 16:30:20 +01:00
Adam Brown
22ce829645 moving all the strings to a dedicated libray/strings module 2022-09-01 14:58:07 +01:00
Benoit Marty
ed13177376
Merge pull request #6982 from p1gp1g/fix/autoplay-sticker 
Fix autoplayed animated sticker
 2022-09-01 14:43:23 +02:00
NIkita Fedrunov
5003459962 empty state for new invites screen 2022-09-01 14:39:13 +02:00
sim
833ad6463c Add changelog detail 
Signed-off-by: sim <git@sgougeon.fr>
 2022-08-31 23:39:26 +02:00
Jorge Martín
3ef3e3760d Fix crash on PIN code settings screen 2022-08-31 20:06:32 +02:00
Adam Brown
62e8beadf8 allowing optional emails 
- when the email stage is non mandatory, email emails are treated as a dummy step, as per the legacy flow
 2022-08-31 17:40:35 +01:00
Benoit Marty
318352f1bd
Merge pull request #6978 from vector-im/feature/bma/null_room 
Fix crash when opening an unknown room
 2022-08-31 17:51:13 +02:00
Onuray Sahin
6341cf92a3
Merge pull request #6946 from vector-im/feature/ons/device_manager_other_session_list 
[Device Manager] Render other sessions (PSG-668)
 2022-08-31 17:01:20 +03:00
Benoit Marty
0950e41526
Merge pull request #6967 from vector-im/feature/bma/fix_crashes 
Fix crashes
 2022-08-31 15:25:57 +02:00
Benoit Marty
642da5a8e8 Changelog 2022-08-31 15:25:12 +02:00
Benoit Marty
b18395f418 Changelog 2022-08-31 10:41:05 +02:00
Adam Brown
10b1612ba3 fixing typo in changelog 2022-08-31 09:16:01 +01:00
Adam Brown
39f9eb9641 adding changelog entry 2022-08-31 09:16:00 +01:00
Nikita Fedrunov
657796c8b5
new app layout is enabled (#6959) 2022-08-31 10:06:01 +02:00
Benoit Marty
456d831a7d
Merge pull request #6917 from vector-im/feature/bma/incr_sync_perf 
Feature/bma/incr sync perf
 2022-08-31 09:06:32 +02:00
Eric Decanini
b0fb1f908e
Space Switching: Space Invites (#6924) 2022-08-30 15:30:51 +02:00
Benoit Marty
51dcaf7556
Merge pull request #6925 from vector-im/feature/bma/http_log 
Feature/bma/http log
 2022-08-29 15:04:46 +02:00
Nikita Fedrunov
14e3753183
fabs are moved from HomeRoomListFragment to NewHomeDetailFragment (#6943) 2022-08-29 13:26:39 +02:00
Nikita Fedrunov
84d938da94
fixed invites count badge bottom margin on a home screen (#6948) 2022-08-29 10:17:27 +02:00
Eric Decanini
b5debe92c0
Merge pull request #6877 from vector-im/feature/eric/new-layout-navigation 
Space Switching Back Navigation
 2022-08-26 17:40:18 +02:00
Onuray Sahin
dc99c1122d
Merge pull request #6903 from vector-im/feature/ons/device_manager_current_session 
[Device Manager] Render current session (PSG-668)
 2022-08-26 16:22:46 +03:00
Adam Brown
fdc2e1c3c3
Merge pull request #6941 from vector-im/feature/adm/invalid-space-command-parsing 
Fixing /joinSpace and /addToSpace commands
 2022-08-26 14:15:38 +01:00
ericdecanini
95b37e2838 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/spaces/NewSpaceSummaryController.kt
 2022-08-26 14:06:11 +02:00
Eric Decanini
b67c3ce40b
Merge pull request #6907 from vector-im/feature/eric/accordion-bottom-sheet 
Space Switching: Accordion-Style Bottom Sheet
 2022-08-26 14:04:52 +02:00
Onuray Sahin
2c6c23da9c Merge branch 'feature/ons/device_manager_current_session' into feature/ons/device_manager_other_session_list 
* feature/ons/device_manager_current_session: (169 commits)
  new app layouts invites (#6911)
  bottom navigation tabs are removed for AppLayout (#6905)
  focus input when changing server address
  Fix copyright
  Improve createRoomThreePidEvents for clarity
  Remove roomCreatorUserId and use current userId by default
  Remove useless explicit field type
  Change visibility of LocalRoomThirdPartyInviteContent to internal
  Remove useless apply in CreateLocalRoomStateEventsTask
  Update doc
  Extract condition to reduce code complexity
  Verify tombstone event
  Remove safe call
  Add unit tests for CreateRoomFromLocalRoomTask
  Add unit tests for CreateLocalRoomStateEventsTask
  Set stateKey as empty by default
  Create local room state events in dedicated task
  Fix local events generation following the specification
  Update CreateRoomParams from the potential FeaturePreset before persisting
  Persists CreateRoomParams into LocalRoomSummaryEntity
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
 2022-08-26 14:47:09 +03:00
Onuray Sahin
7a3a5ae30d Merge branch 'develop' into feature/ons/device_manager_current_session 
* develop: (169 commits)
  new app layouts invites (#6911)
  bottom navigation tabs are removed for AppLayout (#6905)
  focus input when changing server address
  Fix copyright
  Improve createRoomThreePidEvents for clarity
  Remove roomCreatorUserId and use current userId by default
  Remove useless explicit field type
  Change visibility of LocalRoomThirdPartyInviteContent to internal
  Remove useless apply in CreateLocalRoomStateEventsTask
  Update doc
  Extract condition to reduce code complexity
  Verify tombstone event
  Remove safe call
  Add unit tests for CreateRoomFromLocalRoomTask
  Add unit tests for CreateLocalRoomStateEventsTask
  Set stateKey as empty by default
  Create local room state events in dedicated task
  Fix local events generation following the specification
  Update CreateRoomParams from the potential FeaturePreset before persisting
  Persists CreateRoomParams into LocalRoomSummaryEntity
  ...

# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/devices/v2/VectorSettingsDevicesFragment.kt
 2022-08-26 13:45:47 +03:00
Onuray Sahin
ed2c365db2 Add changelog. 2022-08-26 13:07:16 +03:00
Adam Brown
da2eddd857
Merge pull request #6927 from noantiq/develop 
FTUE: Make entering a custom Homeserver address faster by focusing the input
 2022-08-26 10:43:13 +01:00
Florian Renaud
e43bc88a4d
Merge pull request #6127 from vector-im/feature/fre/start_dm_on_first_msg_impl 
Create the DM when sending an event
 2022-08-26 09:15:34 +02:00
Nikita Fedrunov
70cfe00271
new app layouts invites (#6911) 2022-08-25 16:34:04 +02:00
Adam Brown
493d9240c2 parsing the space commands by checking for the size and last segment to find the space id to join/add to 2022-08-25 15:30:43 +01:00
ericdecanini
a5536ab894 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
 2022-08-25 16:15:53 +02:00
Nikita Fedrunov
225d05e0be
bottom navigation tabs are removed for AppLayout (#6905) 2022-08-25 15:59:38 +02:00
Timuçin Boldt
b2212a7e2b
focus input when changing server address 2022-08-25 14:52:16 +02:00
Florian Renaud
72896f1c8a Create the DM when sending an event 2022-08-25 13:57:49 +02:00
Nikita Fedrunov
da70d520bc
fixed space switching dialog measured with wrong height sometimes (#6928) 2022-08-25 10:49:44 +02:00
sim
f7ae377874 Add changelog 
Signed-off-by: sim <git@sgougeon.fr>
 2022-08-25 09:33:26 +02:00
ericdecanini
64894d4443 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
 2022-08-24 20:25:02 +02:00
Benoit Marty
5d711793ad Changelog 2022-08-24 12:39:58 +02:00
Benoit Marty
4c2f8537e1 Changelog 2022-08-23 18:51:14 +02:00
Benoit Marty
033557dba4 Towncrier 2022-08-23 16:07:57 +02:00
Benoit Marty
94e755552c
Merge pull request #6888 from vector-im/feature/adm/change-server-on-error 
FTUE - Allow changing server on onboarding start error
 2022-08-23 15:05:51 +02:00
Benoit Marty
c9e76f5f97 changelog 2022-08-23 11:58:05 +02:00
ericdecanini
ace2c672ed Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 2022-08-23 10:00:55 +02:00
Eric Decanini
2830664dbb
Merge pull request #6868 from vector-im/feature/eric/space-settings 
Space Switching: Adds Toolbar Click To Open Space Settings
 2022-08-23 09:59:09 +02:00
Adam Brown
8336d4c269 adding changelog entry 2022-08-22 17:24:11 +01:00
Adam Brown
0be46adfda
Merge pull request #6862 from vector-im/feature/adm/ftue-fragment-crashes 
FTUE - Crash fixes
 2022-08-22 17:21:31 +01:00
Adam Brown
841ee33c82
Merge pull request #6837 from vector-im/feature/adm/missing-notifications 
Missing notifications due to stuck background workers
 2022-08-22 17:20:04 +01:00
ericdecanini
edb2d5d78e Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/HomeActivity.kt
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
 2022-08-22 14:56:14 +02:00
ericdecanini
a7aa72fb6e Adds changelog file 2022-08-22 14:21:48 +02:00
Adam Brown
9b57630eae
Merge pull request #6873 from vector-im/feature/adm/allow-trusting-certificates 
FTUE - Fix trusting certificates during edit server flow
 2022-08-22 11:47:50 +01:00
Adam Brown
7211c9c08e
Merge pull request #6890 from vector-im/feature/adm/missing-notifications-on-login 
Missing push notifications on login
 2022-08-22 11:14:28 +01:00
Benoit Marty
e86058b299
Merge pull request #6884 from vector-im/feature/bma/sync_thread_investigation 
Ensure sync thread is started
 2022-08-22 12:09:54 +02:00
Onuray Sahin
43f191d073 Add changelog. 2022-08-22 12:40:15 +03:00
Adam Brown
d405a66443
Merge pull request #6834 from vector-im/feature/adm/ftue-empty-identity-providers 
Allow empty SSO `identity_providers`
 2022-08-22 08:44:31 +01:00
Adam Brown
06c77e4b5e adding changelog entry 2022-08-19 17:14:20 +01:00
Nikita Fedrunov
cc49e96d36
dialpad moved from bottom navigation tab to a separate activity (#6887) 2022-08-19 17:55:43 +02:00
Nikita Fedrunov
0629cae183
added dialog to change app layout settings (#6840) 2022-08-19 17:53:48 +02:00
ericdecanini
add7bd9052 Merge branch 'feature/eric/new-layout-navigation' into feature/eric/new-layout-debug 
# Conflicts:
#	vector/src/test/java/im/vector/app/features/navigation/DefaultNavigatorTest.kt
 2022-08-19 14:33:49 +02:00
ericdecanini
7fafd07e2c Changes changelog file 2022-08-19 13:32:31 +02:00
Benoit Marty
f75b2e6ef1 Changelog files. 2022-08-19 10:11:31 +02:00
ericdecanini
90ab40dccb Merge remote-tracking branch 'origin/develop' into feature/eric/new-chat-bottom-sheet 2022-08-18 17:38:15 +02:00
ericdecanini
2a1483f6a5 Merge remote-tracking branch 'origin/develop' into feature/eric/space-settings 2022-08-18 17:37:56 +02:00
ericdecanini
88fc0afea5 Merge branch 'feature/eric/new-layout-navigation' into feature/eric/new-layout-debug 2022-08-18 17:37:16 +02:00
ericdecanini
fecaf3e360 Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-navigation 2022-08-18 17:36:08 +02:00
ericdecanini
e17e3fe00a Adds changelog file 2022-08-18 17:22:19 +02:00
Adam Brown
cdeea21917 adding changelog entries 2022-08-18 11:41:28 +01:00
Adam Brown
e948fe05ca adding changelog entry 2022-08-18 11:41:19 +01:00
Andrew Morgan
e00a9a10fb changelog 2022-08-18 11:24:02 +01:00
Florian Renaud
519855445e Start DM on first message when selecting "direct message" from the room member details 2022-08-18 11:37:55 +02:00
ericdecanini
136ca4bafb Adds changelog file 2022-08-18 10:16:54 +02:00
ericdecanini
003a254c17 Adds changelog file 2022-08-17 22:31:18 +02:00
ericdecanini
ce8939a092 Merge remote-tracking branch 'origin/develop' into feature/eric/new-chat-bottom-sheet 
# Conflicts:
#	vector/src/main/res/values/strings.xml
 2022-08-17 21:13:39 +02:00
Adam Brown
a3a76d1c35 adding changelog entry 2022-08-17 15:24:05 +01:00
Benoit Marty
6c860710bd
Merge pull request #6843 from vector-im/feature/bma/detect_object_log 
Fix some string template
 2022-08-17 14:37:42 +02:00
Eric Decanini
b6bcefbb92
Merge pull request #6795 from vector-im/feature/eric/toolbar-space-name 
New App Layout: Space name reflected in toolbar
 2022-08-17 10:52:07 +02:00
Eric Decanini
4fedafc1be
Merge pull request #6749 from vector-im/feature/eric/space-list-modal 
Adds Space List Bottom Sheet
 2022-08-17 10:51:56 +02:00
Benoit Marty
446bf7e0aa changelog 2022-08-16 16:10:15 +02:00
Adam Brown
74d99b156f
Merge pull request #6833 from vector-im/feature/adm/removing-login-poc 
Removing `Login2` proof of concept
 2022-08-16 13:02:40 +01:00
ericdecanini
8b0fba2ef5 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
 2022-08-16 11:58:25 +02:00
Benoit Marty
8a4bd0c467
Merge pull request #6805 from vector-im/cgizard/ISSUE-6645 
Add inputType for room name creation and settings
 2022-08-16 11:05:57 +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
Adam Brown
b152910f9c adding changelog entry 2022-08-15 14:12:42 +01:00
Adam Brown
314b077fbd adding changelog entry 2022-08-15 11:58:04 +01:00
Florian Renaud
62f7b40a3e Add changelog entry 2022-08-12 13:10:49 +02:00
Maxime NATUREL
971ad26deb
Merge pull request #6809 from vector-im/fix/mna/leak-in-call 
[Call] Memory leak after a call
 2022-08-11 16:44:33 +02:00
Nikita Fedrunov
e0e21d4282
filtered room list at home (#6724) 2022-08-11 16:26:24 +02:00
Maxime NATUREL
292f6622bd Adding changelog entry 2022-08-11 15:28:18 +02:00
Maxime NATUREL
ef2aa6f829 Adding changelog entry 2022-08-11 14:26:15 +02:00
Maxime NATUREL
fa8f72c909
Merge pull request #6792 from vector-im/feature/mna/enable-leakcanary 
Add a developer setting to enable LeakCanary at runtime
 2022-08-11 12:10:26 +02:00
Adam Brown
616c16f8c6
Merge pull request #6783 from vector-im/feature/adm/decouple-variants 
Decouple `:vector` variants/build types
 2022-08-11 10:59:42 +01:00
Claire G
ce23303b97 Add inputType for room name creation and settings 2022-08-11 11:53:43 +02:00
Maxime NATUREL
0515303c8c
Merge pull request #6800 from vector-im/feature/mna/new-device-management-screen 
[Devices management] Add a feature flag and empty screen for future new layout (PSG-676)
 2022-08-11 08:59:57 +02:00
ericdecanini
989471a409 Adds changelog file 2022-08-10 17:44:33 +02:00
Maxime NATUREL
a2c39c079a Adding changelog entry 2022-08-10 15:28:51 +02:00
Maxime NATUREL
12405527e1 Adding changelog entry 2022-08-10 14:47:08 +02:00
Adam Brown
fcc7bbadfa Merge branch 'release/v1.4.32' into develop 2022-08-10 12:30:42 +01:00
ericdecanini
527bcf2e6f Adds changelog file 2022-08-10 11:30:15 +02:00
ericdecanini
fd37b31c44 Changes changelog file extension 2022-08-10 11:28:14 +02:00
Maxime NATUREL
ed00685514 Adding changelog entry 2022-08-10 10:40:06 +02:00
Adam Brown
e81da5d8b4 generating 1.4.32 changelog 2022-08-10 09:02:04 +01:00
ericdecanini
e87eefb319 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/room/list/home/HomeRoomListFragment.kt
 2022-08-10 08:24:55 +02:00
Eric Decanini
ce4ab78f13
Merge pull request #6693 from vector-im/feature/eric/new_fab 
New App Layout FABs
 2022-08-10 08:13:36 +02:00
Adam Brown
d7949307a4 adding changelog entry 2022-08-09 14:01:00 +01:00
Jorge Martín
2f4725cfe9 Prevent crash while validating biometric key. 2022-08-09 14:03:39 +02:00
Jorge Martín
6e1e31bac1 Avoid crashes from unknown exceptions on lockscreen key migration. 2022-08-09 12:52:28 +02:00
Adam Brown
58d47df37b
Merge pull request #6736 from vector-im/feature/adm/non-ascii-username 
Fixes crash when entering non ascii username during account creation
 2022-08-09 11:52:02 +01:00
ericdecanini
756570793f Adds changelog file 2022-08-05 17:12:47 +02:00
ericdecanini
1bf36dce92 Merge remote-tracking branch 'origin/develop' into feature/eric/new_fab 2022-08-05 17:11:00 +02:00
ericdecanini
41d859dc5b Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/NewHomeDetailFragment.kt
 2022-08-05 17:10:36 +02:00
Adam Brown
81897a179e
Merge pull request #6741 from vector-im/feature/adm/focus-errors 
FTUE - Focus errors showing on wrong page
 2022-08-05 15:12:47 +01:00
Maxime NATUREL
2dc92caa30
Merge pull request #6712 from vector-im/feature/mna/map-loading-error 
[Location Share] Render fallback UI when map fails to load (PSG-607)
 2022-08-05 11:17:37 +02:00
Maxime NATUREL
6590cf5524 adding changelog entry 2022-08-04 16:58:28 +02:00
Maxime NATUREL
018772ca9a Adding changelog entry 2022-08-04 16:57:14 +02:00
Michael Kaye
09a91c4541
Make it easier to find developer sign-off instructions (#6739) 
* Make it easier to find sign-off instructions by linking directly to DCO docs from danger message.
 2022-08-04 15:54:53 +01:00
Adam Brown
b6582c4144 adding changelog entry 2022-08-04 14:29:26 +01:00
Maxime NATUREL
dd69b254f9
Merge pull request #6654 from vector-im/feature/mna/update-sending-period-lls 
[Location share] Update minimum sending period to 5 seconds for a live
 2022-08-04 14:17:00 +02:00
Adam Brown
9a97e0bf61 adding changelog entry 2022-08-04 12:04:51 +01:00
Maxime NATUREL
bfd9dcbca2
Merge pull request #6681 from vector-im/fix/mna/leak-tab-layout-mediator 
[FTUE] Memory leak on FtueAuthSplashCarouselFragment
 2022-08-03 14:18:41 +02:00
Adam Brown
8aaf185a8e
Merge pull request #6517 from vector-im/feature/adm/build-config 
Avoiding direct `BuildConfig` usage
 2022-08-02 18:07:17 +01:00
ericdecanini
55d8b6a819 Merge remote-tracking branch 'origin/develop' into feature/eric/space-list-modal 2022-08-02 18:07:34 +02:00
Maxime NATUREL
ac8597e745
Merge pull request #6676 from vector-im/fix/mna/fix-memory-leaks-lls 
[Location sharing] - Fix the memory leaks (PSG-656)
 2022-08-02 18:01:48 +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
a53de92b10
Merge pull request #6688 from vector-im/fix/mna/missing-text-on-map-symbol 
[Location sharing] Invisible text on map symbol
 2022-08-02 16:38:11 +02:00
Adam Brown
c07296c94d adding changelog entry 2022-08-02 14:31:46 +01:00
Jorge Martin Espinosa
c848615636
Disable 'Enable biometrics' option if there are not biometric authenticators enrolled. (#6714) 
* Disable 'Enable biometrics' option if there are not biometric authenticators enrolled.

* Improve biometric pref enabled check

* Fix changelog issue

* Address review comments. Add extra catch clauses to key migrations.

* Add tests for key migrators
 2022-08-02 15:31:08 +02:00
Maxime NATUREL
1ef809c633 Adding changelog entry 2022-08-02 10:36:34 +02:00
Maxime NATUREL
0944b2ff39 Adding changelog entry 2022-08-02 09:13:16 +02:00
Maxime NATUREL
a8df1af6fd Adding changelog entry 2022-08-02 09:09:19 +02:00
SpiritCroc
3845e1435c Fix cleartext leak in log 
Change-Id: Ifb9faaa52f63bcf9c88a8499c2b078dd1a2de62e
 2022-08-01 13:00:30 +02:00
Eric Decanini
ddaf1128ac
Merge pull request #6598 from vector-im/task/eric/space-switching-unit-tests 
Space Switching Refactoring and Unit Tests
 2022-07-29 16:21:33 +02:00
ericdecanini
d116d98080 Adds changelog file 2022-07-29 15:48:58 +02:00
Benoit Marty
59f00cd196
Merge pull request #6637 from vector-im/feature/bma/danger 
Danger
 2022-07-29 12:55:32 +02:00
Maxime NATUREL
c7d5ceca5d
Merge pull request #6644 from vector-im/feature/mna/notification-tap-lls 
[Location Share] Open maximized map on tapping on live sharing notification (PSG-616)
 2022-07-29 11:27:53 +02:00
Maxime NATUREL
79ea66890f Adding changelog entry 2022-07-29 10:20:32 +02:00
Benoit Marty
036521af94 Add changelog 2022-07-29 10:02:40 +02:00
Adam Brown
7b208316e4 generating 1.4.30 changelog 2022-07-29 08:57:57 +01:00
Maxime NATUREL
2b58c42c8b Adding changelog entry 2022-07-28 17:30:05 +02:00
Adam Brown
b409431b0f
Merge pull request #6666 from vector-im/feature/adm/missing-space-rooms 
`Home` always showing all rooms
 2022-07-28 12:10:36 +01:00
Adam Brown
e4640f14d2 adding sdk changelog 2022-07-28 11:06:30 +01:00
Maxime NATUREL
d60683d991
Merge pull request #6664 from vector-im/fix/mna/cancel-infinite-animation 
Cancel infinite animations in TypingMessageDotsView
 2022-07-28 11:48:26 +02:00
ericdecanini
e6addd1319 Merge remote-tracking branch 'origin/develop' into task/eric/space-switching-unit-tests 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/home/HomeDetailFragment.kt
 2022-07-28 11:25:14 +02:00
Adam Brown
2d8ef9925d adding changelog entry 2022-07-28 10:23:14 +01:00
Maxime NATUREL
a0534d8fcc
Merge pull request #6636 from vector-im/feature/mna/ended-state-map-live-location 
[Location Share] - Expanded map state when no more live location shares (PSG-629)
 2022-07-28 10:53:31 +02:00
Maxime NATUREL
0f6d5aec88 Adding changelog entry 2022-07-28 10:11:35 +02:00
ganfra
050c23b578
Merge pull request #6656 from vector-im/feature/fga/revert_6404 
Revert #6404
 2022-07-27 17:49:10 +02:00
Adam Brown
01bc275311
Merge pull request #6651 from vector-im/feature/adm/enable-ftue 
FTUE - Enable onboarding FTUE flows
 2022-07-27 16:38:35 +01:00
ganfra
e9f5208efd Revert "replyTo are not updated if the original message is edited (#6404)" 
This reverts commit 99a906fe9b.
 2022-07-27 16:39:13 +02:00
ericdecanini
3c8401bc24 Adds changelog file 2022-07-27 16:21:12 +02:00