Arnfried Griesert
331ca4e33a
Merge branch 'feature/4203_show_user_qr' into 'develop'
...
MESSENGER-4203 show user qr
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!110
2023-03-24 07:35:38 +00:00
Arnfried Griesert
dbc8f39fec
MESSENGER-4203 show user qr
2023-03-24 07:35:38 +00:00
Arnfried Griesert
285bf4bdc0
merged basis update 1_10_5 into develop
2023-03-21 07:52:11 +01:00
Arnfried Griesert
7ee5383905
addded AnalyticsEvent package to bum and beta target.yml
2023-03-20 08:35:49 +01:00
Arnfried Griesert
d118536f6e
Revert change in Podfile
2023-03-20 08:22:33 +01:00
Arnfried Griesert
4727a3ddf2
Fixed merge conflicts
2023-03-20 07:33:28 +01:00
JanNiklas Grabowski
4c5eba691c
Merge tag 'v2.4.0' into develop
...
Changes in BWI project 2.4.0 (2023-03-14)
===================================================
Upstream merge ✨ :
- v1.10.2
Features ✨ :
- Poll history
Improvements 🙌 :
- Redesigned notes room in chat overview (#4211 )
- New login flow for BwM (#4231 )
- Added default server settings (#4218 )
- Add changeable permalink config (#3425 )
- Better permalink-header handling (#4146 )
- Display user search results alphabetically (#3076 )
- Text changes for downtime info (#4157 )
- Changed text of reset passphrase button (#4167 )
- Changed pin confirmation text (#4168 )
- Color changes for ui elements (#4179 )
- Improved forgot password text (#4161 )
Bugfix 🐛 :
- Fix for Cross-Signing error (#4303 )
- Fix for status message getting cut off (#4197 )
- Fix wrong number for room invites in chat overview (#4173 )
Translations 🗣 :
SDK API changes ⚠️ :
+Build 🧱 :
2023-03-16 21:15:06 +01:00
JanNiklas Grabowski
8c0e8707fb
Merge branch 'release/v2.4.0'
2023-03-16 21:15:06 +01:00
JanNiklas Grabowski
76e0de4e38
MESSENGER-4407 fixes from testprotocol
2023-03-16 16:45:48 +01:00
Arnfried Griesert
28852aa790
merged element-ios 1.10.5 into 4409_basis_update_1_10_5
2023-03-16 12:19:26 +01:00
JanNiklas Grabowski
a6e95b9955
MESSENGER-4407 fixes from testprotocol and release notes
2023-03-14 18:07:07 +01:00
Doug
dfdc7eac4a
Merge branch 'release/1.10.5/master'
2023-03-13 17:48:45 +00:00
Doug
3db4091a58
finish version++
2023-03-13 17:48:45 +00:00
Doug
8519de9c3e
Merge pull request #7426 from vector-im/release/1.10.5/release
...
Release 1.10.5
2023-03-13 17:48:08 +00:00
Doug
9d6b87dcd8
version++
2023-03-13 16:58:07 +00:00
Doug
f0c876d0dd
changelog.d: Upgrade MatrixSDK version ([v0.26.1]( https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.1 )).
2023-03-13 16:58:07 +00:00
Frank Rotermund
84bf0f047a
MESSENGER-4408 remove localisation matrix Passwort
2023-03-10 14:09:49 +01:00
JanNiklas Grabowski
51daf2e5ec
Update Appversion at sprint start
2023-03-10 12:45:40 +01:00
Frank Rotermund
eadb103ba5
Merge branch 'feature/4386_whitelisting' into 'develop'
...
MESSENGER-4392 messges bubbles as default
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!109
2023-03-10 07:13:31 +00:00
Frank Rotermund
df74a26f86
MESSENGER-4392 messges bubbles as default
2023-03-10 08:06:43 +01:00
Arnfried Griesert
785212ffde
Replaced openURL with AppDelegate.theDelegate().handleUniversalLinkURL(url)
2023-03-09 14:46:55 +01:00
Arnfried Griesert
28c49d0dbf
Bugfix in qr code scanner for perm links
2023-03-09 11:28:46 +01:00
Frank Rotermund
aa814722ca
Merge branch 'feature/4394_pincode_fix' into 'develop'
...
MESSENGER-4394 restart pincode setup when app was closed during it the first time
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!108
2023-03-09 09:26:24 +00:00
Frank Rotermund
144816108a
MESSENGER-4394 restart pincode setup when app was closed during it the first time
2023-03-09 09:26:24 +00:00
Arnfried Griesert
b4f015f30d
Merge branch 'feature/3425_permalink_prefix' into 'develop'
...
MESSENGER-3425 permalink prefix developer settings screen
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!107
2023-03-08 13:28:11 +00:00
Arnfried Griesert
ca8901bade
MESSENGER-3425 permalink prefix developer settings screen
2023-03-08 13:28:11 +00:00
Frank Rotermund
b27f71e24e
Merge branch 'feature/4303_fix_cross_signing_error' into 'develop'
...
MESSENGER-4303 fix cross signing error
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!106
2023-03-08 07:11:34 +00:00
JanNiklas Grabowski
570f4c5391
MESSENGER-4303 fix cross signing error
2023-03-07 17:43:28 +01:00
Doug
43d4483757
Merge branch 'release/1.10.4/master'
2023-03-07 13:55:14 +00:00
Doug
336b7b27e8
finish version++
2023-03-07 13:55:13 +00:00
Doug
fae6286a3c
Merge pull request #7414 from vector-im/release/1.10.4/release
...
Release 1.10.4
2023-03-07 13:43:49 +00:00
Frank Rotermund
46a6aaaeff
Merge branch 'feature/3157_third_notification_setting' into 'develop'
...
MESSENGER-3157 third notification settings option
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!100
2023-03-07 13:28:09 +00:00
Arnfried Griesert
20ecc8ab46
MESSENGER-3157 third notification settings option
2023-03-07 13:28:09 +00:00
Frank Rotermund
bcf877d64f
Merge branch 'feature/4231_change_icon_new_loginflow' into 'develop'
...
Feature/4231 change icon new loginflow
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!105
2023-03-07 13:05:50 +00:00
JanNiklas Grabowski
245be52991
Feature/4231 change icon new loginflow
2023-03-07 13:05:50 +00:00
Frank Rotermund
c5886f1836
Merge branch 'feature/4174_better_error_message_when_backend_down' into 'develop'
...
Feature/4174 better error message when backend down
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!103
2023-03-07 12:28:55 +00:00
Frank Rotermund
e435aebd55
Feature/4174 better error message when backend down
2023-03-07 12:28:55 +00:00
Frank Rotermund
2c7a6e7745
Merge branch 'feature/4197_status_messages_cut_off' into 'develop'
...
MESSENGER-4197 fix status messages cut off
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!104
2023-03-07 12:14:51 +00:00
JanNiklas Grabowski
6344fa6cb6
MESSENGER-4197 fix status messages cut off
2023-03-07 12:14:51 +00:00
Doug
ee2554c0cd
version++
2023-03-07 11:49:57 +00:00
Doug
e1eecd0797
changelog.d: Upgrade MatrixSDK version ([v0.26.0]( https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.26.0 )).
2023-03-07 11:49:57 +00:00
Mauro
13a8e84b9c
Merge pull request #7410 from vector-im/mauroromito/displayName_refactor
...
MatrixRoomSummary displayname renamed to displayName
2023-03-07 10:01:23 +01:00
Frank Rotermund
73662bd023
Add some filetypes to our gitignore
2023-03-07 08:27:41 +01:00
Arnfried Griesert
8f8741c903
More tint color changes
2023-03-06 22:11:23 +01:00
Nicolas Mauri
28ce86cef8
Merge pull request #7408 from vector-im/nimau/3946-verification-unexpected-message
...
Fix: incoming SAS transaction was accepted twice
2023-03-06 16:38:20 +01:00
Mauro Romito
09daa04dd4
refactor completed
2023-03-06 14:59:03 +01:00
Nicolas Mauri
9aab5a4f67
Fix: incoming SAS transaction was accepted twice
2023-03-06 14:07:27 +01:00
Nicolas Mauri
eb55e1553c
Merge pull request #7396 from vector-im/nimau/6612-dm-email
...
Direct Message: manage encrypted DM in case of invite by email
2023-03-06 12:04:53 +01:00
Anderas
3c48728155
Merge pull request #7401 from vector-im/andy/analytics
...
Use SwiftPM for AnalyticsEvents instead of CocoaPods
2023-03-06 09:56:19 +00:00
Nicolas Mauri
8437da0d17
Add missing changes on generated Strings file.
2023-03-03 16:22:11 +01:00