Commit Graph

9991 Commits

Author SHA1 Message Date
JanNiklas Grabowski 03cf4e3f35 MESSENGER-5999 fix button color in darkmode 2024-04-15 16:41:04 +02:00
Frank Rotermund 0e759de424 Merge branch 'feature/5948_build_on_macmini' into 'develop'
MESSENGER-5958 build on mac mini

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!348
2024-04-10 12:59:35 +00:00
Arnfried Griesert 508f1dd569 Merge branch 'feature/5458_check_federation_flag' into 'develop'
MESSENGER-5458 Check if federation is enabled in wellknown

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!349
2024-04-09 10:49:57 +00:00
Arnfried Griesert dafcbdb1be Check if federation is enabled in wellknown 2024-04-09 07:15:13 +02:00
Frank Rotermund 0fb4c0789a MESSENGER-5958 remove FLEX debugging 2024-04-08 14:56:18 +02:00
JanNiklas Grabowski 20b3504df9 MESSENGER-5938 changes from review 2024-04-05 15:17:34 +02:00
JanNiklas Grabowski f7911fb100 MESSENGER-5938 add condition 2024-04-05 14:01:39 +02:00
JanNiklas Grabowski d8adcd13c0 MESSENGER-5938 activate labs 2024-04-05 13:28:31 +02:00
JanNiklas Grabowski 7fb678bfc5 Merge branch 'feature/5892_activate_federation_with_wellknown' into 'develop'
Feature/5892 activate federation with wellknown

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!344
2024-04-02 14:11:48 +00:00
JanNiklas Grabowski 2d05d9c0d5 MESSENGER-5892 refactoring 2024-04-02 14:19:09 +02:00
JanNiklas Grabowski 6de4679041 MESSENGER-5892 activate federation with wellknown 2024-03-28 16:47:09 +01:00
JanNiklas Grabowski 571a1a2d00 MESSENGER-5806 bugfix location view shown after deletion 2024-03-27 16:31:11 +01: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
JanNiklas Grabowski 47a720a767 MESSENGER-5556 refactoring 2024-03-20 14:46:38 +01:00
JanNiklas Grabowski 60ca0cab30 MESSENGER-5556 fix maintenance sync 2024-03-20 14:05:18 +01:00
JanNiklas Grabowski 1175c8c208 Merge branch 'feature/5781_fix_trigger_for_federation_decision_sheet_in_room_preview' into 'develop'
MESSENGER-5781 fix trigger for federation decision sheet in room preview

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!337
2024-03-18 12:59:41 +00:00
JanNiklas Grabowski 1d83b8ac16 Merge branch 'feature/5854_foss_merge' into 'develop'
5854 foss merge

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!335
2024-03-18 12:59:15 +00:00
Frank Rotermund 528ed55ae3 MESSENGER-5852 Preparation Release 2.16 fix fotopicker 2024-03-15 07:16:57 +01:00
JanNiklas Grabowski d4e3751d03 MESSENGER-5781 fix trigger for federation decision sheet in room preview 2024-03-14 16:39:32 +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
Arnfried Griesert 5f80a8f2a4 Merge branch 'feature/photos_picker_filter' into 'develop'
Fix in image picker filter to prevent live photos and videos to be picked

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!331
2024-03-06 11:23:26 +00:00
Arnfried Griesert 2c0bd9f5ba Removed obsolete debug output 2024-03-06 08:24:37 +01:00
Arnfried Griesert b6a9d8ba56 Fix in image picker filter to prevent live photos and videos to be picked 2024-03-06 08:12:30 +01:00
JanNiklas Grabowski d6a22fd2ba Merge branch 'feature/feature/5706_fix_alert_triggering_for_new_users' into 'develop'
MESSENGER-5706 fix alert triggering for new users

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!329
2024-03-05 14:20:36 +00:00
JanNiklas Grabowski a2fdb559e7 MESSENGER-5706 fix crash missing wellknown 2024-03-05 11:05:25 +01:00
Frank Rotermund 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
JanNiklas Grabowski aa5982a80e MESSENGER-5706 fix crash missing wellknown 2024-03-05 10:38:27 +01:00
Frank Rotermund 52d40ca517 MESSENGER-5393 some tracking fixes 2024-03-05 08:23:02 +01:00
Frank Rotermund 588030542b MESSENGER-5393 matomo ztracking for federation 2024-03-05 07:36:19 +01:00
Doug 909632e84c Fix a bug where QR codes aren't detected if the camera is too close. (#7762) 2024-03-04 17:17:27 +00:00
JanNiklas Grabowski 1023cfca24 MESSENGER-5706 fix alert triggering for new users 2024-03-04 17:41:35 +01:00
JanNiklas Grabowski 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
Arnfried Griesert 1196cee418 MESSENGER-5695 remove borders from avatar photos 2024-03-04 06:57:19 +00: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 11a27b2346 MESSENGER-5706 refactoring 2024-03-01 14:34:41 +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
Arnfried Griesert 9f6fff8270 Added BWIThemeService helper class 2024-03-01 03:27:14 +01:00
Arnfried Griesert 559eeea1cd Bugfixes and changes from the approval 2024-02-28 16:22:51 +01:00
Arnfried Griesert f3edc3d3a1 Fixed some bugs 2024-02-28 06:26:05 +01:00
JanNiklas Grabowski 3ddb4e4d04 MESSENGER-5706 change appearance and use wellknown 2024-02-27 14:36:30 +01:00
Arnfried Griesert 5025925d3a Check for wellknown and account data flag 2024-02-27 07:36:51 +01:00
Frank Rotermund d07f992659 MESSENGER-5575 decide first ACL event based on state 2024-02-26 14:41:29 +01:00
JanNiklas Grabowski 507eeabf75 MESSENGER-5668 change button appearance key backup 2024-02-23 16:45:48 +01:00
JanNiklas Grabowski d15d8e9f76 MESSENGER-5706 show federation announcement promt 2024-02-22 15:15:29 +01:00
Frank Rotermund 4aaf86e41e MESSENGER-5570 acl status events up to collapsability 2024-02-21 16:50:20 +01:00