Commit Graph

9908 Commits

Author SHA1 Message Date
Frank Rotermund 53617a2d19 MESSENGER-4478 refresh wellknown on app start 2024-01-29 15:21:41 +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 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 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 9e233f696b MESSENGER-5304 refactoring 2024-01-25 14:48:06 +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
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
JanNiklas Grabowski ff4019f2c4 MESSENGER-5304 refactoring and english translation 2024-01-24 12:04:18 +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
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 d5e28c9a12 MESSENGER-5226 us12 federation in timeline header 2024-01-18 14:01:34 +01:00
JanNiklas Grabowski 0df2b02918 MESSENGER-5223 add federation pill in timeline 2024-01-17 13:51:30 +01:00
JanNiklas Grabowski 5d71ab9fce Merge branch 'develop' into feature/5204_fix_federation_pill_appearance
* develop:
  MESSENGER-5410 change default setting
  fix pipeline
  MESSENGER-5410 add room federation setting
  MESSENGER-5410 add toggle to room settings and refactor toggle view
  MESSENGER-5410 refactor set federation acls when creating room

# Conflicts:
#	Riot/Modules/Room/RoomInfo/RoomInfoList/Views/RoomInfoBasicView.swift
2024-01-15 13:59:48 +01:00
JanNiklas Grabowski 8a53e455c7 MESSENGER-5204 fix federation pill appearance 2024-01-12 16:42:03 +01:00
JanNiklas Grabowski cd4b88b027 MESSENGER-5410 change default setting 2024-01-11 17:07:39 +01:00
JanNiklas Grabowski 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
JanNiklas Grabowski 72e027cd76 MESSENGER-5410 add room federation setting 2024-01-11 11:07:35 +01:00
Arnfried Griesert 57d5ca2955 Merge branch 'feature/5158_fix_permalink_prefix' into 'develop'
MESSENGER-5158 fix permalink prefix

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!278
2024-01-10 14:21:38 +00:00
Frank Rotermund 2bd95fac9a MESSENGER-5279 call isAppversionOutdated after maintenance was updated 2024-01-09 16:08:24 +01:00
Frank Rotermund b6b0378030 MESSENGER-5379 removed unused label 2024-01-09 11:22:54 +01:00
Frank Rotermund d7749bb5da MESSENGER-5379 dynamic location attribution from style.json 2024-01-09 11:02:02 +01:00
Frank Rotermund 9c10374575 Merge branch 'feature/5433_foss_merge' into develop 2024-01-04 15:19:03 +01:00
Frank Rotermund ddf17f4b64 Merge branch 'hotfix/v.2.12.2' into develop
# Conflicts:
#	Config/AppVersion.xcconfig
2024-01-04 10:34:54 +01:00
JanNiklas Grabowski 866e27c1fd MESSENGER-5410 add toggle to room settings and refactor toggle view 2023-12-22 17:16:35 +01:00
JanNiklas Grabowski 2a875e3846 MESSENGER-5410 refactor set federation acls when creating room 2023-12-22 15:03:14 +01:00
JanNiklas Grabowski 5decccf6cb hotfix use custom url scheme to open links if provided 2023-12-22 12:25:59 +01:00
Frank Rotermund 8a186a37d8 Merge commit 'd786f7bb4f37b77478a8a55df44a6e87247f96c1' into feature/5433_foss_merge
* commit 'd786f7bb4f37b77478a8a55df44a6e87247f96c1': (36 commits)
  finish version++
  Release notes
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.4)).
  Fix missing placeholder.
  Translated using Weblate (Catalan)
  Translated using Weblate (Catalan)
  Translated using Weblate (Catalan)
  Translated using Weblate (Arabic)
  Translated using Weblate (Arabic)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Vietnamese)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Fix: Remove the “Quote” action from the menu of the selected message.
  Update RTE to 2.18.0 to fix an issue with Speech-to-Text
  Code cleanup
  Dismiss the keyboard and minimise the composer when pasting an image, a video or a file
  Fix: focus, keyboard visibility, composer height
  Restore composer tint color
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Riot/Modules/Room/RoomViewController.m
2023-12-20 15:11:56 +01:00
JanNiklas Grabowski 776b88008f MESSENGER-5204 us05 add federation icons user details view 2023-12-18 16:33:46 +01:00
JanNiklas Grabowski 7a378ed99c MESSENGER-5204 us05 add federation icons user details view 2023-12-18 16:17:40 +01:00
JanNiklas Grabowski 8c3d53b984 MESSENGER-5158 fix permalink prefix 2023-12-13 17:25:39 +01:00
JanNiklas Grabowski 4f2815f721 MESSENGER-5311 change text size 2023-12-13 13:58:35 +01:00
Frank Rotermund 02bb97687d Feature/5308 sso on internal browser 2023-12-08 11:42:02 +00:00
JanNiklas Grabowski 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
JanNiklas Grabowski 5974c24118 MESSENGER-4846 add federate toggle for room creation 2023-12-07 12:27:21 +01:00
JanNiklas Grabowski 7849724638 MESSENGER-4846 add federate toggle for room creation 2023-12-07 12:15:16 +01:00
Frank Rotermund 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
Frank Rotermund 02fafc966e MESSENGER-5271 hide crosssigning information when only one device 2023-12-05 14:55:00 +01:00
JanNiklas Grabowski d67a713630 Merge branch 'feature/5311_add_userid_to_room_member_details_view' into 'develop'
Feature/5311 add userid to room member details view

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!263
2023-12-05 12:20:00 +00:00
Frank Rotermund cd1b7053e8 MESSENGER-5271 buildfix 2023-12-05 13:00:17 +01:00
Frank Rotermund c8a32e3431 MESSENGER-5271 crosssigning - add alert and better strings, only show button when usable 2023-12-05 12:46:26 +01:00
Frank Rotermund 9a997510c5 MESSENGER-5271 crosssigning - verification request on button click 2023-11-30 14:19:58 +01:00
JanNiklas Grabowski 2842f021ab MESSENGER-5358 add switch in settings for wysiwyg composer 2023-11-29 15:32:00 +01:00
JanNiklas Grabowski f26928de8f MESSENGER-5311 change label name 2023-11-29 12:19:25 +01:00