Commit Graph

9828 Commits

Author SHA1 Message Date
JanNiklas Grabowski c6c874cf43 Merge branch 'develop' into 'feature/5203_us01_add_federation_room_overview'
# Conflicts:
#   Config/BWIBuildSettings.swift
2023-11-02 14:55:09 +00:00
JanNiklas Grabowski a213954135 MESSENGER-5203 add federation to lab settings and refactor 2023-11-02 15:35:25 +01:00
JanNiklas Grabowski be45b997da Merge branch 'feature/5236_remove_grey_shield' into 'develop'
MESSENGER 5236 remove grey green and red shield for room and user avatar

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!243
2023-11-02 12:01:58 +00:00
JanNiklas Grabowski 5f5aa69a73 MESSENGER-5203 add federation icon to tableview cell 2023-10-31 17:10:22 +01:00
Frank Rotermund 75ad20833b Merge branch 'release/v2.11.0' into develop
# Conflicts:
#	Podfile
2023-10-27 18:21:24 +02:00
JanNiklas Grabowski 2d07813bdc set imageview hidden 2023-10-27 15:22:25 +02:00
JanNiklas Grabowski 628d420dd9 MESSENGER 5236 remove grey green and red shield for room and user avatar 2023-10-27 14:37:22 +02:00
Frank Rotermund e98e1b2195 MESSENGER-5252 releaseprep 2023-10-27 13:59:03 +02:00
Arnfried Griesert 54aca03fc4 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 430342eba0 MESSENGER-4956 matomo add decryption error information 2023-10-16 18:55:56 +02:00
JanNiklas Grabowski e9ddd4733b 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 41761ec280 Merge branch 'hotfix/v2.10.1' into develop
# Conflicts:
#	Config/AppVersion.xcconfig
2023-10-12 07:40:20 +02:00
Frank Rotermund f9e7278c54 MESSENGER-3811 hotfix 2.10.1 crash on mdm 2023-10-11 16:08:10 +02:00
JanNiklas Grabowski 77705a42ae MESSENGER-4821 add dimension for decryption error tracking 2023-10-11 15:07:07 +02:00
Arnfried Griesert 7312ad09ad 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 f5d7597547 Fixed retry buttons text and image color 2023-10-10 06:57:03 +02:00
Arnfried Griesert c2d44580e4 Merge branch 'develop' into 'feature/5161_basis_update_element'
# Conflicts:
#   Podfile
2023-10-05 12:17:36 +00:00
Alfonso Grillo 7612d82f8e Fix DM crash with RTE enabled 2023-10-03 17:11:32 +02:00
JanNiklas Grabowski 27f73a06c9 MESSENGER-5159 update chat overview on hiding notes room 2023-09-29 12:33:10 +02:00
Arnfried Griesert 3c2c021287 Merged element 1.11.3 into bum 2023-09-29 05:24:53 +02:00
JanNiklas Grabowski 90f0349e2f MESSENGER-5160 disable quote function temporary 2023-09-28 12:21:46 +02:00
Doug 80bed39d2c Allow the use of Jitsi for 1:1 calls via the client well-known. 2023-09-28 10:01:57 +01:00
Arnfried Griesert c4d1baaaf5 MESSENGER-4807 bum assets floating button 2023-09-20 07:44:22 +00:00
Frank Rotermund 738512711d 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 5dd5dc2db7 Feature/3811 appconfig 2023-09-19 11:21:12 +00:00
JanNiklas Grabowski 7f61eab4da MESSENGER-4751 add feature flag 2023-09-18 17:54:49 +02:00
JanNiklas Grabowski 043d277563 MESSENGER-4751 use privacy url of well known 2023-09-18 14:37:34 +02:00
JanNiklas Grabowski 22f6a85c04 MESSENGER-5017 translate voice message cancel text 2023-09-15 14:41:58 +02:00
JanNiklas Grabowski 0f3a48e414 MESSENGER-4857 translate invalid password message 2023-09-15 11:35:08 +02:00
Frank Rotermund 9a99402181 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 6a83893e3a MESSENGER-4730 personal notes visibility old style 2023-09-15 07:39:41 +00:00
Hugh Nimmo-Smith dde602beac 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 8c85663c3c Hide phone number and explanation if homeserver doesn't have 3pid capability enabled (#7670) 2023-09-08 17:16:58 +01:00
JanNiklas Grabowski fdca2da2fa 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 63f7078771 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 53c675638d MESSENGER-4807 new add room menu 2023-09-08 06:41:40 +00:00
JanNiklas Grabowski a8b759b63b MESSENGER 4955 disable WYSIWYG commands 2023-09-07 16:33:23 +02:00
Frank Rotermund 6b0df6aa2f MESSENGER-4802 personal notes in favorites 2023-09-07 12:53:46 +00:00
JanNiklas Grabowski c16bc6da5f 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 ab949d8277 MESSENGER-4806 new room filter behaviour 2023-09-06 13:07:19 +00:00
JanNiklas Grabowski cd38534dc7 MESSENGER 4941 remove old feature flags 2023-09-06 14:29:58 +02:00
JanNiklas Grabowski 99f0a3ff9b MESSENGER 4941 remove old feature flags and activate WYSIWYG 2023-09-06 13:21:23 +02:00
Nicolas Mauri 48f8ed8593 Fix event forwarding 2023-09-04 17:24:34 +02:00
JanNiklas Grabowski 92c60bb4e5 Merge branch 'develop' into 'feature/5004_basis_update_element'
# Conflicts:
#   Podfile
2023-09-04 14:03:03 +00:00
Frank Rotermund 878ac0b6bc 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 9f476f693f MESSENGER-5047 Release Bundesmessenger 2023-09-01 14:50:43 +02:00
JanNiklas Grabowski d4ab5f4bad MESSENGER 5004 add oidc flag 2023-08-31 12:13:03 +02:00
Arnfried Griesert 7f4c310ecd MESSENGER-4704 UI Optimierungen Raumübersicht 2023-08-30 12:34:58 +00:00
JanNiklas Grabowski ccdbd400d2 Merge commit 'f6b85b8f9a0b4ce162616e79045fb015a21b27da' into feature/5004_basis_update_element
* commit 'f6b85b8f9a0b4ce162616e79045fb015a21b27da': (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 d1445fc698 completed 2023-08-28 12:20:26 +02:00