338e1946f6
MESSENGER-4699 update element version string
2023-05-31 13:53:21 +02:00
d6fc06ffa1
Merge branch 'feature/1678_add_webview_navigation_policy' into 'develop'
...
MESSENGER-1678 add webview navigation policy
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!120
2023-05-25 14:32:54 +00:00
5370dded66
MESSENGER-1678 add webview navigation policy
2023-05-25 14:32:54 +00:00
1856618c91
Merge branch 'feature/4393_poll_with_visible_participant_p1' into 'develop'
...
Feature/4393 poll with visible participant p1
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!135
2023-05-25 13:52:30 +00:00
260c8de584
Feature/4393 poll with visible participant p1
2023-05-25 13:52:30 +00:00
7da10c3534
Merge branch 'feature/4699_basis_update_element' into develop
...
# Conflicts:
# Podfile
# Riot/Modules/MatrixKit/Utils/MXKTools.m
# Riot/Modules/Pills/PillType.swift
2023-05-23 14:51:49 +02:00
87fee41db4
Merge branch 'hotfix/v2.6.0.1' into develop
2023-05-16 16:14:20 +02:00
025a151b7a
MESSENGER-4697 remove rej file
2023-05-16 16:13:34 +02:00
f321e86357
Merge branch 'release/v2.6.0' into develop
2023-05-16 07:39:06 +02:00
8a132896ec
Merge branch 'release/v2.6.0'
2023-05-16 07:38:56 +02:00
4ccbe422f3
MESSENGER-4697 use cherry picked sdk
2023-05-15 17:08:56 +02:00
0d9f089e35
MESSENGER-4697 matomo select right server after relogin
2023-05-15 17:06:58 +02:00
bb659a71e6
MESSENGER-4697 enable SessionManager in Prod, fix peralink pills fix Matomo config bug when login out
2023-05-15 17:06:25 +02:00
0d1e16bae9
MESSENGER-4699 update sdk version
2023-05-11 13:39:05 +02:00
674a44b702
Merge commit '98594fd01fc18ee18fde60a45542f1b4d7040c41' into feature/4699_basis_update_element
...
* commit '98594fd01fc18ee18fde60a45542f1b4d7040c41': (59 commits)
finish version++
Tidy up event formatter issues.
version++
changelog.d: Upgrade MatrixSDK version ([v0.26.9](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.9 )).
Translated using Weblate (Russian)
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Albanian)
Translated using Weblate (Hungarian)
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (German)
Translated using Weblate (Slovak)
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (Indonesian)
Translated using Weblate (Estonian)
Translated using Weblate (Ukrainian)
Translated using Weblate (Italian)
Translated using Weblate (Chinese (Traditional))
Translated using Weblate (German)
...
# Conflicts:
# Config/AppVersion.xcconfig
# Riot/Utils/EventFormatter.m
# fastlane/Fastfile
2023-05-11 13:19:24 +02:00
b56686d337
MESSENGER-4697 set app version to 2.7.0
2023-05-09 09:02:36 +02:00
21eb1854df
Merge branch 'feature/4697_release_prep' into 'develop'
...
MESSENGER-4697 release prep
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!134
2023-05-09 06:50:39 +00:00
ea0d90cb86
MESSENGER-4697 release prep
2023-05-09 08:44:20 +02:00
690aff3e3c
Merge branch 'feature/dynamic_textfield_colo' into 'develop'
...
Recovery key textfield starts now with gray border
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!133
2023-05-05 11:02:24 +00:00
87a22916c2
Recovery key textfield starts now with gray border
2023-05-05 12:55:48 +02:00
df6278de31
MESSENGER-4646 fix missing matomo button
2023-05-04 08:57:36 +02:00
aa3f30c507
Merge branch 'feature/devicemanager_verify_button_color' into develop
2023-05-04 08:43:24 +02:00
6b173d9dbc
Changed font color for device verification button
2023-05-04 06:57:32 +02:00
4b09f6043a
MESSENGER-4424 only change button when maintenance changed
2023-05-03 18:01:50 +02:00
c986eebece
MESSENGER-4454 get serverurls for maintenance and matomo from the right place
2023-05-03 17:29:48 +02:00
f833d63a5d
MESSENGER-4454 fix for belated analytics config
2023-05-03 14:34:41 +02:00
3923844a15
Merge branch 'feature/4494_reset_matomo_id' into 'develop'
...
MESSENGER-4494 reset matomo instance after logout -> New ID generation
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!132
2023-05-03 11:49:21 +00:00
ac990f69ed
MESSENGER-4424 refactoring
2023-05-03 12:08:48 +02:00
8215d3feef
MESSENGER-4424 fix crash ui changes from background
2023-05-03 12:07:19 +02:00
130813807a
MESSENGER try other source for cocoapods
2023-05-03 10:57:17 +02:00
1a78593302
Merge branch 'feature/4519_voice_over_texte_secure_textfield' into 'develop'
...
Feature/4519 voice over texte secure textfield
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!131
2023-05-03 04:42:05 +00:00
436ae370ba
Feature/4519 voice over texte secure textfield
2023-05-03 04:42:05 +00:00
e577fcb470
Merge branch 'feature/4646_startup_with_empty_homeserver_url' into 'develop'
...
MESSENGER-4646 fix Server URL bugs and avoid using synapse URL before server selection
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!129
2023-05-02 17:34:45 +00:00
5e2e47a361
MESSENGER-4646 fix Server URL bugs and avoid using synapse URL before server selection
2023-05-02 17:34:45 +00:00
8d60b5b9d8
MESSENGER-4494 reset matomo instance after logout -> New ID generation
2023-05-02 18:13:11 +02:00
ce085fb8cc
Merge branch 'feature/4424_blocking_requests' into 'develop'
...
Feature/4424 blocking requests
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!127
2023-05-02 11:01:59 +00:00
6b1b8ca65c
Feature/4424 blocking requests
2023-05-02 11:01:58 +00:00
f860185cd8
Merge branch 'feature/4454_tracking_config' into 'develop'
...
Feature/4454 tracking config
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!128
2023-05-02 10:55:42 +00:00
f81cf36649
Feature/4454 tracking config
2023-05-02 10:55:41 +00:00
160b307b8f
Merge branch 'feature/4516_device_manager_anpassungen' into 'develop'
...
MESSENGER-4516 device manager anpassungen
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!121
2023-04-28 06:28:48 +00:00
4334170650
MESSENGER-4516 device manager anpassungen
2023-04-28 06:28:47 +00:00
98aa23e7a9
Merge branch 'feature/4299_neues_design_eingabefeld' into 'develop'
...
MESSENGER-4299 Neues design Recovery Key Eingabefeld
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!126
2023-04-28 06:11:34 +00:00
c4bd55d73b
MESSENGER-4299 Neues design Recovery Key Eingabefeld
2023-04-28 06:11:34 +00:00
05214e6a37
Merge branch 'feature/4272_add_link_for_unknown_servers' into 'develop'
...
MESSENGER-4272 add advertizement button
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!125
2023-04-27 05:54:49 +00:00
927f321285
MESSENGER-4272 add advertizement button
2023-04-27 05:54:49 +00:00
d9ebf0f1a3
Merge branch 'feature/4518_add_voiceover_description_to_pincode' into 'develop'
...
MESSENGER-4518 add voiceover description
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!124
2023-04-26 13:26:29 +00:00
d382613f88
MESSENGER-4518 add voiceover description
2023-04-25 13:27:37 +02:00
293035879e
Reverted commit '5e8a1ae716425a3179fc2c0d8c333dc5b61fcaf0' ( #4173 ) new fix https://github.com/matrix-org/matrix-ios-sdk/pull/1749
...
updated changelog
2023-04-21 14:22:12 +02:00
1da35c79d8
Merge branch 'feature/4377_onboarding_fehlende_uebersetzung' into 'develop'
...
MESSENGER-4377 onboarding fehlende englische uebersetzungen
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!123
2023-04-20 16:57:36 +00:00
ec3bb673d5
MESSENGER-4377 onboarding fehlende englische uebersetzungen
2023-04-20 16:57:36 +00:00
JanNiklas Grabowski
Frank Rotermund
Arnfried Griesert