Commit Graph

93 Commits

Author SHA1 Message Date
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 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
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
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 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
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
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
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
JanNiklas Grabowski 0b0bec559d MESSENGER-5595 text changes 2024-02-14 15:39:34 +01:00
JanNiklas Grabowski 01c5e038bc MESSENGER-5595 text changes reset whs 2024-02-12 16:03:13 +01:00
JanNiklas Grabowski e4ca351f31 MESSENGER-5304 add room federation decision sheet 2024-01-23 16:11:04 +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
Frank Rotermund b6b0378030 MESSENGER-5379 removed unused label 2024-01-09 11:22:54 +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 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 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
Frank Rotermund b255b67f86 MESSENGER-5148 Restore Backup option 2023-11-14 12:56:34 +01:00
JanNiklas Grabowski a213954135 MESSENGER-5203 add federation to lab settings and refactor 2023-11-02 15:35:25 +01:00
JanNiklas Grabowski f2b54ae973 MESSENGER-5159 text changes 2023-10-04 11:46:02 +02:00
JanNiklas Grabowski 2fb988a45b MESSENGER-5159 add releasenotes 2023-09-29 13:42:16 +02:00
JanNiklas Grabowski cbcd169638 add localized strings 2023-09-15 13:46:16 +02:00
JanNiklas Grabowski 52e03cd83b fix pipeline 2023-09-15 12:15:22 +02:00
Frank Rotermund 31f70e749f Feature/4976 ignore blocking maintenance 2023-08-22 12:02:43 +00:00
JanNiklas Grabowski 1eb66fd37e MESSENGER-4882 changelog and fixes 2023-07-04 15:16:20 +02:00
Frank Rotermund f70e354f75 MESSENGER-4682 imprint from wellknown (and fix lab feature list) 2023-06-22 09:48:24 +00:00
JanNiklas Grabowski c9296cc3a9 Merge branch 'feature/4710_manual_verification' into 'develop'
MESSENGER-4710 remove any possibility to self verifiy with old device manager

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!147
2023-06-21 09:36:53 +00:00
Frank Rotermund 0b9ce524ab MESSENGER-4710 remove any possibility to self verifiy with old device manager 2023-06-19 16:10:12 +02:00
JanNiklas Grabowski d0d0e45bdc MESSENGER-4742 fix permalink info when room is not available 2023-06-16 17:01:12 +02:00
Frank Rotermund c02589aaaf MESSENGER-3539 prevent logout and error popup when logging out 2023-06-15 07:40:58 +02:00
JanNiklas Grabowski f8348a66d0 Feature/4772 add accessibility declaration 2023-06-14 06:14:17 +00:00