Commit Graph

9331 Commits

Author SHA1 Message Date
Frank Rotermund 4970a16ff0 MESSENGER-3977 Buildability with XCode 14.2 2023-01-02 07:51:38 +01:00
Frank Rotermund 0fca000b8d Merge commit '3d672a05b2a7117ade2e4e87bd2b5762063d7922' 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 d1d8b58cb2 MESSENGER-3870 buildfix master 2022-12-14 22:23:14 +01:00
Frank Rotermund dc29bd3dd1 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
Frank Rotermund aee59588bd MESSENGER-3870 use new_features html from settings 2022-12-14 15:38:43 +01:00
Arnfried Griesert 12768af2a6 MESSENGER-3648 Second Lottie Animation 2022-12-13 14:06:56 +00:00
Alfonso Grillo adafb4eb27 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
Gil Eluard bf8fdb1d3c Turn on Threads for all users 2022-12-12 16:43:06 +01:00
Gil Eluard 720d74b428 Merge pull request #7152 from vector-im/gil/7151-Thread_preview_doesnt_update_in_main_timeline
Thread preview doesn't update in main timeline
2022-12-09 15:55:59 +01:00
Gil Eluard 79bd2c0ef1 Thread preview doesn't update in main timeline
- Fixed
2022-12-09 14:58:07 +01:00
Alfonso Grillo 32a4c63220 Add badge threshold logic 2022-12-07 14:53:28 +01:00
Phl-Pro f56b96f6e6 Merge pull request #5644 from vector-im/phlpro/fix_peeking
Update RoomDataSource init finalization to fix peeking case
2022-12-06 09:21:07 +01:00
Anderas 073a175388 Merge pull request #7115 from vector-im/andy/mandatory_crypto
Do not retry initial sync on fatal errors
2022-12-05 17:48:42 +00:00
Andy Uhnak cb26a5f3f3 Change fatal error range 2022-12-05 16:29:14 +00:00
Phl-Pro a872fa340e Merge pull request #7136 from vector-im/phlpro/voicebroadcast_last_sequence_number
[VoiceBroadcast] Add the last sequence number in the paused/stopped state event
2022-12-05 08:19:56 +01:00
Frank Rotermund b23657a4a1 Feature/3616 privacy on login 2022-12-04 10:47:42 +00:00
Philippe Loriaux c3b8eca994 Update last PR comment 2022-12-02 18:22:58 +01:00
Philippe Loriaux fb10fbe4fb Fix PR comments 2022-12-02 17:45:24 +01:00
Philippe Loriaux 9663c6ada9 Update RoomDataSource init finalization to fix peeking case 2022-12-02 16:31:34 +01:00
Philippe Loriaux b1c18b2792 Add the last sequence number in the paused/stopped state event 2022-12-02 16:26:34 +01:00
Philippe Loriaux d6d5cabc0d Remove the voice broadcast chunks from the attachments list 2022-12-02 11:51:33 +01:00
Frank Rotermund 23021f6cbb MESSENGER-3707 new login flow and welcome integration 2022-11-30 18:10:20 +01:00
Velin92 e0075abbd5 Merge pull request #7127 from vector-im/mauroromito/design_improvements_2
Rich Text Editor: Design Improvements
2022-11-30 16:30:41 +01:00
Mauro Romito ffa19f24d4 fix for 7130 ? 2022-11-30 15:37:00 +01:00
Mauro Romito 8960197329 better fix for iPhone 14 2022-11-30 14:04:38 +01:00
Mauro Romito 7bb758ad3e fix for iPhone 14 2022-11-30 13:41:08 +01:00
Mauro Romito a7953c092b fix for iOS 15 fullscreen mode not working 2022-11-30 13:27:07 +01:00
Alfonso Grillo d10d382578 Merge pull request #7088 from vector-im/alfogrillo/badges_spaces
Add badge in spaces button (PSG-966)
2022-11-30 10:22:25 +01:00
Mauro Romito 2bb8f97992 spacing improvement from bottom in plain text mode 2022-11-29 19:13:49 +01:00
Mauro Romito 15a00ba9f9 fix 2022-11-29 12:10:29 +01:00
Frank Rotermund 7650dd825a Merge branch 'feature/3915_default_settings_bum_release' into 'develop'
MESSENGER-3915 Settings for BuM builds

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!52
2022-11-29 10:56:41 +00:00
Arnfried Griesert 52bd3752bb MESSENGER-3915 Settings for BuM builds 2022-11-29 10:56:40 +00:00
Frank Rotermund cb78e6d70f Feature/3732 pin login in new login flow 2022-11-29 10:56:18 +00:00
Andy Uhnak c28b57ae4a Do not retry initial sync on fatal errors 2022-11-29 10:15:05 +00:00
Phl-Pro 0a77be1c47 Merge branch 'develop' into phlpro/voicebroadcast-display-playback-duration 2022-11-28 09:12:03 +01:00
Alfonso Grillo 183a7378aa Refactor badge logic 2022-11-28 09:03:22 +01:00
Frank Rotermund 1e406da25f Merge branch 'release/v2.0.0' into develop
# Conflicts:
#	Config/BWIBuildSettings.swift
2022-11-27 14:37:48 +01:00
Frank Rotermund 0dc8ec0982 Release 2.0.0 2022-11-27 13:18:53 +00:00
Frank Rotermund dedd72f0fe MESSENGER-3861 fix for push-local 2022-11-27 14:09:28 +01:00
Yoan Pintas 0cb4e69f05 Support voice broadcast live playback (#7094) 2022-11-25 20:59:34 +01:00
Philippe Loriaux e0e4c81eef Remove useless error states 2022-11-25 16:27:24 +01:00
Philippe Loriaux 316fbd24d3 Add VBAggregatorLaunchState in Aggregator 2022-11-25 15:23:52 +01:00
Alfonso Grillo 38593f1a4d Merge branch 'develop' into alfogrillo/badges_spaces 2022-11-25 10:53:48 +01:00
Phl-Pro 5e5272ad03 Merge pull request #7103 from vector-im/phlpro/voicebroadcast_left_time
Add the left time in the Voice Broadcast tile recorder
2022-11-25 09:28:21 +01:00
Arnfried Griesert 0d109bb6f6 Merge branch 'develop' of https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios into develop 2022-11-25 08:19:06 +01:00
Arnfried Griesert ce49b69abf Fixes the location sharing problem 2022-11-25 08:17:21 +01:00
Anderas 9442f305ee Merge pull request #7101 from vector-im/andy/sync_progress
Display sync progress on the loading screen
2022-11-24 15:47:07 +00:00
Frank Rotermund ad96ec7631 Version Update 2022-11-23 15:45:23 +00:00
Philippe Loriaux 0d940098f1 Fix scroll issues with VoiceBroadcastPlayback cells (by fixing SizableBaseRoomCell) 2022-11-23 14:48:54 +01:00
Frank Rotermund 6b903acc03 MESSENGER-3861 fix avatar creation for dms and disable side menu coach 2022-11-23 14:16:25 +01:00