Frank Rotermund
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
JanNiklas Grabowski
d382613f88
MESSENGER-4518 add voiceover description
2023-04-25 13:27:37 +02:00
JanNiklas Grabowski
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
JanNiklas Grabowski
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
Arnfried Griesert
ec3bb673d5
MESSENGER-4377 onboarding fehlende englische uebersetzungen
2023-04-20 16:57:36 +00:00
Arnfried Griesert
8eb57fb875
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
acc3b27f42
MESSENGER-4564 new hashes
2023-04-20 10:33:38 +00:00
Frank Rotermund
2b6b6f4fd7
Merge branch 'hotfix/v2.5.0.2' into develop
2023-04-20 08:28:46 +02:00
Frank Rotermund
4a5e4acc19
MESSENGER-4535 hotfix clarify photo access
2023-04-20 08:27:58 +02:00
Frank Rotermund
5588ce90d7
Merge branch 'hotfix/v2.5.0.1' into develop
2023-04-18 16:56:10 +02:00
Frank Rotermund
fcda08e689
Merge branch 'hotfix/v2.5.0.1'
2023-04-18 16:55:42 +02:00
Frank Rotermund
8389f89676
MESSENGER-4535 hotfix more english translations
2023-04-18 16:54:30 +02:00
Frank Rotermund
74a9c2d612
Merge branch 'develop' of https://dl-gitlab.devopslab.tech/bwmessenger/bundesmessenger/bundesmessenger-ios into develop
...
# Conflicts:
# Config/BWIBuildSettings.swift
2023-04-16 19:57:49 +02:00
Frank Rotermund
6616109b91
Merge branch 'release/v2.5.0' into develop
2023-04-16 19:55:08 +02:00
Frank Rotermund
3a63bcd5d3
Merge branch 'release/v2.5.0'
2023-04-16 19:54:49 +02:00
Frank Rotermund
9e67d0b3fe
MESSENGER-4535 changelog
2023-04-16 19:51:02 +02:00
JanNiklas Grabowski
9706b9682d
Merge branch 'feature/4450_fix_matomo_consent_popup_not_showing' into 'develop'
...
MESSENGER-4450 fix matomo consent alert not showing
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!119
2023-04-14 13:40:07 +00:00
JanNiklas Grabowski
df8da04474
MESSENGER-4450 fix matomo consent alert not showing
2023-04-14 13:40:07 +00:00
Arnfried Griesert
c46a160065
Changed sdk version in Podfile
2023-04-14 12:44:24 +02:00
Frank Rotermund
dcdfce534c
MESSENGER-4535 e2ee analytics, better error descriptions
2023-04-13 08:41:11 +02:00
Arnfried Griesert
8637f184d4
Merge branch 'feature/4537_basis_update_element' into develop
...
* feature/4537_basis_update_element: (86 commits)
Updated displayed element version and fixed merge problems
Changed sdk version to v0.26.6_bwi
finish version++
version++
changelog.d: Upgrade MatrixSDK version ([v0.26.6](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.6)).
No event decoration if no decryption result
Start QR scanning when camera ready
Support for MSC3906 v2 (#7407 )
Code cleanup
Expand rust crypto rollout to 50% users
Fix comments
Fix: read marker update
Fix: read marker update
Fix: Update the read marker position even if it is not displayed
Fix: do not encode the maximum width of a Pill
Prepare for new sprint
finish version++
Replace Ts&Cs with Acceptable Use Policy. (#7459 )
version++
changelog.d: Upgrade MatrixSDK version ([v0.26.5](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.5)).
...
2023-04-13 08:29:55 +02:00
Frank Rotermund
e478686d0f
MESSENGER-4535 buildfix
2023-04-13 07:50:59 +02:00
Frank Rotermund
e50392db75
MESSENGER-4535 matomo e2ee error tracking
2023-04-12 16:13:25 +02:00
Frank Rotermund
903e6a6673
MESSENGER-4535 fix invitation into DMs and personal notes and cancelable passphrase flow cherry pick from release
2023-04-12 15:32:51 +02:00
Frank Rotermund
339b45bff5
MESSENGER-4535 fix cancelable passphrase flow on first login
2023-04-12 15:31:47 +02:00
Frank Rotermund
ac3da68923
MESSENGER-4535 fix invitation into DMs and personal notes
2023-04-12 15:31:22 +02:00
Frank Rotermund
b8d1e2e81d
MESSENGER-4535 remove error popup "no other devices" on self verification/ crosssigning Cherrypick
2023-04-12 13:50:50 +02:00
Frank Rotermund
6c7f613f3b
MESSENGER-4535 element base version
2023-04-11 13:37:29 +02:00
Frank Rotermund
4a8c655b91
MESSENGER-4535 remove error popup "no other devices" on self verification/ crosssigning
2023-04-11 13:36:36 +02:00
Arnfried Griesert
bf5dceb423
Updated displayed element version and fixed merge problems
2023-04-11 13:13:11 +02:00
Arnfried Griesert
f2ee3e80fb
Changed sdk version to v0.26.6_bwi
2023-04-11 12:26:44 +02:00
Arnfried Griesert
3736b8c9fd
Merged element 1.10.9 into bum
2023-04-11 11:46:44 +02:00
Frank Rotermund
f1605527a7
Merge branch 'feature/4446_change_text_color' into 'develop'
...
MESSENGER-4446 change text color for event with message that can not be rendered
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!118
2023-04-11 09:25:09 +00:00
JanNiklas Grabowski
2d16d7a9d8
Merge branch 'feature/opcode_feedback_wellknown_crash' into 'develop'
...
Fixed a crash in wellknown parsing
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!117
2023-04-05 09:55:15 +00:00
Arnfried Griesert
8456a66dbc
Fixed a crash in wellknown parsing
2023-04-05 08:34:02 +02:00
Arnfried Griesert
721b5f97ae
Merge branch 'feature/4482_feature_banner_link_fix' into 'develop'
...
MESSENGER-4482 fix feature banner link and add navigationbar
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!116
2023-04-05 06:10:07 +00:00
JanNiklas Grabowski
bec51bcfc0
MESSENGER-4482 fix feature banner link and add navigationbar
2023-04-05 06:10:07 +00:00
JanNiklas Grabowski
f6933ab955
MESSENGER-4446 change text color for event with message that can not be rendered
2023-04-04 17:39:07 +02:00
Stefan Ceriu
9769a2913b
Merge branch 'release/1.10.9/master'
2023-04-04 15:00:45 +03:00
Stefan Ceriu
90a701a733
finish version++
2023-04-04 15:00:45 +03:00
Stefan Ceriu
0a973ca159
Merge pull request #7474 from vector-im/release/1.10.9/release
...
Release 1.10.9
2023-04-04 14:47:48 +03:00
Stefan Ceriu
19cf77ab8e
version++
2023-04-04 14:06:58 +03:00
Stefan Ceriu
8e63a7ba31
changelog.d: Upgrade MatrixSDK version ([v0.26.6]( https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.6 )).
2023-04-04 14:06:57 +03:00
Anderas
6849f39b89
Merge pull request #7471 from vector-im/andy/event_shield
...
No event decoration if no decryption result
2023-04-04 08:28:35 +01:00
Andy Uhnak
d55ad2dbea
No event decoration if no decryption result
2023-04-03 17:36:45 +01:00
Anderas
17a017eeb3
Merge pull request #7469 from vector-im/andy/qr_code
...
Start QR scanning when camera ready
2023-04-03 17:36:23 +01:00
Andy Uhnak
2b2881f8f1
Start QR scanning when camera ready
2023-04-03 16:16:39 +01:00
Nicolas Mauri
02ff47ae17
Merge pull request #7461 from vector-im/nimau/7420-readmarker
...
Fix: Update the read marker position even if it is not displayed
2023-04-03 14:34:42 +02:00
Hugh Nimmo-Smith
06ea9f7b7a
Support for MSC3906 v2 ( #7407 )
2023-04-01 11:56:56 -04:00
Nicolas Mauri
69ec418985
Code cleanup
2023-03-31 16:47:37 +02:00