Commit Graph

17982 Commits

Author SHA1 Message Date
Arnfried Griesert d85fdc1c6f Hide navigation bar on launch screen 2023-01-23 12:59:04 +01:00
Frank Rotermund cf6ed6241e MESSENGER-4073 fix version of html formatter package 2023-01-20 16:02:22 +01:00
Arnfried Griesert 7a11ef776b fixed merge issues 2023-01-19 16:13:43 +01:00
Arnfried Griesert 3b8a3d9bce Changes in new features and build settings 2023-01-17 12:33:12 +01:00
Arnfried Griesert cbc4903e34 Updated element version to 1.9.14 2023-01-16 14:03:41 +01:00
Frank Rotermund 48cebfcfc5 Merge branch 'feature/4078_permalink_improvements' into 'develop'
MESSENGER-4078 permalinks only in open rooms, better texts and icons

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!73
2023-01-16 07:15:27 +00:00
Frank Rotermund cc5a9ed847 MESSENGER-4078 permalinks only in open rooms, better texts and icons 2023-01-16 08:06:13 +01:00
Arnfried Griesert c962a16917 merged develop into feature_3418_text_changes_chrosssigning 2023-01-11 15:29:03 +01:00
Arnfried Griesert 05e9eb846d Scan verification screen shows again the old icon instead of the activity indicator 2023-01-11 15:21:52 +01:00
Frank Rotermund 9d6b348812 Merge branch 'feature/4032_disable_thread_functions' into 'develop'
MESSENGER-4032 disable thread options

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!72
2023-01-11 13:26:13 +00:00
JanNiklas Grabowski b959345067 MESSENGER-4032 disable thread options 2023-01-11 13:26:13 +00:00
Frank Rotermund 314bee6dca Merge branch 'feature/3418_text_changes_chrosssigning' into 'develop'
MESSENGER-3418 text changes chrosssigning

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!69
2023-01-11 13:11:20 +00:00
Arnfried Griesert 6285b3c1b9 MESSENGER-3418 text changes chrosssigning 2023-01-11 13:11:20 +00:00
Arnfried Griesert 6886a1de4f Enable cross signing 2023-01-10 21:11:52 +01:00
Arnfried Griesert c6a2684926 Bugfixes 2023-01-10 21:10:42 +01:00
Frank Rotermund c1f7d20bdd Merge branch 'feature/4030_disable_empty_direct_message' into 'develop'
MESSENGER-4030 and MESSENGER-4031 creation of multiple dms with one user...

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!70
2023-01-10 14:37:37 +00:00
JanNiklas Grabowski 17fd93cd3d MESSENGER-4030 and MESSENGER-4031 creation of multiple dms with one user... 2023-01-10 14:37:37 +00:00
Arnfried Griesert ac15bc7b9e Added two missing translations in alerts 2023-01-09 14:00:37 +01:00
Arnfried Griesert 43f0ff009c Replaced icon with activity indicator 2023-01-09 07:11:54 +01:00
Arnfried Griesert 4856539f23 Changed text 2023-01-09 07:11:25 +01:00
Arnfried Griesert ed5365027b Merge branch 'feature/4008_static_location_copyright_fix' into 'develop'
MESSENGER-4008 add clickable copyright to staticlocationview

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!68
2023-01-04 10:49:35 +00:00
Frank Rotermund 057369d0f0 MESSENGER-4008 add clickable copyright to staticlocationview 2023-01-04 08:29:53 +01:00
Frank Rotermund 174cc1a839 Merge branch 'feature/3977_merge_element_1_9_13' into develop 2023-01-02 12:07:54 +01:00
Frank Rotermund 62586f4892 MESSENGER-3977 disable Threadpopup if threads are disabled 2023-01-02 11:42:21 +01:00
Frank Rotermund a81b7a1da2 MESSENGER-3977 Buildability with XCode 14.2 2023-01-02 07:51:38 +01:00
Juergen Wischer bed48b5b57 fixed typo and app store link in README.md 2022-12-22 13:51:37 +00:00
Arnfried Griesert 64796c2c9c Minor changes 2022-12-19 14:46:22 +01:00
Frank Rotermund 67dd4f918e Merge commit '35b2fdc538dfc1f8fac2585704526ab26148a9ab' into feature/3977_merge_element_1_9_13
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.swift
#	Riot/Modules/LaunchLoading/LaunchLoadingView.xib
#	Riot/Modules/MatrixKit/Models/Account/MXKAccount.m
#	Riot/Modules/MatrixKit/Models/Room/MXKRoomBubbleCellData.m
#	Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
#	Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
#	Riot/Modules/TabBar/MasterTabBarController.m
#	fastlane/Fastfile
2022-12-19 14:36:30 +01:00
Frank Rotermund d85f25d449 Merge branch 'hotfix/v2.1.2' into develop 2022-12-16 07:45:59 +01:00
Frank Rotermund d2e1a92bb0 MESSENGER-3870 revert to old icon 2022-12-16 07:44:01 +01:00
Frank Rotermund 11bf16ccf5 MESSENGER-3870 small fixes for support urls and downtime ui 2022-12-16 07:43:20 +01:00
Frank Rotermund 0ed8648b2b Merge branch 'develop' of https://dl-gitlab.devopslab.tech/bwmessenger/bundesmessenger/bundesmessenger-ios into develop
# Conflicts:
#	CHANGES_BWI.md
2022-12-14 22:42:22 +01:00
Frank Rotermund 6ef2aecb1c Merge branch 'hotfix/v2.1.1' into develop 2022-12-14 22:25:23 +01:00
Frank Rotermund c87853dc53 Merge branch 'hotfix/v2.1.1' 2022-12-14 22:25:00 +01:00
Frank Rotermund 267ee30ecb MESSENGER-3870 buildfix master 2022-12-14 22:23:14 +01:00
Frank Rotermund 821fba0ce7 Merge branch 'release/v2.1.0' into 'develop'
Release/v2.1.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!65
2022-12-14 20:09:25 +00:00
Frank Rotermund 79608a582c Release/v2.1.0 2022-12-14 20:09:25 +00:00
Frank Rotermund 00f92981ca Merge branch 'release/v2.1.0'
# Conflicts:
#	Config/AppVersion.xcconfig
#	Config/BWIBuildSettings.swift
#	Config/BuM-Beta/BWIBuildSettings+BuM-Beta.swift
#	Config/BuM/BWIBuildSettings+BuM.swift
#	Podfile
#	Podfile.lock
#	Riot/Assets/de.lproj/Bwi.strings
#	Riot/Assets/en.lproj/Bwi.strings
#	Riot/Assets/new_features.html
#	Riot/Modules/Room/RoomViewController.m
#	RiotSwiftUI/Modules/Authentication/Login/View/AuthenticationLoginScreen.swift
#	bwi/LottieAnimation/BUMLaunchLoadingViewController.swift
#	fastlane/Fastfile_bum
2022-12-14 20:55:55 +01:00
Arnfried Griesert a8cf604873 New features html and text change for polls 2022-12-14 17:27:15 +01:00
Frank Rotermund 3249efee1a MESSENGER-3870 changes in 2.1.0 2022-12-14 15:39:17 +01:00
Frank Rotermund 635061f66e MESSENGER-3870 use new_features html from settings 2022-12-14 15:38:43 +01:00
Frank Rotermund 256c2010a0 Merge branch 'feature/3648_second_lotti_animation' into 'develop'
MESSENGER-3648 Second Lottie Animation

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!62
2022-12-13 14:06:57 +00:00
Arnfried Griesert 713e078295 MESSENGER-3648 Second Lottie Animation 2022-12-13 14:06:56 +00:00
Stefan Ceriu 35b2fdc538 Merge pull request #7162 from vector-im/release/1.9.14/release
Release 1.9.14
2022-12-13 15:47:21 +02:00
Stefan Ceriu dec177de30 version++ 2022-12-13 15:46:42 +02:00
Stefan Ceriu 2a580fb320 changelog.d: Upgrade MatrixSDK version ([v0.24.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.6)). 2022-12-13 15:46:42 +02:00
Alfonso Grillo cf5ddc191d Merge pull request #7140 from vector-im/alfogrillo/badge_threshold
Add threshold for unread messages in all the spaces
2022-12-13 13:38:56 +01:00
Arnfried Griesert 241d2fd778 Merge branch 'feature/3954_beta_bum_logo' into 'develop'
AppIcons replaced with beta banners

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!63
2022-12-13 10:37:38 +00:00
Arnfried Griesert d92031c6d4 AppIcons replaced with beta banners 2022-12-13 11:16:34 +01:00
Gil Eluard d4bf6f2ea6 Merge pull request #7157 from vector-im/gil/7156-Turn_on_Threads_for_all_users 2022-12-12 19:48:40 +01:00