Commit Graph

29437 Commits

Author SHA1 Message Date
Jürgen Wischer
dc006f5146 update README.md for opencode 2022-12-05 22:31:13 +01:00
Frank Rotermund
6773b0a438 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
b23657a4a1 Feature/3616 privacy on login 2022-12-04 10:47:42 +00:00
Frank Rotermund
3ea3cfd4cf 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
068eaba5b4 MESSENGER-3662 Infodialog 2022-12-01 11:11:35 +00:00
Frank Rotermund
a2fcf22f0d 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
23021f6cbb MESSENGER-3707 new login flow and welcome integration 2022-11-30 18:10:20 +01:00
Frank Rotermund
a37881ff16 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
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
Arnfried Griesert
bbcb249cc6 Added welcome experience SwiftUI view 2022-11-28 11:28:58 +01:00
Arnfried Griesert
89a98e94be Changed location sharing credits title and copyright 2022-11-28 05:24:46 +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
dedd72f0fe MESSENGER-3861 fix for push-local 2022-11-27 14:09:28 +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
Frank Rotermund
87722a9fee 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
ad96ec7631 Version Update 2022-11-23 15:45:23 +00:00
Frank Rotermund
6b903acc03 MESSENGER-3861 fix avatar creation for dms and disable side menu coach 2022-11-23 14:16:25 +01:00
Frank Rotermund
e334906ba6 MESSENGER-3861 fix birthday view and pin login on first start && changelogs 2022-11-23 13:43:58 +01:00
Juergen Wischer
28c94400f7 no https for push-local 2022-11-21 19:51:34 +00:00
Frank Rotermund
226feb8cf1 MESSENGER-3861 better url management && use our poll german texts 2022-11-21 13:59:55 +01:00
Frank Rotermund
f37c28021d MESSENGER-3861 correct url push-local 2022-11-21 07:55:15 +01:00
Frank Rotermund
21e3e38979 MESSENGER-3861 Security fix, set lastActiveTime only when pinUnlocked state is reached 2022-11-21 07:52:29 +01:00
Frank Rotermund
2c2f0fa51a 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
0e98a8aa67 MESSENGER-3791 remove terms of service for all our apps 2022-11-18 08:15:17 +01:00
Frank Rotermund
023226b0e2 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
02a0b64ec6 MESSENGER-3681 Updated birthday banner for second anniversary campaign 2022-11-16 13:32:04 +00:00
Frank Rotermund
6a1eb20e93 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
5b0e259f78 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
12a982724f Feature/3637 pusher url 2022-11-16 10:28:50 +00:00
Frank Rotermund
8a1987d5f8 Merge branch 'feature/3880_pdf_sharing' into 'develop'
MESSENGER-3880 disallow pdf sharing

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!46
2022-11-15 15:39:43 +00:00
Frank Rotermund
ffc74789ec MESSENGER-3880 disallow pdf sharing 2022-11-15 16:28:42 +01:00
Frank Rotermund
1f3729feec Merge branch 'feature/ChatBubble_tests' into 'develop'
PSB-196 fix message bubbles by removing timestamps

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!45
2022-11-15 15:12:07 +00:00
Frank Rotermund
ab8c98183d PSB-196 fix message bubbles by removing timestamps 2022-11-15 15:26:53 +01:00
Arnfried Griesert
3a6c5d5b9f Merge branch 'feature/3624_help_and_support' into develop 2022-11-11 16:07:12 +01:00
Arnfried Griesert
c0a1220065 Build settings for support html file 2022-11-11 16:00:53 +01:00
Frank Rotermund
c272727142 Merge branch 'feature/3703_testing' into 'develop'
MESSENGER-3703 nexus config for bum

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!43
2022-11-10 12:28:40 +00:00
Frank Rotermund
631c6f3a92 MESSENGER-3703 nexus config for bum 2022-11-10 13:27:55 +01:00
Frank Rotermund
b99af89025 Merge branch 'feature/3624_help_and_support' into 'develop'
MESSENGER-3624 Changed support screen text

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!42
2022-11-10 07:32:23 +00:00
Arnfried Griesert
87d0ba755e MESSENGER-3624 Changed support screen text 2022-11-10 07:32:23 +00:00
Arnfried Griesert
3eaf1e086b Small navigation bar title for support screen 2022-11-10 06:44:53 +01:00
Arnfried Griesert
4a410d06b1 Changed support screen text 2022-11-10 06:33:29 +01:00
Frank Rotermund
c0f119a4cb Merge branch 'feature/3703_whitelist' into 'develop'
MESSENGER-3703 add environment

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!40
2022-11-07 06:49:28 +00:00
Frank Rotermund
06ed6991e4 MESSENGER-3703 add environment 2022-11-07 07:48:14 +01:00
Frank Rotermund
286d7ca4c8 Merge branch 'feature/3746_merge_element_1.9.10' into develop 2022-11-03 16:34:35 +01:00
Frank Rotermund
3457f643c4 MESSENGER-3746 Fix for mention pills 2022-11-03 16:19:20 +01:00
Arnfried Griesert
6855db0585 Developer settings can now reset the matomo prompt as before 2022-11-03 15:35:40 +01:00
Frank Rotermund
5c32e29600 MESSENGER-3746 Buildability 2022-11-02 15:34:46 +01:00