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
Frank Rotermund
bac1bd9650
MESSENGER-5413 other hotspots
2024-01-30 15:13:28 +01:00
Frank Rotermund
bc7c98448b
MESSENGER-5413 authentication hotspots
2024-01-30 13:23:04 +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
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
JanNiklas Grabowski
fa385e5a0c
MESSENGER-5381 disable federated admins
2024-01-24 18:00:18 +01:00
JanNiklas Grabowski
81a6a1cd73
MESSENGER-5386 us17 invite federated users only if room is federated
2024-01-24 16:07:26 +01:00
Arnfried Griesert
0a2ef68c55
Fixed bool value
2024-01-24 13:14:56 +01:00
JanNiklas Grabowski
ff4019f2c4
MESSENGER-5304 refactoring and english translation
2024-01-24 12:04:18 +01:00
Frank Rotermund
5489890d19
MESSENGER-5290 mark federated user status events
2024-01-24 07:43:44 +01:00
Arnfried Griesert
58ec57db70
Show matrix identifier in second line
2024-01-24 07:00:49 +01:00
JanNiklas Grabowski
9e1890da78
MESSENGER-5304 add text styling and spacing
2024-01-23 16:25:42 +01:00
JanNiklas Grabowski
e4ca351f31
MESSENGER-5304 add room federation decision sheet
2024-01-23 16:11:04 +01:00
JanNiklas Grabowski
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
Frank Rotermund
3a9d084f2d
Merge branch 'hotfix/v2.14.1' into develop
...
# Conflicts:
# Podfile
2024-01-19 12:34:29 +01:00
Frank Rotermund
238743e908
MESSENGER-5431 fix for relabeled requests
2024-01-19 12:23:34 +01:00
JanNiklas Grabowski
aadf57e77b
Merge branch 'feature/5223_us06_federation_in_timeline' into 'develop'
...
MESSENGER-5223 add federation pill in timeline
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!290
2024-01-19 09:18:46 +00:00
JanNiklas Grabowski
d60d5ce0ef
Merge commit 'd4a88c36aeca8f101223282b1641bbbe4cf61cfa' into feature/5226_us12_federation_in_timline_header
...
* commit 'd4a88c36aeca8f101223282b1641bbbe4cf61cfa':
MESSENGER-5431 temporary remoce ort stage
MESSENGER-5431 temporary remoce ort stage
MESSENGER-5431 use tagged sdk
Updated sdk version in podfile
MESSENGER-5431 changelog and app version
finish version++
version++
changelog.d: Upgrade MatrixSDK version ([v0.27.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.5 )).
Discard changes to Riot/Assets/de.lproj/Vector.strings
Translated using Weblate (Belarusian)
Added translation using Weblate (Belarusian)
Translated using Weblate (Belarusian)
Added translation using Weblate (Belarusian)
Added translation using Weblate (Georgian)
Translated using Weblate (German)
Added translation using Weblate (Belarusian)
Update most references of vector-im to element-hq (#7725 )
Update RTE to 2.19.0
Update CocoaPods and other gems. (#7720 )
Prepare for new sprint
# Conflicts:
# .gitlab-ci-bum.yml
2024-01-19 10:08:29 +01:00
Frank Rotermund
103d232337
Merge branch 'release/v2.14.0' into develop
...
# Conflicts:
# Config/AppVersion.xcconfig
# Podfile
2024-01-19 07:34:07 +01:00
Frank Rotermund
0cfb3a99a6
Merge branch 'release/v2.14.0'
2024-01-19 07:31:09 +01:00
Frank Rotermund
e24bdde8c9
Merge branch 'release/5431-releaseprep' into 'release/v2.14.0'
...
Release/5431 releaseprep
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!293
2024-01-19 06:25:21 +00:00
Frank Rotermund
4fbdec548b
MESSENGER-5431 use tagged sdk
2024-01-18 16:59:36 +01:00
JanNiklas Grabowski
d5e28c9a12
MESSENGER-5226 us12 federation in timeline header
2024-01-18 14:01:34 +01:00
Arnfried Griesert
604dff68ed
Merge branch 'feature/5475_basisupdate_element_bum' into 'develop'
...
MESSENGER-5475 Basisupdate element zu bum
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!291
2024-01-18 12:06:52 +00:00
Arnfried Griesert
128e119bfd
Updated sdk version in podfile
2024-01-18 04:52:59 +01:00
Arnfried Griesert
5a38b623d5
Merged element version 1.11.6 into bum
2024-01-18 04:07:32 +01:00
JanNiklas Grabowski
0df2b02918
MESSENGER-5223 add federation pill in timeline
2024-01-17 13:51:30 +01:00
