Commit Graph

17003 Commits

Author SHA1 Message Date
Frank Rotermund 11bf16ccf5 MESSENGER-3870 small fixes for support urls and downtime ui 2022-12-16 07:43:20 +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 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
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
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
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
Juergen Wischer 232aa4e139 Merge branch 'feature/readme_opencode' into 'develop'
update README.md for opencode

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!58
2022-12-05 21:32:35 +00:00
Jürgen Wischer e3407f4e0d update README.md for opencode 2022-12-05 22:31:13 +01:00
Frank Rotermund 775217c6b0 Merge branch 'feature/3616_privacy_on_login' into 'develop'
Feature/3616 privacy on login

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!57
2022-12-04 10:47:42 +00:00
Frank Rotermund d67c3f49d1 Feature/3616 privacy on login 2022-12-04 10:47:42 +00:00
Frank Rotermund 782f145274 Merge branch 'feature/3662_info_dialog_white_list' into 'develop'
MESSENGER-3662 Infodialog

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!56
2022-12-01 11:11:35 +00:00
Frank Rotermund 8b9f1d1975 MESSENGER-3662 Infodialog 2022-12-01 11:11:35 +00:00
Frank Rotermund a94ec4694f Merge branch 'feature/3707_login_flow_new_designs' into 'develop'
MESSENGER-3707 new login flow and welcome integration

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!55
2022-11-30 17:36:55 +00:00
Frank Rotermund 513720ec8d MESSENGER-3707 new login flow and welcome integration 2022-11-30 18:10:20 +01:00
Frank Rotermund b04ffe22c4 Merge branch 'feature/3717_welcome_experience' into 'develop'
Added welcome experience SwiftUI view

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!53
2022-11-29 10:57:16 +00: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
Arnfried Griesert 61e97ed52f Added welcome experience SwiftUI view 2022-11-28 11:28:58 +01:00
Arnfried Griesert 4eb6e5d993 Changed location sharing credits title and copyright 2022-11-28 05:24:46 +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
Frank Rotermund 29bdbd1b92 Merge branch 'release/v2.0.0' into 'master'
Release 2.0.0

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!50
2022-11-27 13:18:54 +00:00
Frank Rotermund 275f8accc6 Release 2.0.0 2022-11-27 13:18:53 +00:00
Frank Rotermund 28fe19c0f6 MESSENGER-3861 fix for push-local 2022-11-27 14:09:28 +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
Frank Rotermund 6bebd8a0b4 Merge branch 'feature/VersionUpdate' into 'develop'
Version Update

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!49
2022-11-23 15:45:23 +00:00
Frank Rotermund d59e506c9a Version Update 2022-11-23 15:45:23 +00:00
Frank Rotermund ca5b099916 MESSENGER-3861 fix avatar creation for dms and disable side menu coach 2022-11-23 14:16:25 +01:00
Frank Rotermund 965859b0a0 MESSENGER-3861 fix birthday view and pin login on first start && changelogs 2022-11-23 13:43:58 +01:00
Juergen Wischer d80cb57ff3 no https for push-local 2022-11-21 19:51:34 +00:00
Frank Rotermund 323724c8be MESSENGER-3861 better url management && use our poll german texts 2022-11-21 13:59:55 +01:00
Frank Rotermund 486b38b529 MESSENGER-3861 correct url push-local 2022-11-21 07:55:15 +01:00
Frank Rotermund 0103822f6f MESSENGER-3861 Security fix, set lastActiveTime only when pinUnlocked state is reached 2022-11-21 07:52:29 +01:00
Frank Rotermund 258f587bdd Merge branch 'feature/3791_remove_termsofservice' into 'develop'
MESSENGER-3791 remove terms of service for all our apps

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!47
2022-11-18 07:27:12 +00:00
Frank Rotermund 3c7398ba8f MESSENGER-3791 remove terms of service for all our apps 2022-11-18 08:15:17 +01:00
Frank Rotermund 679494241d Merge branch 'feature/3681_second_birthday' into 'develop'
MESSENGER-3681 Updated birthday banner for second anniversary campaign

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!41
2022-11-16 13:32:05 +00:00
Arnfried Griesert bde701af1a MESSENGER-3681 Updated birthday banner for second anniversary campaign 2022-11-16 13:32:04 +00:00
Frank Rotermund bec6ab1789 Merge branch 'bugfix/reset_matomo' into 'develop'
Developer settings can now reset the matomo prompt as before

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!39
2022-11-16 13:31:39 +00:00
Arnfried Griesert 24625dd3b2 Merge branch 'feature/3637_pusher_url' into 'develop'
Feature/3637 pusher url

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!44
2022-11-16 10:28:50 +00:00
Frank Rotermund 946273abc0 Feature/3637 pusher url 2022-11-16 10:28:50 +00:00