Arnfried Griesert
285bf4bdc0
merged basis update 1_10_5 into develop
2023-03-21 07:52:11 +01:00
Arnfried Griesert
4727a3ddf2
Fixed merge conflicts
2023-03-20 07:33:28 +01:00
JanNiklas Grabowski
76e0de4e38
MESSENGER-4407 fixes from testprotocol
2023-03-16 16:45:48 +01:00
Arnfried Griesert
28852aa790
merged element-ios 1.10.5 into 4409_basis_update_1_10_5
2023-03-16 12:19:26 +01:00
Arnfried Griesert
20ecc8ab46
MESSENGER-3157 third notification settings option
2023-03-07 13:28:09 +00:00
JanNiklas Grabowski
245be52991
Feature/4231 change icon new loginflow
2023-03-07 13:05:50 +00:00
Arnfried Griesert
8f8741c903
More tint color changes
2023-03-06 22:11:23 +01:00
Mauro Romito
09daa04dd4
refactor completed
2023-03-06 14:59:03 +01:00
Nicolas Mauri
eb55e1553c
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
c8b969ae53
MESSENGER-4179 send button wrong color
2023-03-02 14:50:31 +00:00
Arnfried Griesert
8a41cb72a8
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
6372aa49be
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
7830c3c6f0
MESSENGER-4231 add new loginflow
2023-02-28 18:06:13 +01:00
Nicolas Mauri
de2819ae60
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
dfb5e47985
MESSENGER-3948 show hide login password
2023-02-24 12:01:55 +00:00
Arnfried Griesert
eb618b395d
MESSENGER-4093 scan permalinks as qr
2023-02-23 06:50:16 +00:00
Flescio
ae2d01be22
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
a2a3205ace
Support for v2 of MSC3903 ( #7372 )
2023-02-15 14:02:33 +00:00
JanNiklas Grabowski
b4d4330109
Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' 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
7cdb771c63
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
2425721614
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
6e560823ef
MESSENGER-3895 Fix presentation of two alerts
2023-02-13 08:08:52 +01:00
Doug
56f2ff19b7
Merge branch 'master' into develop
2023-02-10 13:39:22 +00:00
JanNiklas Grabowski
94b55866e2
MESSENGER-4235 - location sharing without gps
2023-02-09 17:50:33 +01:00
Andy Uhnak
599e20ea01
Fix some crashes
2023-02-09 08:44:31 +00:00
Arnfried Griesert
c013098ac9
MESSENGER-3895 qr code login
2023-02-08 12:19:07 +00:00
Alfonso Grillo
744c4a3933
Add TimelinePollMessageView
2023-02-08 11:14:10 +01:00
Alfonso Grillo
18d202f3bd
Improve SegmentedPicker UI
2023-02-06 12:36:31 +01:00
Alfonso Grillo
f1372542b7
DispatchGroup to TaskGroup refactor
2023-02-02 22:48:48 +01:00
Alfonso Grillo
8fc47d5e69
Add UTs
2023-02-02 16:36:50 +01:00
Alfonso Grillo
beb0da9d35
Improve NotificationPushRuleType protocol
2023-02-02 15:33:20 +01:00
Alfonso Grillo
d269fb726d
Add NotificationPushRuleType.pushRuleId
2023-02-02 15:18:52 +01:00
Alfonso Grillo
fa6ea2d4a6
Restore MXNotificationSettingsService
2023-02-02 15:08:47 +01:00
Alfonso Grillo
d52aa20c9b
Refactor PushRulesUpdater
2023-02-02 12:08:55 +01:00
Alfonso Grillo
1114177a16
Move logic in AppConfiguration
2023-02-02 11:04:28 +01:00
Flescio
67f3401bce
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
1e35ff2533
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
a7d48ea97b
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
bea7421c5e
Cleanup
2023-02-01 14:43:38 +01:00
Alfonso Grillo
16e54b7141
Merge branch 'develop' into alfogrillo/sync_polls_rulles_error_handling
2023-02-01 14:07:21 +01:00
Alfonso Grillo
1246b0486c
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
14c96a78b0
removed view from viewModel
2023-02-01 12:41:05 +01:00
Alfonso Grillo
5dc108e4ae
Fix rebase issues
2023-02-01 11:41:59 +01:00
Alfonso Grillo
29391c89d5
Improve UT
2023-02-01 11:39:59 +01:00
Alfonso Grillo
3f5beece27
Add error handling for push sync
2023-02-01 11:38:38 +01:00
Alfonso Grillo
4637562c09
Cleanup
2023-02-01 11:28:48 +01:00
Flavio Alescio
5b7bfc5642
fix embedding pattern
2023-02-01 11:15:22 +01:00
Alfonso Grillo
47c6a34bb4
Async-await refactor
2023-02-01 10:47:11 +01:00
Flavio Alescio
d1333a8c45
Merge commit '32beb2393ceb08e585e8d62c145d133d9bba5ce6' into flescio/1040-poll_detail
2023-02-01 10:13:28 +01:00
aringenbach
32beb2393c
Merge pull request #7317 from vector-im/aringenbach/7316_indentation_support
...
Labs: Rich text editor: enable list items indentation
2023-02-01 09:44:45 +01:00