Arnfried Griesert
dbc8f39fec
MESSENGER-4203 show user qr
2023-03-24 07:35:38 +00:00
Arnfried Griesert
285bf4bdc0
merged basis update 1_10_5 into develop
2023-03-21 07:52:11 +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
Frank Rotermund
df74a26f86
MESSENGER-4392 messges bubbles as default
2023-03-10 08:06:43 +01:00
Frank Rotermund
c5886f1836
Merge branch 'feature/4174_better_error_message_when_backend_down' into 'develop'
...
Feature/4174 better error message when backend down
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!103
2023-03-07 12:28:55 +00:00
Frank Rotermund
e435aebd55
Feature/4174 better error message when backend down
2023-03-07 12:28:55 +00:00
JanNiklas Grabowski
6344fa6cb6
MESSENGER-4197 fix status messages cut off
2023-03-07 12:14:51 +00:00
Nicolas Mauri
8437da0d17
Add missing changes on generated Strings file.
2023-03-03 16:22:11 +01:00
Frank Rotermund
8741d904e9
MESSENGER-4157 Better Texts for downtime warnings
2023-03-01 08:47:25 +01:00
Frank Rotermund
241d322543
Feature/4218 wellknown defaults
2023-02-28 10:07:25 +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
Nicolas Mauri
eb40c17dd3
Remove unused string key
2023-02-27 09:29:59 +01:00
Nicolas Mauri
73d3002525
Fix localized string
2023-02-24 14:21:27 +01:00
Nicolas Mauri
a599b8bd40
Update other key verification screens UX/UI
2023-02-23 09:33:14 +01:00
Nicolas Mauri
9fbc7cea05
Update UX/UI implementation
2023-02-23 09:33:14 +01:00
Arnfried Griesert
eb618b395d
MESSENGER-4093 scan permalinks as qr
2023-02-23 06:50:16 +00:00
Frank Rotermund
79743b5165
MESSENGER-4211 Notes room improvements for new layout
2023-02-22 07:19:05 +00: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
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
Frank Rotermund
f347864261
Merge branch 'feature/4088_emoji_name_changes' into 'develop'
...
Align emoji names with other platforms
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!79
2023-02-10 10:01:16 +00:00
Arnfried Griesert
5fadb61abf
Align emoji names with other platforms
2023-02-10 10:01:15 +00:00
Frank Rotermund
19ff9e0371
Feature/2821 server maintenance info
2023-02-07 12:48:46 +00:00
Andy Uhnak
0bdde0e26c
Track crypto sdk being enabled
2023-02-02 17:55:09 +00: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
16e54b7141
Merge branch 'develop' into alfogrillo/sync_polls_rulles_error_handling
2023-02-01 14:07:21 +01:00
Alfonso Grillo
3f5beece27
Add error handling for push sync
2023-02-01 11:38:38 +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
368892d2ad
Merge commit '35d6d9ada3d92068f328e31b547a348ef035380b' into flescio/1040-poll_detail
2023-01-31 16:03:49 +01:00
Flescio
35d6d9ada3
Merge pull request #7301 from vector-im/flescio/7253-Add_mar_kas_unread_option_for_rooms
...
Flescio/7253 add mar kas unread option for rooms
2023-01-31 12:37:40 +01:00
Nicolas Mauri
f6229d1b65
Merge pull request #7302 from vector-im/nimau/7189_vb_decryption_error
...
Inform the user about decryption errors during a voice broadcast
2023-01-31 10:23:47 +01:00
Flavio Alescio
321de767c5
Merge branch 'develop' into flescio/1040-poll_detail
2023-01-31 09:18:59 +01:00
Andy Uhnak
ea6c6b171d
Display backup import progress
2023-01-30 15:49:10 +00:00
Flavio Alescio
0f75dbd40d
Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms
2023-01-30 15:55:30 +01:00
aringenbach
a903196e48
Labs: Rich text editor: enable list items indentation
2023-01-30 15:38:56 +01:00
Flavio Alescio
f66170b9cd
generated String
2023-01-27 15:23:44 +01:00
Flavio Alescio
4e4ad5074c
Merge branch 'develop' into flescio/1040-poll_detail
...
# Conflicts:
# Riot/Generated/Strings.swift
# RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift
# RiotSwiftUI/Modules/Room/PollHistory/PollHistoryModels.swift
# RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift
2023-01-27 15:22:15 +01:00
Andy Uhnak
746fd99ddb
Generate crypto store key
2023-01-27 10:20:40 +00:00
Frank Rotermund
cdb37aaab7
Feature/4014 new layout notes room
2023-01-27 10:18:49 +00:00
Alfonso Grillo
844da02c74
Add alert on error
2023-01-25 18:40:09 +01:00
Nicolas Mauri
13b7f78de7
Inform the user about decryption errors during a voice broadcast
2023-01-25 17:23:42 +01:00
Flavio Alescio
08fc35d4fe
fix strings after merge
2023-01-25 16:06:40 +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
Flavio Alescio
89ffbcfa3f
Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms
2023-01-25 10:28:37 +01:00
Flavio Alescio
9199407f2f
added view poll in timeline button
2023-01-25 10:27:21 +01:00
Gil Eluard
04f85ad8b8
App Layout: Removed the onboarding flow
2023-01-24 21:25:58 +01:00
Alfonso Grillo
ee43787857
Localize load more button
2023-01-24 09:27:20 +01:00