JanNiklas Grabowski
97243bc063
Merge commit '7d18f34a75d1f41cc3bc8b6a36c0ab82ff93f0e4' into feature/4699_basis_update_element
...
* commit '7d18f34a75d1f41cc3bc8b6a36c0ab82ff93f0e4': (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
Frank Rotermund
5d77413746
MESSENGER-4697 set app version to 2.7.0
2023-05-09 09:02:36 +02:00
Frank Rotermund
b0439d3d36
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
Frank Rotermund
fcb748b1f2
MESSENGER-4697 release prep
2023-05-09 08:44:20 +02:00
Arnfried Griesert
74a5ebc668
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
Arnfried Griesert
4b2f221b13
Recovery key textfield starts now with gray border
2023-05-05 12:55:48 +02:00
Frank Rotermund
fa3eb93482
MESSENGER-4646 fix missing matomo button
2023-05-04 08:57:36 +02:00
Arnfried Griesert
1a561f83c2
Merge branch 'feature/devicemanager_verify_button_color' into develop
2023-05-04 08:43:24 +02:00
Arnfried Griesert
d933051135
Changed font color for device verification button
2023-05-04 06:57:32 +02:00
Frank Rotermund
e6a8623464
MESSENGER-4424 only change button when maintenance changed
2023-05-03 18:01:50 +02:00
Frank Rotermund
adcd6302e0
MESSENGER-4454 get serverurls for maintenance and matomo from the right place
2023-05-03 17:29:48 +02:00
Frank Rotermund
799f1461ab
MESSENGER-4454 fix for belated analytics config
2023-05-03 14:34:41 +02:00
JanNiklas Grabowski
e6d0586c30
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
JanNiklas Grabowski
390ad9c854
MESSENGER-4424 refactoring
2023-05-03 12:08:48 +02:00
JanNiklas Grabowski
8b682d676f
MESSENGER-4424 fix crash ui changes from background
2023-05-03 12:07:19 +02:00
Frank Rotermund
d1bc5edbe1
MESSENGER try other source for cocoapods
2023-05-03 10:57:17 +02:00
Arnfried Griesert
ae42bcbbac
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
Arnfried Griesert
c59742d8ee
Feature/4519 voice over texte secure textfield
2023-05-03 04:42:05 +00:00
Frank Rotermund
db82078a13
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
Frank Rotermund
7bb79892b5
MESSENGER-4646 fix Server URL bugs and avoid using synapse URL before server selection
2023-05-02 17:34:45 +00:00
Frank Rotermund
0165b22a02
MESSENGER-4494 reset matomo instance after logout -> New ID generation
2023-05-02 18:13:11 +02:00
Arnfried Griesert
fa76e76b62
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
Frank Rotermund
b24c2b4c28
Feature/4424 blocking requests
2023-05-02 11:01:58 +00:00
Arnfried Griesert
3e724df205
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
Frank Rotermund
f7b22e1f1a
Feature/4454 tracking config
2023-05-02 10:55:41 +00:00
Frank Rotermund
c7f63004b6
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
Arnfried Griesert
d9f9798643
MESSENGER-4516 device manager anpassungen
2023-04-28 06:28:47 +00:00
Frank Rotermund
b205aa23ef
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
Arnfried Griesert
e3b3950e67
MESSENGER-4299 Neues design Recovery Key Eingabefeld
2023-04-28 06:11:34 +00:00
Frank Rotermund
280d19922f
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
JanNiklas Grabowski
e958fa574e
MESSENGER-4272 add advertizement button
2023-04-27 05:54:49 +00:00
Frank Rotermund
b210578cb1
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
JanNiklas Grabowski
9ac96f2886
MESSENGER-4518 add voiceover description
2023-04-25 13:27:37 +02:00
JanNiklas Grabowski
e851352904
Reverted commit 'a89895ab8319adb0ac689274b0e08732721a3228' ( #4173 ) new fix https://github.com/matrix-org/matrix-ios-sdk/pull/1749
...
updated changelog
2023-04-21 14:22:12 +02:00
JanNiklas Grabowski
f23fdabb1c
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
Arnfried Griesert
4931083601
MESSENGER-4377 onboarding fehlende englische uebersetzungen
2023-04-20 16:57:36 +00:00
Arnfried Griesert
3f7adf7e59
Merge branch 'feature/4564_new_hashes' into 'develop'
...
MESSENGER-4564 new hashes
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!122
2023-04-20 10:33:38 +00:00
Arnfried Griesert
55a2f208c4
MESSENGER-4564 new hashes
2023-04-20 10:33:38 +00:00
Frank Rotermund
f48fb23ff1
Merge branch 'hotfix/v2.5.0.2' into develop
2023-04-20 08:28:46 +02:00
Frank Rotermund
5ee7d6961c
MESSENGER-4535 hotfix clarify photo access
2023-04-20 08:27:58 +02:00
Doug
dcfa1ea07b
Merge branch 'release/1.10.11/master'
2023-04-18 20:11:34 +01:00
Doug
ec51c12a51
finish version++
2023-04-18 20:11:34 +01:00
Doug
5129f0e416
Merge pull request #7510 from vector-im/release/1.10.11/release
...
Release 1.10.11
2023-04-18 20:10:38 +01:00
Doug
e1089b1a14
Tidy up event formatter issues.
2023-04-18 17:43:21 +01:00
Doug
ac519c70e1
version++
2023-04-18 17:41:11 +01:00
Doug
3200dde4e5
changelog.d: Upgrade MatrixSDK version ([v0.26.9]( https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.9 )).
2023-04-18 17:41:11 +01:00
Frank Rotermund
f50bb92a11
Merge branch 'hotfix/v2.5.0.1' into develop
2023-04-18 16:56:10 +02:00
Frank Rotermund
b5918450b0
Merge branch 'hotfix/v2.5.0.1'
2023-04-18 16:55:42 +02:00
Frank Rotermund
0943c338b4
MESSENGER-4535 hotfix more english translations
2023-04-18 16:54:30 +02:00
Doug
ef95ef4ab4
Merge pull request #7475 from RiotTranslateBot/weblate-riot-ios-riot-ios
...
Translations update from Weblate
2023-04-18 10:13:14 +01:00
