 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
|
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 |
|
|
Frank Rotermund
|
4510f99412
|
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
|
f4d1aac5f5
|
MESSENGER-3880 disallow pdf sharing
|
2022-11-15 16:28:42 +01:00 |
|
|
Frank Rotermund
|
8135dad5cd
|
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
|
ef1294f0cb
|
PSB-196 fix message bubbles by removing timestamps
|
2022-11-15 15:26:53 +01:00 |
|
|
Arnfried Griesert
|
7b289532f2
|
Merge branch 'feature/3624_help_and_support' into develop
|
2022-11-11 16:07:12 +01:00 |
|
|
Arnfried Griesert
|
662b64741d
|
Build settings for support html file
|
2022-11-11 16:00:53 +01:00 |
|
|
Frank Rotermund
|
f1fba3543d
|
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
|
5bfa62b21d
|
MESSENGER-3703 nexus config for bum
|
2022-11-10 13:27:55 +01:00 |
|
|
Frank Rotermund
|
23ad9cac63
|
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
|
f0a922d33e
|
MESSENGER-3624 Changed support screen text
|
2022-11-10 07:32:23 +00:00 |
|
|
Arnfried Griesert
|
7e26cf091c
|
Small navigation bar title for support screen
|
2022-11-10 06:44:53 +01:00 |
|
|
Arnfried Griesert
|
24d2f51c85
|
Changed support screen text
|
2022-11-10 06:33:29 +01:00 |
|
|
Frank Rotermund
|
ed2999ce84
|
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
|
aaf450091c
|
MESSENGER-3703 add environment
|
2022-11-07 07:48:14 +01:00 |
|
|
Frank Rotermund
|
3c07f6450c
|
Merge branch 'feature/3746_merge_element_1.9.10' into develop
|
2022-11-03 16:34:35 +01:00 |
|
|
Frank Rotermund
|
74c8d2ae8e
|
MESSENGER-3746 Fix for mention pills
|
2022-11-03 16:19:20 +01:00 |
|
|
Arnfried Griesert
|
2cd6e588ef
|
Developer settings can now reset the matomo prompt as before
|
2022-11-03 15:35:40 +01:00 |
|
|
Frank Rotermund
|
5dc63d1c54
|
MESSENGER-3746 Buildability
|
2022-11-02 15:34:46 +01:00 |
|
|
Frank Rotermund
|
f4ca302faa
|
Merge commit 'ace42be63764c1f1aec82d6e3448ca8980adc784' into feature/3746_merge_element_1.9.10
# Conflicts:
# Config/AppConfiguration.swift
# Config/AppVersion.xcconfig
# Podfile.lock
# Riot/Modules/Application/AppCoordinator.swift
# Riot/Modules/Common/Avatar/AvatarView.swift
# Riot/Modules/Room/TimelineCells/Styles/Bubble/BubbleRoomTimelineCellProvider.m
# Riot/Modules/Room/TimelineCells/Styles/Plain/PlainRoomTimelineCellProvider.m
# Riot/Modules/Settings/Security/SecurityViewController.m
# Riot/Modules/Settings/SettingsViewController.m
# Riot/Modules/TabBar/TabBarCoordinator.swift
# Riot/target.yml
# fastlane/Fastfile
# project.yml
|
2022-11-02 14:05:36 +01:00 |
|
|
Arnfried Griesert
|
884ece924b
|
Merge branch 'develop' of https://dl-gitlab.devopslab.tech/bwmessenger/bundesmessenger/bundesmessenger-ios into develop
|
2022-11-02 05:21:28 +01:00 |
|
 gulekismail
|
ace42be637
|
Merge branch 'release/1.9.10/master'
|
2022-11-01 14:17:01 +03:00 |
|