Commit Graph

122 Commits

Author SHA1 Message Date
JanNiklas Grabowski b298dedc22 chore: update from foss 1.11.19 (MESSENGER-6656)
Merge commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1' into feature/foss_update_1_11_19

* commit 'f823ab9aae70e8d15ed7cc079210dd9bbbb6c8e1':
  finish version++
  version++
  comments
  update submodule
  remove obsolete tests
  removed unused code
  update submodule
  fix
  Libolm removal
  update license macro
  update license
  Prepare for new sprint

# Conflicts:
#	Config/AppVersion.xcconfig
#	IDETemplateMacros.plist
#	LICENSE
#	README.md
#	Riot/Categories/MXSession+Riot.m
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Managers/KeyValueStorage/Extensions/Keychain.swift
#	Riot/Managers/KeyValueStorage/KeyValueStore.swift
#	Riot/Managers/KeyValueStorage/KeychainStore.swift
#	Riot/Managers/KeyValueStorage/MemoryStore.swift
#	Riot/Managers/PushNotification/PushNotificationService.m
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Managers/Settings/Shared/RiotSharedSettings.swift
#	Riot/Modules/Analytics/AnalyticsUIElement.swift
#	Riot/Modules/Application/AppCoordinator.swift
#	Riot/Modules/Application/LegacyAppDelegate.h
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/Legacy/AuthenticationViewController.h
#	Riot/Modules/Authentication/Legacy/AuthenticationViewController.m
#	Riot/Modules/Authentication/Legacy/Views/AuthInputsView.h
#	Riot/Modules/Authentication/Legacy/Views/AuthInputsView.m
#	Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Common/WebViewController/WebViewViewController.m
#	Riot/Modules/Contacts/Details/ContactDetailsViewController.m
#	Riot/Modules/Contacts/Views/ContactTableViewCell.m
#	Riot/Modules/Favorites/FavouritesViewController.h
#	Riot/Modules/Favorites/FavouritesViewController.m
#	Riot/Modules/GlobalSearch/UnifiedSearchViewController.m
#	Riot/Modules/People/PeopleViewController.h
#	Riot/Modules/People/PeopleViewController.m
#	Riot/Modules/Room/ContextualMenu/ReactionsMenu/ReactionsMenuViewModel.swift
#	Riot/Modules/Room/DataSources/RoomDataSource.m
#	Riot/Modules/Room/Files/RoomFilesViewController.m
#	Riot/Modules/Room/Members/Detail/RoomMemberDetailsViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomViewController.m
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCell.swift
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroCellContentView.swift
#	Riot/Modules/Room/TimelineCells/RoomCreationIntro/RoomCreationIntroViewData.swift
#	Riot/Modules/Room/TimelineCells/RoomTimelineCellIdentifier.h
#	Riot/Modules/Rooms/RoomsViewController.h
#	Riot/Modules/Rooms/ShowDirectory/Cells/Network/DirectoryNetworkTableHeaderFooterView.swift
#	Riot/Modules/Rooms/ShowDirectory/Cells/Room/DirectoryRoomTableViewCell.swift
#	Riot/Modules/Rooms/ShowDirectory/PublicRoomsDirectoryViewModel.swift
#	Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyCoordinator.swift
#	Riot/Modules/Secrets/Recover/RecoverWithKey/SecretsRecoveryWithKeyViewController.swift
#	Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseCoordinator.swift
#	Riot/Modules/Secrets/Recover/RecoverWithPassphrase/SecretsRecoveryWithPassphraseViewController.swift
#	Riot/Modules/Secrets/Recover/SecretsRecoveryCoordinator.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewController.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModel.swift
#	Riot/Modules/SecureBackup/Setup/Intro/SecureBackupSetupIntroViewModelType.swift
#	Riot/Modules/SetPinCode/PinCodePreferences.swift
#	Riot/Modules/SetPinCode/SetupBiometrics/BiometricsAuthenticationPresenter.swift
#	Riot/Modules/Settings/Security/ManageSession/ManageSessionViewController.m
#	Riot/Modules/Settings/Security/SecurityViewController.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Modules/SplitView/SplitViewCoordinator.swift
#	Riot/Modules/SplitView/SplitViewCoordinatorType.swift
#	Riot/Modules/StartChat/StartChatViewController.m
#	Riot/Modules/TabBar/MasterTabBarController.h
#	Riot/Modules/TabBar/MasterTabBarController.m
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/HTMLFormatter.swift
#	Riot/Utils/Tools.m
#	RiotNSE/NotificationService.swift
2024-10-18 15:45:54 +02:00
Mauro Romito 12837d4b89 update license 2024-09-25 12:24:52 +02:00
Arnfried Griesert 1c0ef0ca52 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
JanNiklas Grabowski 97243bc063 Merge commit '7d18f34a75d1f41cc3bc8b6a36c0ab82ff93f0e4' into feature/4699_basis_update_element
* commit '7d18f34a75d1f41cc3bc8b6a36c0ab82ff93f0e4': (59 commits)
  finish version++
  Tidy up event formatter issues.
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.26.9](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.9)).
  Translated using Weblate (Russian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Albanian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (German)
  Translated using Weblate (Slovak)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Indonesian)
  Translated using Weblate (Estonian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (German)
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Riot/Utils/EventFormatter.m
#	fastlane/Fastfile
2023-05-11 13:19:24 +02:00
Doug 7d3efda5ef Fix voiceover order of room creation header and message composer. 2023-05-10 16:15:00 +01:00
aringenbach d8acd1f351 Fix RoomInputToolbarTextView pills flushing 2023-04-21 09:30:56 +02:00
aringenbach d28010098a Rename UserSuggestion module as CompletionSuggestion 2023-04-20 16:45:08 +02:00
aringenbach 434559488d Rename textDefaultFont to defaultFont and remove unnecessary definition in RoomInputToolbarView.h 2023-04-11 14:54:55 +02:00
aringenbach 9ea625e470 Update environment object setup and view model context wrapping to restore SwiftUI UI tests 2023-03-23 17:16:57 +01:00
aringenbach 3b9530c065 Display user suggestion list in fullscreen mode with shared context from UserSuggestionCoordinator 2023-03-23 17:16:57 +01:00
aringenbach 37a8aa5734 Update composer library to 1.3.0 and apply changes 2023-03-23 17:16:57 +01:00
aringenbach 935e61e1bb Enable user mentions in Rich Text Editor 2023-03-23 17:16:57 +01:00
Arnfried Griesert c94184f74c MESSENGER-4179 send button wrong color 2023-03-02 14:50:31 +00:00
Mauro Romito 6882f507a7 creating the coordinator for the link action view 2022-12-07 18:17:28 +01:00
Mauro Romito bf802b7b4a some pr suggestions 2022-11-09 15:40:10 +01:00
Mauro Romito 89b2ef6687 this solution looks promising 2022-11-04 04:39:22 +01:00
Mauro Romito 1dd644872c Merge branch 'develop' into mauroromito/6935_wysiwyg_placeholder 2022-10-19 21:26:38 +02:00
Mauro Romito 1fa4dab404 rich text composer placeholder text implemented using the same logic of the normal composer 2022-10-19 16:32:02 +02:00
Alfonso Grillo b3c97f63a0 Fix text view height issue 2022-10-19 10:30:20 +02:00
Mauro Romito 0e5607da2e implemented cancel, but I need to actually need to solve a problem where the previous text is not stored in case of cancel of the reply/edit 2022-10-11 20:28:57 +02:00
Mauro Romito 201e6f5a09 edit works functionally (no UI changes yet) 2022-10-10 17:44:57 +02:00
David Langley bac5b7f112 add simple formatting and maximise support for replacement toolbar 2022-10-02 09:06:06 +01:00
Yoan Pintas e5a8f1c3a0 Fix composer expansion on Start DM (#6692) 2022-09-09 09:01:04 +02:00
Yoan Pintas 8ea45ad0ce Start DM on first message (#6367)
Start DM on first message

Co-authored-by: Philippe Loriaux <philippel@element.io>
2022-09-06 14:33:32 +02:00
aringenbach 085441d133 Fix mention pills display on iOS 16 2022-09-02 16:22:17 +02:00
ismailgulek 4f71fe7e1c Revert the fix for keyboard stickiness, rename inputAccessoryView 2022-08-15 14:49:24 +03:00
ismailgulek 5db71c92c7 Remove unnecessary inputAccessoryView from room input toolbar 2022-08-12 17:55:59 +03:00
Johannes Marbach 8dab22962c Make quoting work again
Signed-off-by: Johannes Marbach <johannesm@element.io>
2022-06-21 15:49:56 +02:00
Stefan Ceriu 816ba3b249 Fix crash when opening rooms where the current user doesn't have permission to post messages. 2022-05-18 11:58:25 +03:00
aringenbach b61c8a1d97 Check nullability on attributed text 2022-05-13 17:02:56 +02:00
aringenbach ee8d7bf200 Fix composer text coloration 2022-05-13 16:40:47 +02:00
aringenbach cd05720c69 Trigger auto-correct on send 2022-05-04 17:39:54 +02:00
aringenbach 8077b8058d Fix fonts and edition on replies 2022-05-04 12:17:21 +02:00
aringenbach 286a8a1a81 Fix mention from suggestion 2022-05-03 09:14:59 +02:00
aringenbach 69c0a7d9bd Add documentation 2022-05-02 17:36:53 +02:00
aringenbach 8d65cd8a40 Enable sending messages with pills 2022-05-02 13:35:35 +02:00
Stefan Ceriu 92f633cccb Merge branch 'master' into develop 2022-02-16 12:45:06 +02:00
Doug 13a59eb845 Fix for images sometimes being sent unencrypted in an encrypted room. 2022-02-16 12:42:00 +02:00
Doug 9f94941d63 Revert "Fix for images sometimes being sent unencrypted inside an encrypted room."
This reverts commit 0dcf310d243640777b6912ba19fd4e5ddcd6f842.
2022-02-11 18:17:39 +00:00
Doug 2bbf0df9ee Fix for images sometimes being sent unencrypted inside an encrypted room. 2022-02-11 18:16:13 +00:00
aringenbach 7964d314c8 Add objective C support to SwiftGen assets helpers (#5533)
* Add objective C support to SwiftGen assets helpers

* Use dot notation in ObjC & fix minor issues

Co-authored-by: Arnaud Ringenbach <arnaud.ringenbach@niji.fr>
2022-02-10 17:13:23 +01:00
SBiOSoftWhare e8d4af46d2 Update all Objective-C MatrixKit imports to handle new location. 2021-11-30 16:09:53 +01:00
Phl-Pro 31a99e2e09 Merge branch 'develop' into phlpro/4722_objc_headers 2021-11-05 14:41:36 +01:00
Stefan Ceriu 7de0454759 vector-im/element-ios/issues/4976 - Fixed placeholder not displaying after being hidden for resize animations. 2021-10-27 10:15:57 +03:00
Philippe Loriaux 216924165d Improve the Obj-C Generated Interface Header Name definition 2021-10-26 17:42:33 +02:00
Stefan Ceriu 7576309da4 vector-im/element-ios/issues/4976 - Replaced GrowingTextView with simpler, custom implementation. Cleaned up the RoomInputToolbar header. 2021-10-26 17:41:29 +03:00
Stefan Ceriu 2d3b091d07 Fixes vector-im/element-ios/issues/5042 - Message composer doesn't follow keyboard when swiping to dismiss. 2021-10-25 16:23:58 +03:00
Doug 22ee3d03ed Allow images to be pasted from Safari rather than their URL.
Use correct type.
2021-10-18 15:22:55 +01:00
Stefan Ceriu eacbcac1d3 #1098 - Added extra top padding on first list item. Fixed various merge problems. 2021-10-13 11:46:43 +03:00
Stefan Ceriu 096279b43a #1098 - Various changes following code review. 2021-10-13 11:26:27 +03:00