1868 Commits

Author SHA1 Message Date
aringenbach
935e61e1bb Enable user mentions in Rich Text Editor 2023-03-23 17:16:57 +01:00
Andy Uhnak
ef31ad428b Revert "Merge pull request #7430 from vector-im/andy/user_trust"
This reverts commit 7f5d3b46eb02a7801d4a7c781762eea3d16ee0e6, reversing
changes made to 5a3adde8f70daec795ac1bee17c5159a155c6106.
2023-03-22 15:57:25 +00:00
Arnfried Griesert
57de18502d merged basis update 1_10_5 into develop 2023-03-21 07:52:11 +01:00
Arnfried Griesert
c61ddcf39a Fixed merge conflicts 2023-03-20 07:33:28 +01:00
JanNiklas Grabowski
cf1317452e MESSENGER-4407 fixes from testprotocol 2023-03-16 16:45:48 +01:00
Andy Uhnak
db771d2508 Refactor encryption trust level 2023-03-16 14:56:50 +00:00
Arnfried Griesert
e5d97ed154 merged element-ios 1.10.5 into 4409_basis_update_1_10_5 2023-03-16 12:19:26 +01:00
Andy Uhnak
02413968e0 Update startup progress UX 2023-03-10 09:40:48 +00:00
Arnfried Griesert
89f8644abc MESSENGER-3157 third notification settings option 2023-03-07 13:28:09 +00:00
JanNiklas Grabowski
7ff2ab0da3 Feature/4231 change icon new loginflow 2023-03-07 13:05:50 +00:00
Arnfried Griesert
d5d299a357 More tint color changes 2023-03-06 22:11:23 +01:00
Mauro Romito
fc1c22c08c refactor completed 2023-03-06 14:59:03 +01:00
Nicolas Mauri
72bbf08dc3 Merge pull request #7396 from vector-im/nimau/6612-dm-email
Direct Message: manage encrypted DM in case of invite by email
2023-03-06 12:04:53 +01:00
Arnfried Griesert
c94184f74c MESSENGER-4179 send button wrong color 2023-03-02 14:50:31 +00:00
Arnfried Griesert
b1c85b9a24 Merge branch 'feature/4231_add_new_loginflow' into 'develop'
MESSENGER-4231 add new loginflow

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!98
2023-03-02 13:09:34 +00:00
Flescio
c7d6dd25a2 Location centring user's sharing location (#7398)
* fix issue on timeline bubbles not showing proper content after decrypt

* fix location sharing centring to other users

* Update RiotSwiftUI/Modules/LocationSharing/LiveLocationSharingViewer/LiveLocationSharingViewerViewModel.swift

Co-authored-by: Alfonso Grillo <alfogrillo@element.io>

---------

Co-authored-by: Alfonso Grillo <alfogrillo@element.io>
2023-03-02 11:28:00 +01:00
JanNiklas Grabowski
fdafc1f2bf MESSENGER-4231 add new loginflow 2023-02-28 18:06:13 +01:00
Nicolas Mauri
71281ce1cc Direct Message: manage encrypted DM in case of invite by email
- Don’t allow to invite more than one contact by email
- The DM will be created by enabling the encryption when the HS promotes the encryption
- The chat composer is disabled until a matrix account is created by using the invited email
2023-02-27 18:42:18 +01:00
Arnfried Griesert
dd425c79e0 MESSENGER-3948 show hide login password 2023-02-24 12:01:55 +00:00
Arnfried Griesert
00222176c7 MESSENGER-4093 scan permalinks as qr 2023-02-23 06:50:16 +00:00
Flescio
95501bfdde Show own location in map views (#7375)
* show own location on static sharing

* show own location on live sharing

* add tests and changelog

* check location authorisation, fix center to current user location button

* it moves request to LocationManager in proper service

* add static location viewer service
2023-02-20 18:07:03 +01:00
Hugh Nimmo-Smith
d15131e9ba Support for v2 of MSC3903 (#7372) 2023-02-15 14:02:33 +00:00
JanNiklas Grabowski
1768fb5eee Merge commit 'aaadcc73674cc8886e363693a7d7c08ac9b4f516' into feature/4260_merge_foss_1_10_2
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
2023-02-15 14:56:55 +01:00
Flescio
d461349e00 Apply (polls) push rules client side for encrypted rooms (#7356)
* managing dont notify push rule

* private extension for push rule

* remove mentions and keyword notice footer
2023-02-13 11:13:59 +01:00
aringenbach
a6300b8ebc Update composer library version to 1.1.0 (#7365)
* Update composer library version to 1.1.0

* Add changelog file
2023-02-13 10:44:03 +01:00
Frank Rotermund
91a837268f MESSENGER-3895 Fix presentation of two alerts 2023-02-13 08:08:52 +01:00
Doug
a46d884b05 Merge branch 'master' into develop 2023-02-10 13:39:22 +00:00
JanNiklas Grabowski
eae05b3093 MESSENGER-4235 - location sharing without gps 2023-02-09 17:50:33 +01:00
Andy Uhnak
d203630795 Fix some crashes 2023-02-09 08:44:31 +00:00
Arnfried Griesert
d7a23d53dc MESSENGER-3895 qr code login 2023-02-08 12:19:07 +00:00
Alfonso Grillo
30a875396e Add TimelinePollMessageView 2023-02-08 11:14:10 +01:00
Alfonso Grillo
4d245575d5 Improve SegmentedPicker UI 2023-02-06 12:36:31 +01:00
Alfonso Grillo
3ab38a63fd DispatchGroup to TaskGroup refactor 2023-02-02 22:48:48 +01:00
Alfonso Grillo
eac3f34630 Add UTs 2023-02-02 16:36:50 +01:00
Alfonso Grillo
11c3a1d880 Improve NotificationPushRuleType protocol 2023-02-02 15:33:20 +01:00
Alfonso Grillo
ddc268b01e Add NotificationPushRuleType.pushRuleId 2023-02-02 15:18:52 +01:00
Alfonso Grillo
e3573942d7 Restore MXNotificationSettingsService 2023-02-02 15:08:47 +01:00
Alfonso Grillo
a3d4a66d1a Refactor PushRulesUpdater 2023-02-02 12:08:55 +01:00
Alfonso Grillo
0de90435fb Move logic in AppConfiguration 2023-02-02 11:04:28 +01:00
Flescio
cbb9ad5e0c Merge pull request #7314 from vector-im/flescio/1040-poll_detail
Details screen of a poll (PSG-1039)
2023-02-01 15:46:08 +01:00
Alfonso Grillo
0f53f95463 Merge pull request #7324 from vector-im/alfogrillo/sync_polls_rulles_error_handling
Sync polls rules error handling (PSG-1126)
2023-02-01 14:58:36 +01:00
Nicolas Mauri
7ada54f87c Merge pull request #7321 from vector-im/nimau/7311_vb_error_handling
Improve error handling during a voice broadcast playback
2023-02-01 14:44:34 +01:00
Nicolas Mauri
008a542c22 Cleanup 2023-02-01 14:43:38 +01:00
Alfonso Grillo
12aff1d2d9 Merge branch 'develop' into alfogrillo/sync_polls_rulles_error_handling 2023-02-01 14:07:21 +01:00
Alfonso Grillo
31c7a01df7 Merge pull request #7320 from vector-im/alfogrillo/sync_polls_rules
Sync polls' push rules (PSG-77, PSG-1097)
2023-02-01 12:47:12 +01:00
Flavio Alescio
30daef4be1 removed view from viewModel 2023-02-01 12:41:05 +01:00
Alfonso Grillo
8719dc186e Fix rebase issues 2023-02-01 11:41:59 +01:00
Alfonso Grillo
6029f8e26f Improve UT 2023-02-01 11:39:59 +01:00
Alfonso Grillo
2b70ef843e Add error handling for push sync 2023-02-01 11:38:38 +01:00
Alfonso Grillo
1d94c4776d Cleanup 2023-02-01 11:28:48 +01:00