Commit Graph

1439 Commits

Author SHA1 Message Date
JanNiklas Grabowski 54a0df8451 MESSENGER-5033 change OIDC Button appearance 2023-10-26 16:05:08 +02:00
JanNiklas Grabowski 32a6083ee8 MESSENGER-5033 add feature flag for OIDC login 2023-10-26 13:35:13 +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
Arnfried Griesert 064ef359aa Merge branch 'develop' into 'feature/5161_basis_update_element'
# Conflicts:
#   Podfile
2023-10-05 12:17:36 +00:00
Arnfried Griesert 8a7b1dd430 Hide IP addresses in session manager 2023-10-04 08:57:33 +02:00
Stefan Ceriu c4ff453491 Fixes #7687 - Wait for MXSession state update before proceeding with the login process 2023-10-03 13:41:24 +03:00
Arnfried Griesert fc3b5e1c1c Merged element 1.11.3 into bum 2023-09-29 05:24:53 +02:00
JanNiklas Grabowski ccaa43d929 MESSENGER-5160 change color for new wysiwyg composer menu 2023-09-28 14:07:59 +02:00
Arnfried Griesert 8d9638cdc9 MESSENGER-4807 bum assets floating button 2023-09-20 07:44:22 +00:00
Frank Rotermund 1f00c0c39b MESSENGER-4933 appversion check on login 2023-09-19 15:11:38 +02: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
Arnfried Griesert 099b861a8d MESSENGER-4951 Changed password confirmation 2023-09-15 12:13:19 +00:00
JanNiklas Grabowski 6d532fec9f MESSENGER-5133 fix crash creating a dm 2023-09-15 10:05:53 +02:00
Doug ae0c6bc2e2 Also hide session selection with OIDC in the device manager. (#7675) 2023-09-13 15:07:49 +01: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
Doug af664c38bf Hide sign out x/all buttons in the Device Manager when using OIDC. (#7674) 2023-09-12 13:46:36 +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
Frank Rotermund ce11dd47af Merge branch 'develop' into 'hotfix/v2.9.1'
# Conflicts:
#   Config/AppVersion.xcconfig
2023-09-08 08:20:37 +00:00
Frank Rotermund 4546ff4031 MESSENGER-5130 hotfix maintenance popup on missing server 2023-09-08 09:52:48 +02:00
JanNiklas Grabowski 546ebf6d81 MESSENGER 4955 disable WYSIWYG commands 2023-09-07 16:33:23 +02:00
JanNiklas Grabowski 06f94091c2 MESSENGER 5004 add oidc flag 2023-08-31 12:13:03 +02: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
Frank Rotermund a5901ea961 MESSENGER-4976 buildfix 2023-08-24 08:16:04 +02:00
Frank Rotermund bc6a2bd385 Feature/4976 fix for blocking behaviour 2023-08-23 15:13:16 +00:00
Frank Rotermund 3885b8ca97 Feature/4976 ignore blocking maintenance 2023-08-22 12:02:43 +00:00
Arnfried Griesert be9e2540a2 Change show poll history button text (patched from BwM) 2023-08-21 14:03:09 +00:00
Stefan Ceriu 102e7e9c76 Update introspect to the latest version, remove now duplicate introspectCollectionView 2023-08-21 09:58:50 +03:00
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 6dcf4ea8b6 revert '813f9ad6302d421864736a6be596093c23cf35d7' 4889_deactivate_rust_for_prod 2023-07-17 08:54:43 +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 982879c47e Feature/4889 deactivate rust for prod 2023-06-28 05:59:03 +00: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
JanNiklas Grabowski 273017eafa Feature/4772 add accessibility declaration 2023-06-14 06:14:17 +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
Alfonso Grillo db6cb5e69d Fix initial state 2023-05-29 15:19:55 +02:00