Commit Graph

32693 Commits

Author SHA1 Message Date
JanNiklas Grabowski
5d75cef038 MESSENGER-5793 fix text color and theme change 2024-04-02 12:48:30 +02:00
Frank Rotermund
026a1d3ade MESSENGER-5793 simple solution 2024-03-22 13:04:28 +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
Juergen Wischer
01e3255631 Merge branch 'feature/update_renovate_config' into 'develop'
Update renovate.json

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!332
2024-03-18 07:50:31 +00:00
Juergen Wischer
b45a192476 Update renovate.json 2024-03-18 07:50:31 +00:00
Frank Rotermund
089fdf18d1 Merge branch 'release/v2.16.0' into develop 2024-03-15 09:44:58 +01:00
Frank Rotermund
732e5670db Merge branch 'release/5852-releaseprep' into 'release/v2.16.0'
Release/5852 releaseprep

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!338
2024-03-15 08:42:22 +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
Arnfried Griesert
cd7b5eeb95 Merge branch 'feature/5830_hide_password_policy_bum' into 'develop'
MESSENGER-5830 Hide change password requirements

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!334
2024-03-13 14:24:30 +00:00
Frank Rotermund
438c626bfb MESSENGER-5852 Preparation Release 2.16 2024-03-13 14:58:16 +01:00
JanNiklas Grabowski
39d8f63c13 MESSENGER-5854 update element version string 2024-03-12 13:42:07 +01:00
Frank Rotermund
c463376392 Merge branch 'feature/5852_version_jump' into 'develop'
MESSENGER-5852 jump develop version

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!336
2024-03-12 11:41:35 +00:00
Frank Rotermund
263bceb56b MESSENGER-5852 jump develop version 2024-03-12 10:24:49 +01:00
Arnfried Griesert
555ee29643 Hide change password requirements 2024-03-11 12:37:21 +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
7bdaaffebb Merge branch 'feature/5660_introduce_federation' into 'develop'
MESSENGER-5660 fixed colors of page indicator

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!333
2024-03-08 13:53:18 +00:00
Arnfried Griesert
cbe74bc98d TabView indicator points change now their color when system color changed 2024-03-08 12:59:30 +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
Doug
b2f51f2eca Merge branch 'release/1.11.8/master' 2024-03-05 10:19:27 +00:00
Doug
3bef0b9c3a finish version++ 2024-03-05 10:19:27 +00:00
Doug
acbff54886 Merge pull request #7763 from element-hq/release/1.11.8/release
Release 1.11.8
2024-03-05 10:18:53 +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
Doug
138c6eaaf1 version++ 2024-03-05 09:26:37 +00: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
JanNiklas Grabowski
ada28773d9 MESSENGER-5706 fix pipeline 2024-03-04 08:48:14 +01:00
Frank Rotermund
8c67f8f6cd Merge branch 'feature/5695_remove_avatar_photo_borders' into 'develop'
MESSENGER-5695 remove borders from avatar photos

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!319
2024-03-04 06:57:20 +00:00
Arnfried Griesert
1196cee418 MESSENGER-5695 remove borders from avatar photos 2024-03-04 06:57:19 +00:00
Frank Rotermund
9cf8aa24dd Merge branch 'feature/5575_acl_status_in_timeline' into 'develop'
Feature/5575 acl status in timeline

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!327
2024-03-01 21:14:20 +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
db2eb35992 Merge branch 'feature/5715_fix_federation_status_for_invite' into 'develop'
MESSENGER-5715 do not show federation status in room for invited users

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!326
2024-03-01 13:09:59 +00: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
a37e40b4b8 MESSENGER-5706 remove unused appconfig flag 2024-03-01 12:58:40 +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
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
b86d2735e8 Merge branch 'feature/5734_readme_swef' into 'develop'
MESSENGER-5734 SweT kompatible Readme

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!328
2024-03-01 10:38:14 +00:00
Frank Rotermund
c5703f8861 Merge branch 'feature/5575_acl_status_in_timeline' of https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios into feature/5575_acl_status_in_timeline
* 'feature/5575_acl_status_in_timeline' of https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios:
  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-5727 release notes
  MESSENGER-5578 add success alert to federation decision sheet
  MESSENGER-5595 text changes
  MESSENGER-5595 text changes reset whs
  MESSENGER-5766 remove remind me later button
2024-03-01 10:02:38 +01:00
Frank Rotermund
919225cd36 MESSENGER-5575 spelling 2024-03-01 10:02:06 +01:00