Commit Graph

5055 Commits

Author SHA1 Message Date
Arnfried Griesert 3b8a3d9bce Changes in new features and build settings 2023-01-17 12:33:12 +01: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
Arnfried Griesert 6285b3c1b9 MESSENGER-3418 text changes chrosssigning 2023-01-11 13:11:20 +00:00
Arnfried Griesert c6a2684926 Bugfixes 2023-01-10 21:10:42 +01: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
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
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 267ee30ecb MESSENGER-3870 buildfix master 2022-12-14 22:23:14 +01: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
Frank Rotermund 635061f66e MESSENGER-3870 use new_features html from settings 2022-12-14 15:38:43 +01:00
Arnfried Griesert 713e078295 MESSENGER-3648 Second Lottie Animation 2022-12-13 14:06:56 +00: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
Gil Eluard 5a72ae2cad Turn on Threads for all users 2022-12-12 16:43:06 +01:00
Gil Eluard dd48718abe 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 1254d12a51 Thread preview doesn't update in main timeline
- Fixed
2022-12-09 14:58:07 +01:00
Alfonso Grillo b2f362892d Add badge threshold logic 2022-12-07 14:53:28 +01:00
Phl-Pro 788c3e1a8f 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 2e58d5ad80 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 9104af5d05 Change fatal error range 2022-12-05 16:29:14 +00:00
Phl-Pro b8d23a7e84 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 d67c3f49d1 Feature/3616 privacy on login 2022-12-04 10:47:42 +00:00
Philippe Loriaux 6abdcc6740 Update last PR comment 2022-12-02 18:22:58 +01:00
Philippe Loriaux db97d1d94b Fix PR comments 2022-12-02 17:45:24 +01:00
Philippe Loriaux 8813ca3a42 Update RoomDataSource init finalization to fix peeking case 2022-12-02 16:31:34 +01:00
Philippe Loriaux f5889bfb6f Add the last sequence number in the paused/stopped state event 2022-12-02 16:26:34 +01:00
Philippe Loriaux 76936e0e7c Remove the voice broadcast chunks from the attachments list 2022-12-02 11:51:33 +01:00
Frank Rotermund 513720ec8d MESSENGER-3707 new login flow and welcome integration 2022-11-30 18:10:20 +01:00
Velin92 f544025b7c 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 bb5070d6e1 fix for 7130 ? 2022-11-30 15:37:00 +01:00
Mauro Romito 4f425b2c5c better fix for iPhone 14 2022-11-30 14:04:38 +01:00
Mauro Romito 359c69fd4f fix for iPhone 14 2022-11-30 13:41:08 +01:00
Mauro Romito 4584d93312 fix for iOS 15 fullscreen mode not working 2022-11-30 13:27:07 +01:00
Alfonso Grillo afe965e5d3 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 16a1c5d472 spacing improvement from bottom in plain text mode 2022-11-29 19:13:49 +01:00
Mauro Romito 54019d0c2f fix 2022-11-29 12:10:29 +01:00
Frank Rotermund 4f210be870 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 f301054ceb MESSENGER-3915 Settings for BuM builds 2022-11-29 10:56:40 +00:00
Frank Rotermund c30040c3a8 Feature/3732 pin login in new login flow 2022-11-29 10:56:18 +00:00
Andy Uhnak 3ae3271be2 Do not retry initial sync on fatal errors 2022-11-29 10:15:05 +00:00
Phl-Pro f1fb0d29d8 Merge branch 'develop' into phlpro/voicebroadcast-display-playback-duration 2022-11-28 09:12:03 +01:00
Alfonso Grillo f83413277a Refactor badge logic 2022-11-28 09:03:22 +01:00
Frank Rotermund 01db5e6af0 Merge branch 'release/v2.0.0' into develop
# Conflicts:
#	Config/BWIBuildSettings.swift
2022-11-27 14:37:48 +01:00