Commit Graph

688 Commits

Author SHA1 Message Date
Arnfried Griesert 3b7cac93b5 Merge branch 'feature/wrong_color_poll_history' into 'develop'
Color change

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!164
2023-07-26 11:30:23 +00:00
Arnfried Griesert aaa088a139 Color change 2023-07-21 09:34:41 +02:00
Frank Rotermund 0868f56455 MESSENGER-4484 poi participants in history 2023-07-18 11:44:35 +00:00
JanNiklas Grabowski 069209f952 merge branch 'release/v2.7.0' into develop 2023-07-11 18:41:08 +02:00
Frank Rotermund 54dc0322f0 Merge commit 'b1847a3ae552c52c06ab4934318dbdb2cf1d8c4b' into feature/4884_merge_foss_1.10.14
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
#	fastlane/.env.default
#	fastlane/Fastfile
2023-07-04 08:24:05 +02:00
JanNiklas Grabowski 4b436752af MESSENGER-4929 show participant votes button when user has voted 2023-07-03 15:27:36 +02:00
JanNiklas Grabowski 5c7998e240 Feature/4795 feature tracking matomo 2023-06-21 06:24:46 +00:00
Arnfried Griesert 08b159b675 MESSENGER-4769 color changes part 2 2023-06-20 11:32:09 +00:00
Frank Rotermund df2d409fc1 MESSENGER-4383 fix for undisclosed button visibility and small UI fixes 2023-06-14 07:45:18 +02:00
Arnfried Griesert 4fc5e366e3 Fixed additional merge issues 2023-06-12 06:08:33 +02:00
Arnfried Griesert 51e98cfe61 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Nicolas Mauri 13588db447 Implement MSC3987: Push actions clean-up 2023-06-07 09:31:42 +02:00
Frank Rotermund 5179eecaa1 Feature/4383 poll participants details 2023-05-31 14:31:07 +00:00
Frank Rotermund 260c8de584 Feature/4393 poll with visible participant p1 2023-05-25 13:52:30 +00:00
JanNiklas Grabowski 674a44b702 Merge commit '98594fd01fc18ee18fde60a45542f1b4d7040c41' into feature/4699_basis_update_element
* commit '98594fd01fc18ee18fde60a45542f1b4d7040c41': (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 33eeeebf9d Merge pull request #7536 from vector-im/aringenbach/7535_fix_partial_text_messages
Fix partial text messages not being saved for each room with RTE enabled
2023-05-05 09:29:28 +02:00
aringenbach aa71f4be2c Fix composer unit tests 2023-05-03 15:49:58 +02:00
aringenbach 2eb07ef5e0 Fix partial text messages not being saved for each room with RTE enabled 2023-05-03 14:57:36 +02:00
Nicolas Mauri 2b88e5ce68 VoiceBroadcast: Play a sound to notify the user when VB is pause due to an error. 2023-05-03 14:33:01 +02:00
Nicolas Mauri 3bd413f579 Update RiotSwiftUI/Modules/Room/PollHistory/Service/MatrixSDK/PollHistoryService.swift
Co-authored-by: Alfonso Grillo <alfogrillo@element.io>
2023-04-27 14:55:40 +02:00
Nicolas Mauri b563043b19 Fix: TimelinePoll code refactoring 2023-04-26 17:52:22 +02:00
Nicolas Mauri 782ad8465c Fix: allow to render a TimelinePoll even if the poll is loading 2023-04-26 10:14:44 +02:00
aringenbach bf0edd4657 Fix missing self in closure 2023-04-21 09:11:35 +02:00
aringenbach 0ff3052561 L10N 2023-04-20 17:09:02 +02:00
aringenbach e6f8565228 Move room admin condition to be usable in UnitTests and add tests 2023-04-20 16:45:08 +02:00
aringenbach 49388b95f3 Re-enable unit tests and fix a few lint warnings 2023-04-20 16:45:08 +02:00
aringenbach 5e879bf533 Rework CompletionSuggestionService text trigger 2023-04-20 16:45:08 +02:00
aringenbach 57b626593b Display all commands when a single slash is entered 2023-04-20 16:45:08 +02:00
aringenbach f6646f9059 Rework MXKSlashCommands to a more Swift-friendly form and use it in suggestion module 2023-04-20 16:45:08 +02:00
aringenbach 4d7a502903 Display additional command content in suggestion list 2023-04-20 16:45:08 +02:00
aringenbach 0e7d802920 Rename UserSuggestion module as CompletionSuggestion 2023-04-20 16:45:08 +02:00
aringenbach 9c172184bf Add basic slash commands support to UserSuggestion module 2023-04-20 16:45:08 +02:00
aringenbach 152ddeaf94 Fix user suggestion list item height on iOS 16+ 2023-04-17 14:44:17 +02:00
aringenbach 90217755a9 Merge branch 'develop' into aringenbach/enable_rte_user_mentions 2023-04-11 14:21:31 +02:00
Arnfried Griesert 3736b8c9fd Merged element 1.10.9 into bum 2023-04-11 11:46:44 +02:00
Doug ce38148c2d Add user suggestions for @room. (#7453) 2023-03-28 14:03:39 +01:00
aringenbach fb9717599d Bump composer version to 1.4.0 2023-03-23 17:16:57 +01:00
aringenbach 24a1ce547b Update environment object setup and view model context wrapping to restore SwiftUI UI tests 2023-03-23 17:16:57 +01:00
aringenbach f7dbc738af Allow displaying UserSuggestionList without shadow 2023-03-23 17:16:57 +01:00
aringenbach 52594087a2 Display user suggestion list in fullscreen mode with shared context from UserSuggestionCoordinator 2023-03-23 17:16:57 +01:00
aringenbach 3db15471ee Enable user mentions in Rich Text Editor 2023-03-23 17:16:57 +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
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
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
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
Doug 56f2ff19b7 Merge branch 'master' into develop 2023-02-10 13:39:22 +00:00