Commit Graph

1853 Commits

Author SHA1 Message Date
Arnfried Griesert c2d44580e4 Merge branch 'develop' into 'feature/5161_basis_update_element'
# Conflicts:
#   Podfile
2023-10-05 12:17:36 +00:00
Arnfried Griesert 20ed25468c Hide IP addresses in session manager 2023-10-04 08:57:33 +02:00
Stefan Ceriu 24480b8a22 Fixes #7687 - Wait for MXSession state update before proceeding with the login process 2023-10-03 13:41:24 +03:00
Arnfried Griesert 3c2c021287 Merged element 1.11.3 into bum 2023-09-29 05:24:53 +02:00
JanNiklas Grabowski 0c1f401eb7 MESSENGER-5160 change color for new wysiwyg composer menu 2023-09-28 14:07:59 +02:00
Arnfried Griesert c4d1baaaf5 MESSENGER-4807 bum assets floating button 2023-09-20 07:44:22 +00:00
Frank Rotermund 360af19182 MESSENGER-4933 appversion check on login 2023-09-19 15:11:38 +02: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
Arnfried Griesert 667266e93c MESSENGER-4951 Changed password confirmation 2023-09-15 12:13:19 +00:00
JanNiklas Grabowski a694a20405 MESSENGER-5133 fix crash creating a dm 2023-09-15 10:05:53 +02:00
Doug 8f0580ca7e Also hide session selection with OIDC in the device manager. (#7675) 2023-09-13 15:07:49 +01: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
Doug a7c8905b10 Hide sign out x/all buttons in the Device Manager when using OIDC. (#7674) 2023-09-12 13:46:36 +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
Frank Rotermund 3b43285b26 Merge branch 'develop' into 'hotfix/v2.9.1'
# Conflicts:
#   Config/AppVersion.xcconfig
2023-09-08 08:20:37 +00:00
Frank Rotermund e66f865137 MESSENGER-5130 hotfix maintenance popup on missing server 2023-09-08 09:52:48 +02:00
JanNiklas Grabowski a8b759b63b MESSENGER 4955 disable WYSIWYG commands 2023-09-07 16:33:23 +02:00
JanNiklas Grabowski d4ab5f4bad MESSENGER 5004 add oidc flag 2023-08-31 12:13:03 +02: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
Mauro Romito 2a7e0562f1 code improvement 2023-08-25 19:39:55 +02:00
Mauro Romito 2b93d8f03a fix 7646 2023-08-25 17:22:11 +02:00
Frank Rotermund 7145c35e5d MESSENGER-4976 buildfix 2023-08-24 08:16:04 +02:00
Frank Rotermund 15ca136b4e Feature/4976 fix for blocking behaviour 2023-08-23 15:13:16 +00:00
Frank Rotermund 31f70e749f Feature/4976 ignore blocking maintenance 2023-08-22 12:02:43 +00:00
Arnfried Griesert d350335c7b Change show poll history button text (patched from BwM) 2023-08-21 14:03:09 +00:00
Stefan Ceriu 225b620f12 Update introspect to the latest version, remove now duplicate introspectCollectionView 2023-08-21 09:58:50 +03:00
Arnfried Griesert 44a6360469 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 aa2d6143d5 Color change 2023-07-21 09:34:41 +02:00
Frank Rotermund dc5198f5d9 MESSENGER-4484 poi participants in history 2023-07-18 11:44:35 +00:00
JanNiklas Grabowski 485f944c6c revert '5bc3255dfe7b0a56aa3ce4b8056015b438653fed' 4889_deactivate_rust_for_prod 2023-07-17 08:54:43 +00:00
JanNiklas Grabowski 7db295ed18 merge branch 'release/v2.7.0' into develop 2023-07-11 18:41:08 +02:00
Frank Rotermund 242e35fdc7 Merge commit 'ab5f501c2daf60d26f41b1a15d7e97bfe5679228' 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 df66eda9fa MESSENGER-4929 show participant votes button when user has voted 2023-07-03 15:27:36 +02:00
JanNiklas Grabowski a22c234e82 Feature/4889 deactivate rust for prod 2023-06-28 05:59:03 +00:00
JanNiklas Grabowski 27723fa953 Feature/4795 feature tracking matomo 2023-06-21 06:24:46 +00:00
Arnfried Griesert 6d38c5fe24 MESSENGER-4769 color changes part 2 2023-06-20 11:32:09 +00:00
JanNiklas Grabowski f8348a66d0 Feature/4772 add accessibility declaration 2023-06-14 06:14:17 +00:00
Frank Rotermund 5d1dd60c24 MESSENGER-4383 fix for undisclosed button visibility and small UI fixes 2023-06-14 07:45:18 +02:00
Arnfried Griesert b4f6992e56 Fixed additional merge issues 2023-06-12 06:08:33 +02:00
Arnfried Griesert 1c0ef0ca52 merged element 1.10.12 into bum 2023-06-07 15:45:59 +02:00
Nicolas Mauri c53d4961c9 Implement MSC3987: Push actions clean-up 2023-06-07 09:31:42 +02:00
Frank Rotermund 9bd569dac0 Feature/4383 poll participants details 2023-05-31 14:31:07 +00:00
Alfonso Grillo 955d9ef1f2 Fix initial state 2023-05-29 15:19:55 +02:00
Alfonso Grillo 235f324eaa Handle offline issue in UserSessionsDataProvider 2023-05-29 14:52:38 +02: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