Commit Graph

19678 Commits

Author SHA1 Message Date
Frank Rotermund 725eba300f MESSENGER-5071 use ios8601 for maintenance 2023-08-29 07:57:07 +02:00
Mauro 8fa817ccb5 Merge pull request #7658 from vector-im/mauroromito/oidc_redirect_logout_confirmation_dialogues
Sign out through MAS redirect confirmation alerts
2023-08-28 13:18:21 +02:00
Mauro Romito be289a3790 completed 2023-08-28 12:20:26 +02:00
Arnfried Griesert cd562db3bc Merge branch 'feature/fix_huddle_power_levels' into 'develop'
Feature/fix huddle power levels

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!189
2023-08-28 08:43:51 +00:00
Arnfried Griesert 17ca81e5ec Feature/fix huddle power levels 2023-08-28 08:43:51 +00:00
Mauro 30c91a27a2 Merge pull request #7657 from vector-im/mauroromito/mas_device_logout
Open MAS Web page when logging out from other sessions on OIDC authenticated homeservers
2023-08-28 10:05:02 +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
Mauro 2338747d94 Merge pull request #7654 from vector-im/mauroromito/7648_hide_deactivation_for_oidc
Hide deactivate account if the auth property is present on the WK.
2023-08-24 18:36:41 +02:00
Mauro Romito e718c0400e completed 2023-08-24 17:53:48 +02:00
Mauro Romito 4ddafd63ee Hide deactivate account if the auth property is present on the WK. 2023-08-24 17:18:13 +02:00
Frank Rotermund 09564efc41 Merge branch 'feature/4976_cache_policy' into 'develop'
MESSENGER-4976 dont cache maintenance

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!188
2023-08-24 09:54:42 +00:00
Frank Rotermund e6d3fbf404 MESSENGER-4976 dont cache maintenance 2023-08-24 11:53:32 +02:00
Frank Rotermund 26bcbdd029 Merge branch 'feature/changed_sdk_version_in_podfile' into 'develop'
Feature/changed sdk version in podfile to v2.9.0_rc1

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!187
2023-08-24 07:37:36 +00:00
Arnfried Griesert 0de12cae1f Feature/changed sdk version in podfile to v2.9.0_rc1 2023-08-24 07:37:36 +00:00
Frank Rotermund 49a9085a65 Merge branch 'feature/4976_buildfix' into 'develop'
MESSENGER-4976 buildfix

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!186
2023-08-24 06:44:12 +00:00
Frank Rotermund a5901ea961 MESSENGER-4976 buildfix 2023-08-24 08:16:04 +02:00
Frank Rotermund feb9ab3c9f Merge branch 'feature/4976_fix_for_blocking_behaviour' into 'develop'
Feature/4976 fix for blocking behaviour

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!185
2023-08-23 15:13:16 +00:00
Frank Rotermund bc6a2bd385 Feature/4976 fix for blocking behaviour 2023-08-23 15:13:16 +00:00
Stefan Ceriu 15bbe0dc1a Merge pull request #7649 from vector-im/stefan/variousBugFixes
Various bug fixes
2023-08-23 16:03:07 +03:00
Stefan Ceriu 332b152cdf Add changelogs 2023-08-23 16:02:04 +03:00
Frank Rotermund 489ea39535 Merge branch 'feature/4976_ignore_blocking_maintenance' into 'develop'
Feature/4976 ignore blocking maintenance

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!183
2023-08-22 12:02:43 +00:00
Frank Rotermund 3885b8ca97 Feature/4976 ignore blocking maintenance 2023-08-22 12:02:43 +00:00
Arnfried Griesert cd08a4f3ef Merge branch 'feature/4549_stricter_url_check_location_sharing' into 'develop'
MESSENGER-4549 strict check for mapstyle url

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!184
2023-08-22 08:38:31 +00:00
Arnfried Griesert 1ee6408958 Merge branch 'feature/4966_color_changes' into 'develop'
MESSENGER-4966 color changes login flow and all chat

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!174
2023-08-22 08:35:29 +00:00
JanNiklas Grabowski 0095c41ee4 MESSENGER-4966 color changes login flow and all chat 2023-08-22 08:35:28 +00:00
Frank Rotermund ce6c915647 MESSENGER-4549 strict check for mapstyle url 2023-08-22 08:10:13 +02:00
Frank Rotermund 30ca54a025 Merge branch 'feature/5035_dont_reset_element_call_permissions' into 'develop'
MESSENGER-5035 Don't reset element call permissions

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!181
2023-08-21 14:03:28 +00:00
Arnfried Griesert 7958658ce9 MESSENGER-5035 Don't reset element call permissions 2023-08-21 14:03:28 +00:00
Frank Rotermund 8938b080f4 Merge branch 'feature/change_show_poll_history_button_text' into 'develop'
Change show poll history button text (patched from BwM)

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!182
2023-08-21 14:03:09 +00:00
Arnfried Griesert be9e2540a2 Change show poll history button text (patched from BwM) 2023-08-21 14:03:09 +00:00
Stefan Ceriu 382da2147b Prevent mention crashes when room members are missing display names (objc interop) 2023-08-21 14:46:09 +03:00
Stefan Ceriu e2676c4637 Prevent pill crashes when room members are missing display names (objc interop) 2023-08-21 10:03:23 +03:00
Stefan Ceriu 102e7e9c76 Update introspect to the latest version, remove now duplicate introspectCollectionView 2023-08-21 09:58:50 +03:00
Frank Rotermund 467d0dac7f Merge branch 'feature/5076_changed_config' into 'develop'
MESSENGER-5076 added new hash

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!180
2023-08-21 06:53:13 +00:00
Arnfried Griesert 4ec1b19958 MESSENGER-5076 added new hash 2023-08-21 06:53:12 +00:00
Arnfried Griesert cf477301ba Merge branch master into develop 2023-08-17 10:59:17 +02:00
Arnfried Griesert 2f207091db Patched hotfix changes from bum into hotfix branch 5068_hide_room_display_in_notifications 2023-08-17 10:21:13 +02:00
Arnfried Griesert 0660b320bc Merge branch 'feature/4549_location_sharing_bum' into 'develop'
MESSENGER-4549 Enable locationsharing per default when there is an url in well-known

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!176
2023-08-16 14:53:56 +00:00
Arnfried Griesert 5e0c51dff8 Merge branch 'feature/5067_changed_config' into 'develop'
MESSENGER-5067 added new hash

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!177
2023-08-16 14:37:23 +00:00
Arnfried Griesert b7df4789e4 MESSENGER-5067 added new hash 2023-08-16 14:37:23 +00:00
Frank Rotermund a89785fd0d MESSENGER-4549 Enable locationsharing per default when there is an url in well-known 2023-08-16 08:37:15 +02:00
Doug 71d394ff61 Prepare for new sprint 2023-08-15 11:10:01 +01:00
Doug 6f0e6f40b6 Merge branch 'master' into develop 2023-08-15 11:10:00 +01:00
Doug 3f1950be01 Merge branch 'release/1.11.0/master' 2023-08-15 11:09:55 +01:00