6ec9a9f7b3
MESSENGER-4806 new room filter behaviour
2023-09-06 13:07:19 +00:00
3bf84ec102
Merge branch 'develop' into 'feature/5004_basis_update_element'
...
# Conflicts:
# Podfile
2023-09-04 14:03:03 +00:00
d2f239f5b2
MESSENGER 5004 update SDK Tag
2023-09-04 16:02:46 +02:00
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
16831653f0
MESSENGER-5047 Release Bundesmessenger
2023-09-01 14:50:43 +02:00
06f94091c2
MESSENGER 5004 add oidc flag
2023-08-31 12:13:03 +02:00
56d5e3597e
MESSENGER 5004 corrected version
2023-08-30 17:57:13 +02:00
1955ca59d2
MESSENGER 5004 update element version string
2023-08-30 17:55:46 +02:00
74ed5f6249
MESSENGER 5004 update sdk version
2023-08-30 17:55:15 +02:00
8361d2b5f6
Merge branch 'feature/4704_ui_optimierungen_raumuebersicht' into 'develop'
...
MESSENGER-4704 UI Optimierungen Raumübersicht
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!195
2023-08-30 12:34:58 +00:00
ac94428b11
MESSENGER-4704 UI Optimierungen Raumübersicht
2023-08-30 12:34:58 +00:00
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
436c619b1a
Merge branch 'feature/5047_increment_version' into 'develop'
...
MESSENGER-5047 version to 2.10.0
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!194
2023-08-29 11:18:14 +00:00
f68749416b
MESSENGER-5047 version to 2.10.0
2023-08-29 13:16:24 +02:00
60eefcd8bb
Merge branch 'feature/try_merge_2' into 'develop'
...
test change for merge to bwm
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!193
2023-08-29 11:06:54 +00:00
689882b6f6
test change for merge to bwm
2023-08-29 12:50:28 +02:00
54e21b37ba
Merge branch 'release/1.11.1/master'
2023-08-29 13:09:52 +03:00
3788d8d5a1
finish version++
2023-08-29 13:09:52 +03:00
2f031d90d3
Merge pull request #7659 from vector-im/release/1.11.1/release
...
Release 1.11.1
2023-08-29 13:08:40 +03:00
4ecf7674a4
version++
2023-08-29 12:20:34 +03:00
4014ef5131
changelog.d: Upgrade MatrixSDK version ([v0.27.1]( https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.1 )).
2023-08-29 12:20:33 +03:00
22a75049db
Merge branch 'feature/test_merge_2' into 'develop'
...
MESSENGER test merge 2
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!192
2023-08-29 07:21:50 +00:00
ca3ae21011
MESSENGER test merge 2
2023-08-29 09:20:58 +02:00
28b393ad91
Merge branch 'feature/5071_ios-8601_standard_time' into 'develop'
...
MESSENGER-5071 use ios8601 for maintenance
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!190
2023-08-29 06:33:51 +00:00
725eba300f
MESSENGER-5071 use ios8601 for maintenance
2023-08-29 07:57:07 +02:00
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
be289a3790
completed
2023-08-28 12:20:26 +02:00
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
17ca81e5ec
Feature/fix huddle power levels
2023-08-28 08:43:51 +00:00
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
fbd0793b6f
code improvement
2023-08-25 19:39:55 +02:00
1126891fea
fix 7646
2023-08-25 17:22:11 +02:00
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
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
f42e1a38fa
web view opened on tap + changelog
2023-08-25 12:21:38 +02:00
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
4c51c952c4
added the cell, now I just need to implement the navigation to the web view
2023-08-24 19:15:12 +02:00
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
e718c0400e
completed
2023-08-24 17:53:48 +02:00
4ddafd63ee
Hide deactivate account if the auth property is present on the WK.
2023-08-24 17:18:13 +02:00
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
e6d3fbf404
MESSENGER-4976 dont cache maintenance
2023-08-24 11:53:32 +02:00
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
0de12cae1f
Feature/changed sdk version in podfile to v2.9.0_rc1
2023-08-24 07:37:36 +00:00
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
a5901ea961
MESSENGER-4976 buildfix
2023-08-24 08:16:04 +02:00
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
bc6a2bd385
Feature/4976 fix for blocking behaviour
2023-08-23 15:13:16 +00:00
15bbe0dc1a
Merge pull request #7649 from vector-im/stefan/variousBugFixes
...
Various bug fixes
2023-08-23 16:03:07 +03:00
332b152cdf
Add changelogs
2023-08-23 16:02:04 +03:00
Arnfried Griesert
JanNiklas Grabowski
Frank Rotermund
Stefan Ceriu
Stefan Ceriu
Mauro
Mauro Romito