Frank Rotermund
35e7c18150
MESSENGER-5740 fix double notes rooms on connection erros
2024-02-06 08:16:42 +01:00
JanNiklas Grabowski
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
Frank Rotermund
2dcf1b48ae
Merge branch 'feature/5290_fix_clickable_invitation_events' into 'develop'
...
Feature/5290 fix clickable invitation events
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!309
2024-02-05 12:12:34 +00:00
JanNiklas Grabowski
2331502b0f
Merge branch 'feature/5671_deactivate_swipe_gesture_remove_user_from_room' into 'develop'
...
MESSENGER-5671 deactivate swpie gesture room participants list
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!310
2024-02-05 07:50:45 +00:00
JanNiklas Grabowski
a573e15ea3
MESSENGER-5671 deactivate swpie gesture room participants list
2024-02-02 16:17:09 +01:00
Frank Rotermund
af9354320a
MESSENGER-5290 fix klickable events part two
2024-02-02 13:57:50 +01:00
Frank Rotermund
9f55da8b53
MESSENGER-5290 fix klickable events
2024-02-02 09:27:58 +01:00
Frank Rotermund
1d05725cea
Merge branch 'feature/5413_sonarcube_security_hotspots' into 'develop'
...
Feature/5413 sonarcube security hotspots
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!306
2024-02-02 07:05:34 +00:00
JanNiklas Grabowski
303169c830
5383 check canonical alias refactoring
2024-02-01 15:34:12 +01:00
JanNiklas Grabowski
e0e0c9b34e
MESSENGER-5383 check for canonical alias
2024-02-01 14:48:10 +01:00
JanNiklas Grabowski
e196fe1b3c
MESSENGER-5383 check for canonical alias
2024-02-01 14:44:37 +01:00
JanNiklas Grabowski
9725fc98fa
Merge branch 'feature/5506_show_latest_profile_picture' into 'develop'
...
MESSENGER-5506 show latest profile picture
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!307
2024-02-01 13:06:44 +00:00
Arnfried Griesert
27b8ff2d7f
Merge branch 'feature/5675_modified_buildsettings' into 'develop'
...
MESSENGER-5675 Changed buildsettings
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!308
2024-01-31 18:33:17 +00:00
Arnfried Griesert
7808a152c8
Changed buildsettings
2024-01-31 15:56:31 +01:00
Frank Rotermund
740efec7e2
MESSENGER-5413 exclude widget javascript
2024-01-31 14:44:16 +01:00
Frank Rotermund
1d4c613c1f
MESSENGER-5413 sonar properties syntax
2024-01-31 13:47:22 +01:00
Frank Rotermund
eff39235b0
MESSENGER-5413 exclude Mocks and UnitTests fdrom sar analysis
2024-01-31 13:25:24 +01:00
JanNiklas Grabowski
1ff851ce88
Merge branch 'feature/5304_us14_change_text_size' into 'develop'
...
MESSENGER-5304 change text size
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!305
2024-01-31 12:22:07 +00:00
JanNiklas Grabowski
798b611065
MESSENGER-5506 activate
2024-01-30 17:15:32 +01:00
JanNiklas Grabowski
171aa9694e
MESSENGER-5506 show latest profile picture
2024-01-30 16:49:57 +01:00
Frank Rotermund
bac1bd9650
MESSENGER-5413 other hotspots
2024-01-30 15:13:28 +01:00
JanNiklas Grabowski
abbccdf607
MESSENGER-5304 change text size
2024-01-30 14:26:13 +01:00
JanNiklas Grabowski
5f41692969
fix pipeline
2024-01-30 13:54:25 +01:00
Frank Rotermund
bc7c98448b
MESSENGER-5413 authentication hotspots
2024-01-30 13:23:04 +01:00
JanNiklas Grabowski
88b166f815
Merge branch 'develop' into feature/5383_check_alias_old_rooms
...
* develop:
MESSENGER-5290 refactor to consider if sender or target
MESSENGER-5290 remove debug code
MESSENGER-5290 mark more federated user status events
Fixed bool value
MESSENGER-5290 mark federated user status events
Show matrix identifier in second line
# Conflicts:
# RiotNSE/target.yml
2024-01-30 13:06:22 +01:00
Frank Rotermund
ebbd5a5c78
Merge branch 'feature/4478_wellknown_from_homeserver' into 'develop'
...
MESSENGER-4478 refresh wellknown on app start
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!301
2024-01-30 12:04:57 +00:00
JanNiklas Grabowski
23d421862c
add file to target
2024-01-30 13:01:30 +01:00
JanNiklas Grabowski
ba4e145039
MESSENGER-5383 Check alias on acl update
2024-01-30 12:45:05 +01:00
Frank Rotermund
53617a2d19
MESSENGER-4478 refresh wellknown on app start
2024-01-29 15:21:41 +01:00
Arnfried Griesert
060bc19baf
Merge branch 'feature/5205_matrix_id' into 'develop'
...
MESSENGER-5205 Show matrix identifier in second line
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!296
2024-01-29 12:50:32 +00:00
Frank Rotermund
11beae52ab
Merge branch 'feature/5290_mark_federated_users' into 'develop'
...
Feature/5290 mark federated users
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!299
2024-01-29 12:26:06 +00:00
JanNiklas Grabowski
80170b0c4f
Merge branch 'feature/refactoring_federation' into 'develop'
...
Feature/refactoring federation
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!300
2024-01-29 07:45:00 +00:00
Frank Rotermund
9b00e5a392
MESSENGER-5290 refactor to consider if sender or target
2024-01-29 08:12:33 +01:00
JanNiklas Grabowski
58282bd602
add checks for federated flag for room
2024-01-26 14:17:55 +01:00
JanNiklas Grabowski
56c544797d
refactor set serveracl and fix json key
2024-01-26 13:25:27 +01:00
JanNiklas Grabowski
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
JanNiklas Grabowski
46ec6e56e4
Merge branch 'feature/5381_disable_federated_admins' into 'develop'
...
MESSENGER-5381 disable federated admins
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!298
2024-01-26 07:49:44 +00:00
JanNiklas Grabowski
5d9b45cd53
Merge branch 'feature/5304_us14_add_federation_info_view_for_old_rooms' into 'develop'
...
MESSENGER-5304 add room federation decision sheet
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!295
2024-01-25 21:18:19 +00:00
JanNiklas Grabowski
f1e6b04542
refactoring get federation status
2024-01-25 17:23:17 +01:00
JanNiklas Grabowski
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
JanNiklas Grabowski
da1aa04ba4
reset versions
2024-01-25 15:25:40 +01:00
JanNiklas Grabowski
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
JanNiklas Grabowski
535a166ca1
Merge branch 'feature/5386_us17_invites_only_with_serveracl_configured' into 'develop'
...
MESSENGER-5386 us17 invite federated users only if room is federated
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!297
2024-01-25 14:08:21 +00:00
JanNiklas Grabowski
9e233f696b
MESSENGER-5304 refactoring
2024-01-25 14:48:06 +01:00
JanNiklas Grabowski
5b8f7babd5
add completion
2024-01-25 14:28:32 +01:00
JanNiklas Grabowski
128f24c62a
MESSENGER-5226 us12 check if room is personal notes room
2024-01-25 13:19:10 +01:00
JanNiklas Grabowski
81abd348be
MESSENGER-5304 add condition
2024-01-25 12:58:32 +01:00
Frank Rotermund
6c63bab67f
MESSENGER-5290 remove debug code
2024-01-25 11:36:19 +01:00
Frank Rotermund
02baa617c4
MESSENGER-5290 mark more federated user status events
2024-01-25 11:35:11 +01:00
JanNiklas Grabowski
30b2ba61bb
MESSENGER-5386 change alert appearance
2024-01-25 11:11:45 +01:00
