Commit Graph

19 Commits

Author SHA1 Message Date
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
Frank Rotermund 588030542b MESSENGER-5393 matomo ztracking for federation 2024-03-05 07:36:19 +01:00
JanNiklas Grabowski ebcb633892 MESSENGER-5706 merge from #5660 and refactoring 2024-03-01 14:06:46 +01: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
JanNiklas Grabowski e68962fe07 MESSENGER-5706 use theme binding 2024-02-27 16:29:00 +01:00
JanNiklas Grabowski 3ddb4e4d04 MESSENGER-5706 change appearance and use wellknown 2024-02-27 14:36:30 +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
JanNiklas Grabowski d15d8e9f76 MESSENGER-5706 show federation announcement promt 2024-02-22 15:15:29 +01:00
JanNiklas Grabowski 04b1f6c53a fix pipeline 2024-02-20 10:37:22 +01:00
JanNiklas Grabowski 09c394a21b MESSENGER-5578 add success alert to federation decision sheet 2024-02-14 17:32:23 +01:00
JanNiklas Grabowski 66e43e69cd MESSENGER-5766 remove remind me later button 2024-02-09 15:06:33 +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
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
JanNiklas Grabowski ba4e145039 MESSENGER-5383 Check alias on acl update 2024-01-30 12:45:05 +01:00
JanNiklas Grabowski 56c544797d refactor set serveracl and fix json key 2024-01-26 13:25:27 +01:00
JanNiklas Grabowski ff4019f2c4 MESSENGER-5304 refactoring and english translation 2024-01-24 12:04:18 +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