93fb072522
fix: fixed status messages not showing (MESSENGER-6173)
2024-07-03 13:17:31 +02:00
6a22f7ab36
MESSENGER-6173 fix status event wrong text
2024-07-02 16:55:42 +02:00
330de90df9
MESSENGER-6171 add federation ui for room invite
2024-06-24 14:21:19 +02:00
12b9a4626e
MESSENGER-6152 fix app crashes mute function and invite
2024-06-06 12:26:15 +02:00
3d5e33b565
Merge branch 'feature/5393_matomo_tracking_for_federation' into 'develop'
...
Feature/5393 matomo tracking for federation
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!330
2024-03-05 09:50:32 +00:00
52d40ca517
MESSENGER-5393 some tracking fixes
2024-03-05 08:23:02 +01:00
588030542b
MESSENGER-5393 matomo ztracking for federation
2024-03-05 07:36:19 +01:00
99e5488ff0
Merge branch 'feature/5706_show_federation_info' into 'develop'
...
Feature/5706 show federation info
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!325
2024-03-04 10:00:50 +00:00
9cf8aa24dd
Merge branch 'feature/5575_acl_status_in_timeline' into 'develop'
...
Feature/5575 acl status in timeline
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!327
2024-03-01 21:14:20 +00: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
db2eb35992
Merge branch 'feature/5715_fix_federation_status_for_invite' into 'develop'
...
MESSENGER-5715 do not show federation status in room for invited users
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!326
2024-03-01 13:09:59 +00:00
ebcb633892
MESSENGER-5706 merge from #5660 and refactoring
2024-03-01 14:06:46 +01: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
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
5946939b72
MESSENGER-5715 do not show federation status in room for invited users
2024-02-28 15:26:47 +01:00
e68962fe07
MESSENGER-5706 use theme binding
2024-02-27 16:29:00 +01:00
3ddb4e4d04
MESSENGER-5706 change appearance and use wellknown
2024-02-27 14:36:30 +01:00
d07f992659
MESSENGER-5575 decide first ACL event based on state
2024-02-26 14:41:29 +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
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
04b1f6c53a
fix pipeline
2024-02-20 10:37:22 +01:00
09c394a21b
MESSENGER-5578 add success alert to federation decision sheet
2024-02-14 17:32:23 +01:00
66e43e69cd
MESSENGER-5766 remove remind me later button
2024-02-09 15:06:33 +01:00
37882d5610
Merge branch 'feature/5383_check_alias_old_rooms' into 'develop'
...
Feature/5383 check alias old rooms
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!304
2024-02-05 12:25:27 +00:00
303169c830
5383 check canonical alias refactoring
2024-02-01 15:34:12 +01:00
e196fe1b3c
MESSENGER-5383 check for canonical alias
2024-02-01 14:44:37 +01:00
abbccdf607
MESSENGER-5304 change text size
2024-01-30 14:26:13 +01:00
5f41692969
fix pipeline
2024-01-30 13:54:25 +01:00
ba4e145039
MESSENGER-5383 Check alias on acl update
2024-01-30 12:45:05 +01:00
56c544797d
refactor set serveracl and fix json key
2024-01-26 13:25:27 +01:00
65864cc1ab
Merge commit '653554e759f81eb0d18852ac8a46b462c514b245' into feature/refactoring_federation
...
* commit '653554e759f81eb0d18852ac8a46b462c514b245':
reset versions
MESSENGER-5304 refactoring
MESSENGER-5304 add condition
MESSENGER-5386 change alert appearance
MESSENGER-5381 disable federated admins
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
2024-01-26 11:56:58 +01:00
f1e6b04542
refactoring get federation status
2024-01-25 17:23: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
5b8f7babd5
add completion
2024-01-25 14:28:32 +01:00
ff4019f2c4
MESSENGER-5304 refactoring and english translation
2024-01-24 12:04:18 +01:00
9e1890da78
MESSENGER-5304 add text styling and spacing
2024-01-23 16:25:42 +01:00
e4ca351f31
MESSENGER-5304 add room federation decision sheet
2024-01-23 16:11:04 +01:00
f20b1660d3
Merge branch 'feature/5226_us12_federation_in_timline_header' into 'develop'
...
MESSENGER-5226 us12 federation in timeline header
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!292
2024-01-22 13:38:05 +00:00
d5e28c9a12
MESSENGER-5226 us12 federation in timeline header
2024-01-18 14:01:34 +01:00
0df2b02918
MESSENGER-5223 add federation pill in timeline
2024-01-17 13:51:30 +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
7a378ed99c
MESSENGER-5204 us05 add federation icons user details view
2023-12-18 16:17:40 +01:00
e7bbd677ab
Refactor federation check
2023-12-08 12:35:11 +01:00
d71e58bf0a
Refactor federation check
2023-11-29 13:47:08 +01:00
a213954135
MESSENGER-5203 add federation to lab settings and refactor
2023-11-02 15:35:25 +01:00
2e4f9f59ab
MESSENGER-5203 update acl handling
2023-10-31 16:35:30 +01:00
cdde55bfa8
MESSENGER-5203 add federation check for room
2023-10-31 14:14:13 +01:00
JanNiklas Grabowski
Frank Rotermund