Commit Graph

5532 Commits

Author SHA1 Message Date
JanNiklas Grabowski 5aa841d45f MESSENGER 5236 remove grey green and red shield for room and user avatar 2023-10-27 14:37:22 +02:00
Arnfried Griesert 67f2801417 Merge branch 'master' into feature/5254_merge_element_into_bum
# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile
2023-10-22 18:57:22 +02:00
JanNiklas Grabowski 7c7d7a77d2 MESSENGER-4956 matomo add decryption error information 2023-10-16 18:55:56 +02:00
JanNiklas Grabowski 74563978ff Merge branch 'feature/4821_matomo_add_dimension_for_decryption_errors' into 'develop'
Feature/4821 matomo add dimension for decryption errors

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!230
2023-10-12 08:55:17 +00:00
Frank Rotermund fa74ac3af7 Merge branch 'hotfix/v2.10.1' into develop
# Conflicts:
#	Config/AppVersion.xcconfig
2023-10-12 07:40:20 +02:00
Frank Rotermund 62035b1ff5 MESSENGER-3811 hotfix 2.10.1 crash on mdm 2023-10-11 16:08:10 +02:00
JanNiklas Grabowski 4a7827792a MESSENGER-4821 add dimension for decryption error tracking 2023-10-11 15:07:07 +02:00
Arnfried Griesert f8672a9b39 Merge branch 'feature/4433_content_scanner_upload' into 'develop'
MESSENGER-4433 content scanner upload

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!229
2023-10-10 12:33:47 +00:00
Arnfried Griesert 8f73166745 Fixed retry buttons text and image color 2023-10-10 06:57:03 +02:00
Arnfried Griesert 064ef359aa Merge branch 'develop' into 'feature/5161_basis_update_element'
# Conflicts:
#   Podfile
2023-10-05 12:17:36 +00:00
Alfonso Grillo 273f486ca0 Fix DM crash with RTE enabled 2023-10-03 17:11:32 +02:00
JanNiklas Grabowski 14abd996ed MESSENGER-5159 update chat overview on hiding notes room 2023-09-29 12:33:10 +02:00
Arnfried Griesert fc3b5e1c1c Merged element 1.11.3 into bum 2023-09-29 05:24:53 +02:00
JanNiklas Grabowski d3b2d59c1c MESSENGER-5160 disable quote function temporary 2023-09-28 12:21:46 +02:00
Doug 2ef93c79b9 Allow the use of Jitsi for 1:1 calls via the client well-known. 2023-09-28 10:01:57 +01:00
Arnfried Griesert 8d9638cdc9 MESSENGER-4807 bum assets floating button 2023-09-20 07:44:22 +00:00
Frank Rotermund 251f40b3c7 Merge branch 'feature/3811_appconfig' into 'develop'
Feature/3811 appconfig

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!218
2023-09-19 11:21:12 +00:00
Frank Rotermund 0856be5c2d Feature/3811 appconfig 2023-09-19 11:21:12 +00:00
JanNiklas Grabowski 35c7ebade7 MESSENGER-4751 add feature flag 2023-09-18 17:54:49 +02:00
JanNiklas Grabowski 624edfb413 MESSENGER-4751 use privacy url of well known 2023-09-18 14:37:34 +02:00
JanNiklas Grabowski 9451100f2f MESSENGER-5017 translate voice message cancel text 2023-09-15 14:41:58 +02:00
JanNiklas Grabowski 2866d841e3 MESSENGER-4857 translate invalid password message 2023-09-15 11:35:08 +02:00
Frank Rotermund 5aa24d270b Merge branch 'feature/4730_personal_notes_visibilty' into 'develop'
MESSENGER-4730 personal notes visibility old style

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!204
2023-09-15 07:39:41 +00:00
Frank Rotermund 7351d7dc48 MESSENGER-4730 personal notes visibility old style 2023-09-15 07:39:41 +00:00
Hugh Nimmo-Smith 13b7d11007 Use ASWebAuthenticationSession to display OIDC account management URL (#7671)
Co-authored-by: Doug <douglase@element.io>
2023-09-12 18:05:52 +01:00
Hugh Nimmo-Smith d77bbfb771 Hide phone number and explanation if homeserver doesn't have 3pid capability enabled (#7670) 2023-09-08 17:16:58 +01:00
JanNiklas Grabowski 8e5e6cadea Merge branch 'feature/4955_disable_wysiwyg_commands' into 'develop'
MESSENGER 4955 disable WYSIWYG commands

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!206
2023-09-08 13:46:34 +00:00
Arnfried Griesert 89ca89f325 Merge branch 'feature/4807_new_add_room_menu' into 'develop'
MESSENGER-4807 new add room menu

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!202
2023-09-08 06:41:41 +00:00
Arnfried Griesert 031cd87084 MESSENGER-4807 new add room menu 2023-09-08 06:41:40 +00:00
JanNiklas Grabowski 546ebf6d81 MESSENGER 4955 disable WYSIWYG commands 2023-09-07 16:33:23 +02:00
Frank Rotermund d27b5d8da9 MESSENGER-4802 personal notes in favorites 2023-09-07 12:53:46 +00:00
JanNiklas Grabowski 581be7471b Merge branch 'feature/4941_beta_features' into 'develop'
MESSENGER 4941 add and remove beta features

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!201
2023-09-07 12:35:41 +00:00
Arnfried Griesert 6ec9a9f7b3 MESSENGER-4806 new room filter behaviour 2023-09-06 13:07:19 +00:00
JanNiklas Grabowski b3a625d39f MESSENGER 4941 remove old feature flags 2023-09-06 14:29:58 +02:00
JanNiklas Grabowski 6f8dcb658a MESSENGER 4941 remove old feature flags and activate WYSIWYG 2023-09-06 13:21:23 +02:00
Nicolas Mauri 6ce5bcbbfa Fix event forwarding 2023-09-04 17:24:34 +02:00
JanNiklas Grabowski 3bf84ec102 Merge branch 'develop' into 'feature/5004_basis_update_element'
# Conflicts:
#   Podfile
2023-09-04 14:03:03 +00:00
Frank Rotermund 4dd93e8a34 Merge branch 'release/v2.9.0' into 'develop'
MESSENGER-5047 Release Bundesmessenger

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!197
2023-09-04 07:58:13 +00:00
Frank Rotermund 16831653f0 MESSENGER-5047 Release Bundesmessenger 2023-09-01 14:50:43 +02:00
JanNiklas Grabowski 06f94091c2 MESSENGER 5004 add oidc flag 2023-08-31 12:13:03 +02:00
Arnfried Griesert ac94428b11 MESSENGER-4704 UI Optimierungen Raumübersicht 2023-08-30 12:34:58 +00:00
JanNiklas Grabowski e1cc2acee9 Merge commit '54e21b37ba45c40531100a98d16e7b1f35b129cd' into feature/5004_basis_update_element
* commit '54e21b37ba45c40531100a98d16e7b1f35b129cd': (40 commits)
  finish version++
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.1](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.1)).
  completed
  code improvement
  fix 7646
  opening the safari web view externally so that it will be able to share the cookies
  web view opened on tap + changelog
  added the cell, now I just need to implement the navigation to the web view
  completed
  Hide deactivate account if the auth property is present on the WK.
  Add changelogs
  Prevent mention crashes when room members are missing display names (objc interop)
  Prevent pill crashes when room members are missing display names (objc interop)
  Update introspect to the latest version, remove now duplicate `introspectCollectionView`
  Prepare for new sprint
  finish version++
  Add missing changelog entry.
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.0)).
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Riot.xcodeproj/xcshareddata/xcschemes/Riot.xcscheme
#	Riot/Modules/SecureBackup/Setup/SecureBackupSetupCoordinator.swift
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/target.yml
2023-08-29 17:00:19 +02:00
Mauro Romito be289a3790 completed 2023-08-28 12:20:26 +02:00
Mauro Romito fbd0793b6f code improvement 2023-08-25 19:39:55 +02:00
Mauro Romito 1126891fea fix 7646 2023-08-25 17:22:11 +02:00
Mauro eea96bc151 Merge pull request #7656 from vector-im/mauroromito/account_management_cell_for_oidc
Manage account through MAS if available
2023-08-25 13:46:15 +02:00
Mauro Romito cb34eaf6c6 opening the safari web view externally so that it will be able to share the cookies 2023-08-25 13:02:06 +02:00
Mauro Romito f42e1a38fa web view opened on tap + changelog 2023-08-25 12:21:38 +02:00
Mauro 2dbf2247e9 Merge pull request #7655 from vector-im/mauroromito/hide_email_according_to_3pid_changes
Hide Add Email UI according to the 3 pid changes capability
2023-08-25 09:24:58 +02:00
Mauro Romito 4c51c952c4 added the cell, now I just need to implement the navigation to the web view 2023-08-24 19:15:12 +02:00