Commit Graph

1737 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
Arnfried Griesert 1a561f83c2 Merge branch 'feature/devicemanager_verify_button_color' into develop 2023-05-04 08:43:24 +02:00
Arnfried Griesert d933051135 Changed font color for device verification button 2023-05-04 06:57:32 +02:00
Arnfried Griesert c59742d8ee Feature/4519 voice over texte secure textfield 2023-05-03 04:42:05 +00:00
Frank Rotermund c7f63004b6 Merge branch 'feature/4516_device_manager_anpassungen' into 'develop'
MESSENGER-4516 device manager anpassungen

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!121
2023-04-28 06:28:48 +00:00
Arnfried Griesert d9f9798643 MESSENGER-4516 device manager anpassungen 2023-04-28 06:28:47 +00:00
Arnfried Griesert e3b3950e67 MESSENGER-4299 Neues design Recovery Key Eingabefeld 2023-04-28 06:11:34 +00:00
JanNiklas Grabowski e958fa574e MESSENGER-4272 add advertizement button 2023-04-27 05:54:49 +00: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
Hugh Nimmo-Smith 8caad979d7 Support for MSC3906 v2 (#7407) 2023-04-01 11:56:56 -04: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
Andy Uhnak ef31ad428b Revert "Merge pull request #7430 from vector-im/andy/user_trust"
This reverts commit 7f5d3b46eb02a7801d4a7c781762eea3d16ee0e6, reversing
changes made to 5a3adde8f70daec795ac1bee17c5159a155c6106.
2023-03-22 15:57:25 +00:00
Arnfried Griesert 57de18502d merged basis update 1_10_5 into develop 2023-03-21 07:52:11 +01:00
Arnfried Griesert c61ddcf39a Fixed merge conflicts 2023-03-20 07:33:28 +01:00
JanNiklas Grabowski cf1317452e MESSENGER-4407 fixes from testprotocol 2023-03-16 16:45:48 +01:00
Andy Uhnak db771d2508 Refactor encryption trust level 2023-03-16 14:56:50 +00: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
Andy Uhnak 02413968e0 Update startup progress UX 2023-03-10 09:40:48 +00:00
Arnfried Griesert 89f8644abc MESSENGER-3157 third notification settings option 2023-03-07 13:28:09 +00:00
JanNiklas Grabowski 7ff2ab0da3 Feature/4231 change icon new loginflow 2023-03-07 13:05:50 +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
Nicolas Mauri 72bbf08dc3 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
Arnfried Griesert c94184f74c MESSENGER-4179 send button wrong color 2023-03-02 14:50:31 +00:00
Arnfried Griesert b1c85b9a24 Merge branch 'feature/4231_add_new_loginflow' into 'develop'
MESSENGER-4231 add new loginflow

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!98
2023-03-02 13:09:34 +00:00
Flescio c7d6dd25a2 Location centring user's sharing location (#7398)
* fix issue on timeline bubbles not showing proper content after decrypt

* fix location sharing centring to other users

* Update RiotSwiftUI/Modules/LocationSharing/LiveLocationSharingViewer/LiveLocationSharingViewerViewModel.swift

Co-authored-by: Alfonso Grillo <alfogrillo@element.io>

---------

Co-authored-by: Alfonso Grillo <alfogrillo@element.io>
2023-03-02 11:28:00 +01:00
JanNiklas Grabowski fdafc1f2bf MESSENGER-4231 add new loginflow 2023-02-28 18:06:13 +01: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
Arnfried Griesert dd425c79e0 MESSENGER-3948 show hide login password 2023-02-24 12:01:55 +00:00
Arnfried Griesert 00222176c7 MESSENGER-4093 scan permalinks as qr 2023-02-23 06:50:16 +00:00
Flescio 95501bfdde Show own location in map views (#7375)
* show own location on static sharing

* show own location on live sharing

* add tests and changelog

* check location authorisation, fix center to current user location button

* it moves request to LocationManager in proper service

* add static location viewer service
2023-02-20 18:07:03 +01:00
Hugh Nimmo-Smith d15131e9ba Support for v2 of MSC3903 (#7372) 2023-02-15 14:02:33 +00: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
Flescio d461349e00 Apply (polls) push rules client side for encrypted rooms (#7356)
* managing dont notify push rule

* private extension for push rule

* remove mentions and keyword notice footer
2023-02-13 11:13:59 +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
Frank Rotermund 91a837268f MESSENGER-3895 Fix presentation of two alerts 2023-02-13 08:08:52 +01:00
Doug a46d884b05 Merge branch 'master' into develop 2023-02-10 13:39:22 +00:00
JanNiklas Grabowski eae05b3093 MESSENGER-4235 - location sharing without gps 2023-02-09 17:50:33 +01:00
Andy Uhnak d203630795 Fix some crashes 2023-02-09 08:44:31 +00:00
Arnfried Griesert d7a23d53dc MESSENGER-3895 qr code login 2023-02-08 12:19:07 +00:00
Alfonso Grillo 30a875396e Add TimelinePollMessageView 2023-02-08 11:14:10 +01:00