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
Arnfried Griesert
28852aa790
merged element-ios 1.10.5 into 4409_basis_update_1_10_5
2023-03-16 12:19:26 +01:00
JanNiklas Grabowski
a6e95b9955
MESSENGER-4407 fixes from testprotocol and release notes
2023-03-14 18:07:07 +01:00
Arnfried Griesert
20ecc8ab46
MESSENGER-3157 third notification settings option
2023-03-07 13:28:09 +00:00
JanNiklas Grabowski
6344fa6cb6
MESSENGER-4197 fix status messages cut off
2023-03-07 12:14:51 +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
Alfonso Grillo
fc45e7d6f7
Fix poll ended event rendering
2023-03-02 17:49:15 +01:00
Arnfried Griesert
c8b969ae53
MESSENGER-4179 send button wrong color
2023-03-02 14:50:31 +00: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
Frank Rotermund
cb100fab66
Merge branch 'release/v.2.3.0' into develop
...
# Conflicts:
# Podfile
2023-02-16 16:29:24 +01:00
Frank Rotermund
8b0ff57d69
MESSENGER-4258 Fixes from Testprotocol
2023-02-16 15:40:21 +01: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
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
Alfonso Grillo
877c0bdd4d
Merge pull request #7353 from vector-im/alfogrillo/fallback_poll_ended_event
...
Fallback for poll ended event (PSG-1156)
2023-02-10 10:33:39 +01:00
Nicolas Mauri
cba9dcb4d0
Fix some voice message issues ( #7325 , #7217 )
...
Fix #7325 : prevent setting the audio session to inactive during recording
Fix #7217 : ensure that an audio player has its content loaded when it reaches the end to allow seek and replay.
2023-02-09 11:58:38 +01:00
Alfonso Grillo
f47ad395b0
Sync with matrix feature branch
2023-02-08 17:29:30 +01:00
Nicolas Mauri
fc577d1111
Fix an issue where a voice message disappears after being sent
2023-02-08 15:07:40 +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
Flavio Alescio
fae76cf002
indentation
2023-01-31 16:55:59 +01:00
Flavio Alescio
368892d2ad
Merge commit '35d6d9ada3d92068f328e31b547a348ef035380b' into flescio/1040-poll_detail
2023-01-31 16:03:49 +01:00
Flavio Alescio
7b4333e9af
code restyle for poll detail
2023-01-31 16:03:38 +01:00
Flavio Alescio
1a3529d09b
function renamed as in sdk
2023-01-30 16:04:58 +01:00
aringenbach
a903196e48
Labs: Rich text editor: enable list items indentation
2023-01-30 15:38:56 +01:00
Frank Rotermund
f7110e461a
MESSENGER-4029 remove longpress and context menus for state events
2023-01-30 10:35:09 +00:00
Flavio Alescio
bb384f837e
added alert to show possible error, improved tests
2023-01-27 17:10:16 +01:00
Flavio Alescio
21eafa2383
added view in timeline action, added tests
2023-01-27 15:07:32 +01:00
Flavio Alescio
a8c82abd35
Merge branch 'develop' into flescio/1040-poll_detail
...
# Conflicts:
# Riot/Assets/en.lproj/Vector.strings
# Riot/Generated/Strings.swift
2023-01-25 15:49:40 +01:00
JanNiklas Grabowski
0f22ac9855
MESSENGER-4039 new layout - add last admin function
2023-01-25 11:06:00 +00:00
Flavio Alescio
89ffbcfa3f
Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms
2023-01-25 10:28:37 +01:00
Alfonso Grillo
9436c634f9
Merge pull request #7293 from vector-im/alfogrillo/fetch_poll_history
...
Fetch poll history (PSG-1043)
2023-01-24 16:31:27 +01:00
Phl-Pro
1c54bc922d
Merge pull request #7275 from vector-im/phlpro/remove-duplicate-leave-room-button
...
Remove "Leave" button on Room details screen
2023-01-24 10:56:46 +01:00
Nicolas Mauri
5192730821
Always try to delete a voicebroadcast with relations. The SDK will ensure the feature is supported.
2023-01-23 17:06:47 +01:00
Nicolas Mauri
56d215fb60
Use the new endpoint for redaction
2023-01-23 16:47:17 +01:00
Flavio Alescio
333cba0606
added poll detail scene with mock data
2023-01-23 16:38:53 +01:00
Alfonso Grillo
3f343a028b
Begin PollHistoryService
2023-01-23 12:09:46 +01:00
Nicolas Mauri
6933cd08c0
Delete a voice broadcast with all related events if MSC3912 is supported.
2023-01-19 18:22:25 +01:00
Yoan Pintas
947f67ec93
Handle a connection issue when we try to start a new voice broadcast ( #7276 )
2023-01-17 14:49:36 +00:00
Nicolas Mauri
be2a6f15b1
Merge pull request #7257 from vector-im/nimau/PSF-1734_vb_control_center
...
Fix the now playing info center while a voice broadcast is played
2023-01-17 09:38:28 +01:00
Nicolas Mauri
d492f83be1
Live voice broadcast should not appear in Info Center while playing
2023-01-16 15:24:40 +01:00
Philippe Loriaux
8185255b0e
Remove "Leave" button on Room details screen
2023-01-16 14:58:18 +01:00
Alfonso Grillo
a2617265f5
Merge pull request #7267 from vector-im/alfogrillo/active_poll_history
...
Active poll history UI (PSG-906)
2023-01-16 12:43:07 +01:00
Nicolas Mauri
39e275c5cb
Merge pull request #7266 from vector-im/nimau/PSF-1851_VB_sent_as_VM
...
Fix how is resent a voice broadcast chunk
2023-01-16 12:29:15 +01:00
Frank Rotermund
d9057cd0cb
Merge commit '0bf30fc7d2f35f80982c2d6cfd5e844de5f798e6' into feature/4068_merge_foss_1_9_15
...
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile.lock
# Riot/Assets/de.lproj/Localizable.strings
# Riot/Modules/Room/RoomViewController.m
# RiotNSE/NotificationService.swift
# fastlane/Fastfile
2023-01-16 12:11:51 +01:00
Frank Rotermund
cc5a9ed847
MESSENGER-4078 permalinks only in open rooms, better texts and icons
2023-01-16 08:06:13 +01:00
Nicolas Mauri
1c9d998dae
Code cleanup
2023-01-13 15:29:51 +01:00
Alfonso Grillo
bd85e7aa20
Add changelog.d file
2023-01-13 11:04:40 +01:00