Commit Graph

815 Commits

Author SHA1 Message Date
Frank Rotermund 9bd569dac0 Feature/4383 poll participants details 2023-05-31 14:31:07 +00:00
Frank Rotermund 902b529245 Feature/4393 poll with visible participant p1 2023-05-25 13:52:30 +00: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
aringenbach 5036c845ac Fix user suggestion list item height on iOS 16+ 2023-04-17 14:44:17 +02:00
aringenbach 38ae3cd3a8 Merge branch 'develop' into aringenbach/enable_rte_user_mentions 2023-04-11 14:21:31 +02:00
Arnfried Griesert 6068b228a7 Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
Doug 669481d907 Add user suggestions for @room. (#7453) 2023-03-28 14:03:39 +01:00
aringenbach c59701e5b9 Bump composer version to 1.4.0 2023-03-23 17:16:57 +01: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 0c061edf60 Allow displaying UserSuggestionList without shadow 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 935e61e1bb Enable user mentions in Rich Text Editor 2023-03-23 17:16:57 +01: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
Arnfried Griesert 89f8644abc MESSENGER-3157 third notification settings option 2023-03-07 13:28:09 +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
Arnfried Griesert c94184f74c MESSENGER-4179 send button wrong color 2023-03-02 14:50:31 +00: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
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
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
Doug a46d884b05 Merge branch 'master' into develop 2023-02-10 13:39:22 +00:00
Andy Uhnak d203630795 Fix some crashes 2023-02-09 08:44:31 +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
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
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
Flavio Alescio 30daef4be1 removed view from viewModel 2023-02-01 12:41:05 +01:00
Flavio Alescio 5946ffb8e2 fix embedding pattern 2023-02-01 11:15:22 +01:00
Flavio Alescio 638e62908f Merge commit '2aaef072e4a2cdae4e49c801136613292c6e292d' into flescio/1040-poll_detail 2023-02-01 10:13:28 +01:00
aringenbach 5e167bb0ef 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 bb5f9f1c82 Merge commit '54602b63ec29ec85322e7942359969b34ab8605a' into flescio/1040-poll_detail 2023-01-31 16:03:49 +01:00
Flavio Alescio 2f51f66d5e code restyle for poll detail 2023-01-31 16:03:38 +01:00
Nicolas Mauri 1c46eb8b76 Improve error handling during a voice broadcast playback 2023-01-31 11:16:59 +01:00
Nicolas Mauri b5fe01c5fe 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
aringenbach c1968451bb Labs: Rich text editor: enable list items indentation 2023-01-30 15:38:56 +01:00
Flavio Alescio 9d0f5c208b added alert to show possible error, improved tests 2023-01-27 17:10:16 +01:00
Flavio Alescio f0f56c0b69 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
Flavio Alescio 5ea70aacd8 added view in timeline action, added tests 2023-01-27 15:07:32 +01:00
Alfonso Grillo a9f12947d4 Use Calendar to compute target dates 2023-01-26 15:16:48 +01:00
Alfonso Grillo a83075f2f3 Fix alert presentation 2023-01-26 14:52:33 +01:00
Alfonso Grillo 10e10dccb4 Improve tests 2023-01-26 10:29:30 +01:00
Alfonso Grillo 694112e6de Cleanup unused code 2023-01-26 10:14:26 +01:00
Alfonso Grillo f280692d49 Improve error handling 2023-01-26 10:09:47 +01:00
Alfonso Grillo a6aec43601 Refine timestamp logics 2023-01-26 10:09:28 +01:00
Alfonso Grillo a1ae97fa73 Add UTs 2023-01-25 20:16:24 +01:00
Alfonso Grillo 838bdc0629 Add ui tests 2023-01-25 19:58:02 +01:00
Alfonso Grillo 544c505197 Add more MockPollHistoryScreenState cases 2023-01-25 19:41:48 +01:00
Alfonso Grillo bbf7bad5c3 Improve MockPollHistoryScreenState 2023-01-25 19:21:56 +01:00
Alfonso Grillo 7494eb66e5 Add alert on error 2023-01-25 18:40:09 +01:00