2014 Commits

Author SHA1 Message Date
Frank Rotermund
d2410313f6 fix: more wording mdm (MESSENGER-7555) 2026-03-20 07:08:47 +01:00
Arnfried Griesert
585f4a852d Feature/7555 migration part 3 2026-03-17 13:55:15 +00:00
Jan Niklas Grabowski
fd006de887 feat: change text call event (MESSENGER-7954) 2025-11-20 16:01:39 +01:00
Jan Niklas Grabowski
1b9e95f8d2 fix: use version number 2.26.0 (MESSENGER-7665) 2025-10-13 14:26:30 +02:00
Jan Niklas Grabowski
c299994778 Merge branch 'develop' into feature/7564_migration_part_1_banner
# Conflicts:
#	Riot/Assets/de.lproj/Bwi.strings
#	Riot/Assets/en.lproj/Bwi.strings
2025-09-23 11:14:28 +02:00
Frank Rotermund
5eaaf7f27e feat: owner german translation (MESSENGER-7561) 2025-09-19 14:35:15 +02:00
Jan Niklas Grabowski
4d9a8a4d85 feat: layout changes and copy to clipboard (MESSENGER-7564) 2025-09-18 18:10:53 +02:00
Jan Niklas Grabowski
bed94efd52 feat: add migration dialog 1 (MESSENGER-7553) 2025-09-17 17:34:29 +02:00
Jan Niklas Grabowski
00d9048124 feat: add migration part 1 banner (MESSENGER-7564) 2025-09-15 17:39:24 +02:00
Frank Rotermund
bf76058997 chore: Update to FOSS 1.11.31 (MESSENGER-7610)
Merge commit '822cbc5076da248fa7b997a5e3e906b03c4a09f7' into feature/7610_FOSS_Merge_1_11_31

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	README.md
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/ContextMenu/Services/RoomContextActionService.swift
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	fastlane/Fastfile
2025-08-27 07:39:26 +02:00
Mauro Romito
a6022e1481 added alert in the action context service and in the RecentsViewController 2025-07-24 18:52:36 +02:00
Mauro Romito
492bc8c2cd implemented in RoomInfoListViewController 2025-07-24 17:07:29 +02:00
Mauro Romito
eb0deaa54d added also the owner in x string 2025-07-23 18:50:10 +02:00
Mauro Romito
4d2ef7788a PL150 users are displayed as Owner in the list 2025-07-23 18:43:03 +02:00
Frank Rotermund
67df1a3e95 chore: FOSS Merge 1.27.11 (MESSENGER-7276)
Merge commit 'af0b6d4be985d9f26e5111d3fa01389c7321949f' into feature/7276_FOSS_Merge_1_27_11

# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile.lock
#	IDETemplateMacros.plist
#	Podfile
#	Podfile.lock
#	README.md
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Room/CellData/RoomBubbleCellData.m
#	Riot/target.yml
#	RiotNSE/NotificationService.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionModels.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/AuthenticationServerSelectionViewModel.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/Coordinator/AuthenticationServerSelectionCoordinator.swift
#	RiotSwiftUI/Modules/Authentication/ServerSelection/View/AuthenticationServerSelectionScreen.swift
#	RiotSwiftUI/Modules/Room/CompletionSuggestion/Service/CompletionSuggestionService.swift
#	fastlane/Fastfile
2025-05-16 14:06:20 +02:00
Doug
ee2073a8e3 Add sunset banners guiding users to install Element X when registering against a server with MAS. (#7890) 2025-01-10 13:22:03 +00:00
Doug
411478a4f7 Show Matrix RTC calls as unsupported. (#7862) 2024-11-11 09:22:45 +00:00
JanNiklas Grabowski
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
JanNiklas Grabowski
7b6693631b feat: change leave room info last admin (MESSENGER-5783) 2024-09-27 13:28:36 +02:00
JanNiklas Grabowski
617d658d99 feat: change leave room info (MESSENGER-6526) 2024-09-27 11:00:03 +02:00
JanNiklas Grabowski
6c22fa37f1 Merge commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5' into feature/6076_foss_merge
* commit '56d9e1f6a55a93dc71149ae429eaa615a98de0d5': (79 commits)
  finish version++
  version++
  Translated using Weblate (Hungarian)
  Translated using Weblate (Italian)
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Slovak)
  Translated using Weblate (Swedish)
  Translated using Weblate (Indonesian)
  Translated using Weblate (Albanian)
  Translated using Weblate (Estonian)
  Translated using Weblate (Estonian)
  updated the submodule
  updated SDK
  Update the SDK. (#7819)
  Prepare for new sprint
  finish version++
  version++
  fix
  Changelog.
  ...

# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/Settings/RiotSettings.swift
#	Riot/Modules/Analytics/Analytics.swift
#	Riot/Modules/Analytics/DecryptionFailure.swift
#	Riot/Modules/Analytics/PHGPostHogConfiguration.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewAction.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewModel.swift
#	Riot/Modules/Room/Views/Title/Preview/PreviewRoomTitleView.m
#	Riot/Modules/Settings/SettingsViewController.m
#	Riot/Utils/EventFormatter.m
#	Riot/Utils/Tools.m
#	RiotNSE/target.yml
#	fastlane/Fastfile
#	project.yml
2024-08-19 12:52:38 +02:00
Stefan Ceriu
b691d02a20 Add support for reporting rooms on the room details screen too 2024-06-12 17:55:36 +03:00
JanNiklas Grabowski
75bc28eb6c MESSENGER-5716 change error message federated invite 2024-06-06 16:05:57 +02:00
JanNiklas Grabowski
03c79fc8eb MESSENGER-6019 fix permalink bugs 2024-05-28 16:56:48 +02:00
JanNiklas Grabowski
96dbfb44c4 MESSENGER-6018 layout changes simplified login and add error handling for timeouts 2024-05-24 13:38:14 +02:00
Mauro Romito
58a65c68ff added accessbility 2024-05-03 14:09:38 +02:00
Arnfried Griesert
905c6c0951 Merged element v1.11.9 into bum 2024-04-23 16:13:09 +02:00
JanNiklas Grabowski
331e033671 MESSENGER-5799 add settings alert save changes 2024-04-17 12:54:22 +02:00
JanNiklas Grabowski
d8adcd13c0 MESSENGER-5938 activate labs 2024-04-05 13:28:31 +02:00
Arnfried Griesert
4502a81064 Added generated string files 2024-04-04 10:26:42 +02:00
Arnfried Griesert
998583641a Added generated string files 2024-04-04 09:33:10 +02:00
Frank Rotermund
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
JanNiklas Grabowski
e18e64d1c8 Merge branch 'feature/5556_fix_maintenance_sync' into 'develop'
Feature/5556 fix maintenance sync

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!341
2024-03-22 12:37:12 +00:00
Frank Rotermund
026a1d3ade MESSENGER-5793 simple solution 2024-03-22 13:04:28 +01:00
JanNiklas Grabowski
60ca0cab30 MESSENGER-5556 fix maintenance sync 2024-03-20 14:05:18 +01:00
JanNiklas Grabowski
d07184c687 Merge commit 'ee6e5de4358a2c0a2705194cd954f9207ff772cf' into feature/5854_foss_merge
* commit 'ee6e5de4358a2c0a2705194cd954f9207ff772cf':
  finish version++
  version++
  Fix a bug where QR codes aren't detected if the camera is too close. (#7762)
  element-hq/element-meta/issues/2201 - Disable mark as unread - relates to element-hq/element-meta/issues/891 - relates to element-hq/element-ios/issues/7253
  Fix dictation when using the Rich Text Editor. (#7752)
  Prepare for new sprint
  finish version++
  version++
  changelog.d: Upgrade MatrixSDK version ([v0.27.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.6)).
  corrected translations
  Added translation using Weblate (Persian (Old))
  Translated using Weblate (Albanian)
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Albanian)
  changelog
  fix
  Prepare for new sprint
  GH actions: remove triaging process and old GH projects

# Conflicts:
#	Config/AppVersion.xcconfig
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
2024-03-11 12:13:51 +01:00
JanNiklas Grabowski
ada28773d9 MESSENGER-5706 fix pipeline 2024-03-04 08:48:14 +01:00
JanNiklas Grabowski
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
JanNiklas Grabowski
ebcb633892 MESSENGER-5706 merge from #5660 and refactoring 2024-03-01 14:06:46 +01:00
Frank Rotermund
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
JanNiklas Grabowski
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
Arnfried Griesert
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
Frank Rotermund
272d6de13f Merge branch 'develop' into 'feature/5575_acl_status_in_timeline'
# Conflicts:
#   Podfile
2024-03-01 09:00:34 +00:00
Frank Rotermund
2867bae23e MESSENGER-5575 ACL status event handling in the timeline 2024-03-01 07:25:42 +01:00
JanNiklas Grabowski
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
Arnfried Griesert
5cf6f10390 Added screens for federation introduction 2024-02-26 06:50:30 +01:00
JanNiklas Grabowski
d15d8e9f76 MESSENGER-5706 show federation announcement promt 2024-02-22 15:15:29 +01:00
Frank Rotermund
973319675e MESSENGER-5570 build fix strigntables in NSE 2024-02-21 17:13:47 +01:00
JanNiklas Grabowski
09c394a21b MESSENGER-5578 add success alert to federation decision sheet 2024-02-14 17:32:23 +01:00
Doug
467a754398 Fix dictation when using the Rich Text Editor. (#7752) 2024-02-14 15:19:33 +00:00