felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-11 10:25:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
17,963 Commits 1 Branch 67 Tags
17fd93cd3d89cdc5ce8d701321a8f1d4d545f05f
Commit Graph

17963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
Gil Eluard 5a72ae2cad Turn on Threads for all users 2022-12-12 16:43:06 +01:00
Gil Eluard 49c32091a2 Merge pull request #7153 from vector-im/gil/Use_cross-platform_consistent_naming_for_threads_in_labs 
Use cross-platform consistent naming for threads in labs
 2022-12-12 10:42:54 +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 8e3acb8430 Use cross-platform consistent naming for threads in labs 2022-12-09 15:10:41 +01:00
Gil Eluard 1254d12a51 Thread preview doesn't update in main timeline 
- Fixed
 2022-12-09 14:58:07 +01:00
Ekaterina Gerasimova 73548c04b0 Update project board IDs for automation 
"PN-" prefixed IDs are no longer working, update to new IDs
 2022-12-09 13:18:41 +00:00
Doug a819413f56 Update ruby gems. 2022-12-09 12:29:10 +00:00
Hugh Nimmo-Smith 818ebfb3cd Merge pull request #7142 from vector-im/hughns/qr-device-race 2022-12-08 16:48:57 +00:00
Frank Rotermund cf900a0f27 Merge branch 'feature/3710_fix_icon_and_text' into 'develop' 
MESSENGER-3710 Layout and text fixes

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!60
 2022-12-08 11:09:56 +00:00
Anderas 55d84a49f6 Merge pull request #7141 from vector-im/andy/todevice-id 
Add message id for to-device events
 2022-12-08 10:54:24 +00:00
Frank Rotermund 90ead59c71 MESSENGER-3710 Layout and text fixes 2022-12-08 11:47:21 +01:00
Frank Rotermund 7fa2dd0ec7 Merge branch 'feature/3717_fix_dark_mode' into 'develop' 
MESSENGER-3717 Ignore Safearea for all white screen background in darkmode

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!59
 2022-12-08 07:28:15 +00:00
Frank Rotermund d0c56eb4d6 MESSENGER-3717 Ignore Safearea for all white screen background in darkmode 2022-12-08 08:12:20 +01:00
Hugh Nimmo-Smith 8064ee7a0d Changelog 2022-12-07 15:42:50 +00:00
Hugh Nimmo-Smith b69aa1d5b2 Download device keys for self prior to verification checks 2022-12-07 15:39:35 +00:00
Andy Uhnak 1ba730f49d Add message id for to-device events 2022-12-07 14:34:27 +00:00
Alfonso Grillo 52d71945a8 Add changelog.d file 2022-12-07 14:57:43 +01:00
Alfonso Grillo b2f362892d Add badge threshold logic 2022-12-07 14:53:28 +01:00
Alfonso Grillo 131010be2a Merge pull request #7138 from vector-im/alfogrillo/unverified_sessions_refinements 
Update unverifiable sessions copies (PSG-1002)
 2022-12-06 15:34:30 +01:00