159ff25bd1
Merge branch 'develop' into feature/6526_change_leave_room_info
...
* develop: (22 commits)
feat: change leave room info last admin (MESSENGER-5783)
feat: add hash (MESSENGER-6522)
chore: Remove FLEX and update matrix sdk (MESSENGER-6440)
finish version++
Update CHANGES.md
version++
Translated using Weblate (Korean)
Translated using Weblate (Korean)
Translated using Weblate (Korean)
update podfile.lock
update SDK commit
fixed some swiftlint errors
Prepare for new sprint
finish version++
version++
Update the SDK submodule.
Use the codecov token. (#7834 )
Fix dead image link (#7682 )
Check power level before starting live sharing location (#7832 )
Update FLEX.
...
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
2024-09-30 14:54:55 +02:00
7b6693631b
feat: change leave room info last admin (MESSENGER-5783)
2024-09-27 13:28:36 +02:00
617d658d99
feat: change leave room info (MESSENGER-6526)
2024-09-27 11:00:03 +02:00
75bc28eb6c
MESSENGER-5716 change error message federated invite
2024-06-06 16:05:57 +02:00
03c79fc8eb
MESSENGER-6019 fix permalink bugs
2024-05-28 16:56:48 +02:00
96dbfb44c4
MESSENGER-6018 layout changes simplified login and add error handling for timeouts
2024-05-24 13:38:14 +02:00
331e033671
MESSENGER-5799 add settings alert save changes
2024-04-17 12:54:22 +02:00
d8adcd13c0
MESSENGER-5938 activate labs
2024-04-05 13:28:31 +02:00
d8eef9e81d
Transfered custom text changes to bwi strings
2024-04-04 10:25:09 +02:00
8c97d67697
Merge branch 'feature/5458_new_feature_banner' into 'develop'
...
MESSENGER-5458 new feature banner
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!340
2024-04-03 10:21:23 +00:00
779dbbcf78
Merge branch 'feature/5793_deleted_media_files_simple_solution' into 'develop'
...
MESSENGER-5793 simple solution
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!342
2024-04-02 13:42:17 +00:00
026a1d3ade
MESSENGER-5793 simple solution
2024-03-22 13:04:28 +01:00
60ca0cab30
MESSENGER-5556 fix maintenance sync
2024-03-20 14:05:18 +01:00
e615761962
Text change
2024-03-20 07:23:55 +01:00
1165d8ed42
Changed new feature texts and icon
2024-03-20 07:05:20 +01:00
787c1211a0
Merge commit 'ba936df9dff7039634397670f5a18bd1be8da222' into feature/5706_show_federation_info
...
* commit 'ba936df9dff7039634397670f5a18bd1be8da222':
MESSENGER-5575 spelling
MESSENGER-5575 use sdk with fixed event mapping
MESSENGER-5575 ACL status event handling in the timeline
MESSENGER-5575 decide first ACL event based on state
MESSENGER-5570 build fix strigntables in NSE
MESSENGER-5570 build with correct sdk
MESSENGER-5570 acl status events up to collapsability
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
# Riot/Generated/BWIStrings.swift
2024-03-01 15:55:15 +01:00
ebcb633892
MESSENGER-5706 merge from #5660 and refactoring
2024-03-01 14:06:46 +01:00
784c31ce02
Merge branch 'develop' into 'feature/5575_acl_status_in_timeline'
...
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
2024-03-01 12:29:59 +00:00
8c5666ec06
Merge branch 'develop' into feature/5706_show_federation_info
...
* develop:
MESSENGER-5734 SweT kompatible Readme
Added BWIThemeService helper class
Some minor changes from review
Changed name WellknownFederation
Removed #preview macros
Fixed a wrong frame size in the first federation screen
Bugfixes and changes from the approval
Layout and color changes
Replaced asset for federation screen
New button text for federation screen
Fixed some bugs
Check for wellknown and account data flag
Added screens for federation introduction
MESSENGER-5668 change button appearance key backup
MESSENGER-5603 fix handle reply to link in app
MESSENGER-5768 set old composer as default
fix pipeline
MESSENGER-5759 allow http only in web content
MESSENGER-5578 add success alert to federation decision sheet
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
# Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
# Riot/Modules/Home/AllChats/AllChatsViewController.swift
# bwi/Wellknown/WellknownBWI.swift
2024-03-01 12:55:12 +01:00
385ee21774
Merge branch 'feature/5660_introduce_federation' into 'develop'
...
MESSENGER-5660 introduce federation
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!324
2024-03-01 11:33:07 +00:00
272d6de13f
Merge branch 'develop' into 'feature/5575_acl_status_in_timeline'
...
# Conflicts:
# Podfile
2024-03-01 09:00:34 +00:00
2867bae23e
MESSENGER-5575 ACL status event handling in the timeline
2024-03-01 07:25:42 +01:00
ecd23ceab9
New button text for federation screen
2024-02-28 09:34:54 +01:00
5025925d3a
Check for wellknown and account data flag
2024-02-27 07:36:51 +01:00
db742880d3
Merge branch 'feature/5578_success_alert_federation_setting' into 'develop'
...
MESSENGER-5578 add success alert to federation decision sheet
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!317
2024-02-26 10:09:46 +00:00
5cf6f10390
Added screens for federation introduction
2024-02-26 06:50:30 +01:00
d15d8e9f76
MESSENGER-5706 show federation announcement promt
2024-02-22 15:15:29 +01:00
4aaf86e41e
MESSENGER-5570 acl status events up to collapsability
2024-02-21 16:50:20 +01:00
3b32f25ffa
Merge branch 'feature/5766_remove_remind_me_later_button_federation_old_rooms' into 'develop'
...
MESSENGER-5766 remove remind me later button
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!312
2024-02-19 11:24:09 +00:00
bb84e862c3
Merge branch 'feature/5595_text_changes_reset_whs' into 'develop'
...
MESSENGER-5595 text changes reset whs
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!314
2024-02-19 11:22:50 +00:00
3d75c4ad84
MESSENGER-5610 change profile hint
2024-02-16 06:46:48 +00:00
09c394a21b
MESSENGER-5578 add success alert to federation decision sheet
2024-02-14 17:32:23 +01:00
0b0bec559d
MESSENGER-5595 text changes
2024-02-14 15:39:34 +01:00
01c5e038bc
MESSENGER-5595 text changes reset whs
2024-02-12 16:03:13 +01:00
66e43e69cd
MESSENGER-5766 remove remind me later button
2024-02-09 15:06:33 +01:00
2724144c27
Merge branch 'feature/5304_us14_add_federation_info_view_for_old_rooms' into feature/5381_disable_federated_admins
...
* feature/5304_us14_add_federation_info_view_for_old_rooms:
reset versions
MESSENGER-5304 refactoring
MESSENGER-5304 add condition
MESSENGER-5386 change alert appearance
MESSENGER-5386 us17 invite federated users only if room is federated
MESSENGER-5304 refactoring and english translation
MESSENGER-5304 add text styling and spacing
MESSENGER-5304 add room federation decision sheet
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
2024-01-25 15:34:17 +01:00
90701f4d9d
Merge commit '17b2fa5409f49e10a7f136101989960a7f50dc73' into feature/5304_us14_add_federation_info_view_for_old_rooms
...
* commit '17b2fa5409f49e10a7f136101989960a7f50dc73':
MESSENGER-5386 change alert appearance
MESSENGER-5386 us17 invite federated users only if room is federated
fix pipeline
MESSENGER-5226 us12 federation in timeline header
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
2024-01-25 15:24:03 +01:00
fa385e5a0c
MESSENGER-5381 disable federated admins
2024-01-24 18:00:18 +01:00
81a6a1cd73
MESSENGER-5386 us17 invite federated users only if room is federated
2024-01-24 16:07:26 +01:00
e4ca351f31
MESSENGER-5304 add room federation decision sheet
2024-01-23 16:11:04 +01:00
ae892ca5f4
Merge branch 'develop' into 'feature/5410_federation_us15_room_settings'
...
# Conflicts:
# bwi/Federation/MXRoom+Federation.swift
2024-01-11 11:57:57 +00:00
72e027cd76
MESSENGER-5410 add room federation setting
2024-01-11 11:07:35 +01:00
b6b0378030
MESSENGER-5379 removed unused label
2024-01-09 11:22:54 +01:00
02bb97687d
Feature/5308 sso on internal browser
2023-12-08 11:42:02 +00:00
bdb8a7a92f
Merge branch 'feature/4846_us02_add_federate_toggle_for_room_creation' into 'develop'
...
Feature/4846 us02 add federate toggle for room creation
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!271
2023-12-08 09:37:45 +00:00
7849724638
MESSENGER-4846 add federate toggle for room creation
2023-12-07 12:15:16 +01:00
39e6e299eb
Merge branch 'feature/5271_crosssigning_with_button' into 'develop'
...
MESSENGER-5271 crosssigning - verification request on button click
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!267
2023-12-05 14:19:30 +00:00
c8a32e3431
MESSENGER-5271 crosssigning - add alert and better strings, only show button when usable
2023-12-05 12:46:26 +01:00
9a997510c5
MESSENGER-5271 crosssigning - verification request on button click
2023-11-30 14:19:58 +01:00
2842f021ab
MESSENGER-5358 add switch in settings for wysiwyg composer
2023-11-29 15:32:00 +01:00
JanNiklas Grabowski
Arnfried Griesert
Frank Rotermund