felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-12 10:50:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
18,828 Commits 1 Branch 67 Tags
3a5bea740160e2b2ce06ac87808a147f3a7bfa18
Commit Graph

489 Commits

Author SHA1 Message Date
JanNiklas Grabowski b4d4330109 Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' into feature/4260_merge_foss_1_10_2 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
 2023-02-15 14:56:55 +01:00
Doug 6ec3cc7b32 version++ 2023-02-10 11:16:35 +00:00
Arnfried Griesert 4264e3b02f MESSENGER-4034 app icon name 2023-02-08 14:53:45 +00:00
Arnfried Griesert c013098ac9 MESSENGER-3895 qr code login 2023-02-08 12:19:07 +00:00
Frank Rotermund 19ff9e0371 Feature/2821 server maintenance info 2023-02-07 12:48:46 +00:00
Juergen Wischer 359d688a44 add new server 2023-02-07 09:19:36 +00:00
Doug c0310bc98b Prepare for new sprint 2023-02-02 19:27:53 +00:00
Doug a83e8b5e52 Merge branch 'master' into develop 
# Conflicts:
#	Config/AppVersion.xcconfig
 2023-02-02 19:24:51 +00:00
Doug 16b124abf3 changelog.d: Upgrade MatrixSDK version ([v0.25.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.25.0)). 2023-02-02 18:05:50 +00:00
Andy Uhnak 0caab63342 Track crypto sdk being enabled 2023-02-02 17:58:52 +00:00
Andy Uhnak 0bdde0e26c Track crypto sdk being enabled 2023-02-02 17:55:09 +00:00
Andy Uhnak 5aa0ada759 Enable Crypto SDK for production 2023-02-02 16:43:08 +00:00
Andy Uhnak 3614f5ab05 Fix crypto v2 config 2023-02-02 16:43:00 +00:00
Andy Uhnak 246c5a0c45 Reset Crypto SDK on logout 2023-02-02 16:42:56 +00:00
Andy Uhnak ba367d149d Enable Crypto SDK for production 2023-02-02 12:32:14 +00:00
Flescio 67f3401bce Merge pull request #7314 from vector-im/flescio/1040-poll_detail 
Details screen of a poll (PSG-1039)
 2023-02-01 15:46:08 +01:00
Andy Uhnak 8254ca8b99 Fix crypto v2 config 2023-02-01 11:51:52 +00:00
Flavio Alescio d1333a8c45 Merge commit '32beb2393ceb08e585e8d62c145d133d9bba5ce6' into flescio/1040-poll_detail 2023-02-01 10:13:28 +01:00
Andy Uhnak 7352cd479c Reset Crypto SDK on logout 2023-01-31 13:14:47 +00:00
Flavio Alescio bb384f837e added alert to show possible error, improved tests 2023-01-27 17:10:16 +01:00
Doug 4e7ce652d4 Prepare for new sprint 2023-01-26 17:17:21 +00:00
Doug a6e32517b7 version++ 2023-01-26 16:24:32 +00:00
Doug 35cb086a57 Prepare for new sprint 2023-01-24 14:14:07 +00:00
Arnfried Griesert 10e66e2e96 merged release_2_2_0 into develop 2023-01-24 09:24:47 +01:00
Arnfried Griesert 4591cb5685 Minor change in build settings 2023-01-23 16:00:45 +01:00
JanNiklas Grabowski fb92b09f64 MESSENGER-4016 add netiquette 2023-01-23 14:42:33 +00:00
Frank Rotermund b8b6134226 MESSENGER-3790 activate new layout 2023-01-23 13:41:49 +00:00
Anderas 4aee4cef82 Merge pull request #7272 from vector-im/andy/migrate_crypto 
Add labs settings for Crypto SDK
 2023-01-23 09:22:11 +00: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
Andy Uhnak 0feaec0be3 Add labs settings for crypto v2 2023-01-16 12:12:54 +00:00
Frank Rotermund d9057cd0cb Merge commit '0bf30fc7d2f35f80982c2d6cfd5e844de5f798e6' into feature/4068_merge_foss_1_9_15 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile.lock
#	Riot/Assets/de.lproj/Localizable.strings
#	Riot/Modules/Room/RoomViewController.m
#	RiotNSE/NotificationService.swift
#	fastlane/Fastfile
 2023-01-16 12:11:51 +01:00
Alfonso Grillo 2a5bcf9f44 Update build setting 2023-01-13 16:40:40 +01:00
Alfonso Grillo 5b47b99dce Add poll history in room’s settings 2023-01-12 10:42:56 +01:00
Arnfried Griesert 6886a1de4f Enable cross signing 2023-01-10 21:11:52 +01:00
Doug 9b566419f0 Prepare for new sprint 2023-01-10 16:50:20 +00:00
Doug bbfbb924c9 changelog.d: Upgrade MatrixSDK version ([v0.24.7](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.7)). 2023-01-10 14:13:24 +00:00
Frank Rotermund 174cc1a839 Merge branch 'feature/3977_merge_element_1_9_13' into develop 2023-01-02 12:07:54 +01: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 635061f66e MESSENGER-3870 use new_features html from settings 2022-12-14 15:38:43 +01:00
Frank Rotermund d67c3f49d1 Feature/3616 privacy on login 2022-12-04 10:47:42 +00:00
Frank Rotermund 513720ec8d MESSENGER-3707 new login flow and welcome integration 2022-11-30 18:10:20 +01:00
ismailgulek 4bc9cc47bb Prepare for new sprint 2022-11-29 19:52:26 +03: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
Frank Rotermund 01db5e6af0 Merge branch 'release/v2.0.0' into develop 
# Conflicts:
#	Config/BWIBuildSettings.swift
 2022-11-27 14:37:48 +01:00
Arnfried Griesert fb44a1ed37 Merge branch 'develop' of https://dl-gitlab.devopslab.tech/bwmessenger/bundesmessenger/bundesmessenger-ios into develop 2022-11-25 08:19:06 +01:00
Arnfried Griesert 6c69ec2c41 Fixes the location sharing problem 2022-11-25 08:17:21 +01:00