Arnfried Griesert
e5d97ed154
merged element-ios 1.10.5 into 4409_basis_update_1_10_5
2023-03-16 12:19:26 +01:00
Doug
e9c58d1573
Merge branch 'release/1.10.5/master'
2023-03-13 17:48:45 +00:00
Doug
4a7b63c767
finish version++
2023-03-13 17:48:45 +00:00
Doug
165a1871b3
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
f61fd38ad6
version++
2023-03-13 16:58:07 +00:00
Doug
58eb2b2d72
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
JanNiklas Grabowski
a3c2375aa8
Update Appversion at sprint start
2023-03-10 12:45:40 +01:00
Frank Rotermund
ccd5c73288
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
80c7ac6bf3
MESSENGER-4392 messges bubbles as default
2023-03-10 08:06:43 +01:00
Arnfried Griesert
13f9fe41c0
Replaced openURL with AppDelegate.theDelegate().handleUniversalLinkURL(url)
2023-03-09 14:46:55 +01:00
Arnfried Griesert
bb90977f05
Bugfix in qr code scanner for perm links
2023-03-09 11:28:46 +01:00
Frank Rotermund
f7c3aff116
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
6726970b8f
MESSENGER-4394 restart pincode setup when app was closed during it the first time
2023-03-09 09:26:24 +00:00
Arnfried Griesert
f3a16dcafb
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
51e73c71df
MESSENGER-3425 permalink prefix developer settings screen
2023-03-08 13:28:11 +00:00
Frank Rotermund
ac491f573e
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
361d1f6d18
MESSENGER-4303 fix cross signing error
2023-03-07 17:43:28 +01:00
Doug
bd7baa3af7
Merge branch 'release/1.10.4/master'
2023-03-07 13:55:14 +00:00
Doug
a40669e117
finish version++
2023-03-07 13:55:13 +00:00
Doug
c935be8872
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
783111c7f2
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
89f8644abc
MESSENGER-3157 third notification settings option
2023-03-07 13:28:09 +00:00
Frank Rotermund
a50402d361
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
7ff2ab0da3
Feature/4231 change icon new loginflow
2023-03-07 13:05:50 +00:00
Frank Rotermund
33fe76341e
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
6729fe4515
Feature/4174 better error message when backend down
2023-03-07 12:28:55 +00:00
Frank Rotermund
dbf0e7bd11
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
d43f1bfed3
MESSENGER-4197 fix status messages cut off
2023-03-07 12:14:51 +00:00
Doug
2ecef30386
version++
2023-03-07 11:49:57 +00:00
Doug
0e1754e52e
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
1e69e23acc
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
876de5e1ad
Add some filetypes to our gitignore
2023-03-07 08:27:41 +01:00
Arnfried Griesert
d5d299a357
More tint color changes
2023-03-06 22:11:23 +01:00
Nicolas Mauri
742c9d98d9
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
fc1c22c08c
refactor completed
2023-03-06 14:59:03 +01:00
Nicolas Mauri
275b7c86a6
Fix: incoming SAS transaction was accepted twice
2023-03-06 14:07:27 +01:00
Nicolas Mauri
72bbf08dc3
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
07039d4d1d
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
2e2d9044dd
Add missing changes on generated Strings file.
2023-03-03 16:22:11 +01:00
Nicolas Mauri
3677c3691b
Fix waiting message
2023-03-03 16:12:08 +01:00
Nicolas Mauri
93376ec041
Update of the waiting message
2023-03-03 10:13:21 +01:00
Alfonso Grillo
09c847f280
Merge pull request #7402 from vector-im/alfogrillo/fix_poll_bubbles
...
Fix poll ended event rendering (PSG-1177)
2023-03-03 10:06:02 +01:00
Andy Uhnak
fabe9566e3
Update docs + tests
2023-03-02 19:42:09 +00:00
Andy Uhnak
7e41e16467
Use SwiftPM AnalyticsEvents
2023-03-02 16:59:48 +00:00
Alfonso Grillo
86bd2a0db0
Add changelog.d file
2023-03-02 17:53:29 +01:00
Alfonso Grillo
01839bfa27
Fix poll ended event rendering
2023-03-02 17:49:15 +01:00
Arnfried Griesert
9705d935c9
Merge branch 'feature/4179_send_button_wrong_color' into 'develop'
...
MESSENGER-4179 send button wrong color
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!99
2023-03-02 14:50:31 +00:00
Arnfried Griesert
c94184f74c
MESSENGER-4179 send button wrong color
2023-03-02 14:50:31 +00:00
Arnfried Griesert
b1c85b9a24
Merge branch 'feature/4231_add_new_loginflow' into 'develop'
...
MESSENGER-4231 add new loginflow
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!98
2023-03-02 13:09:34 +00:00
JanNiklas Grabowski
9fe91bf1b4
Merge branch 'feature/4157_better_serverdowntime_messages' into 'develop'
...
MESSENGER-4157 Better Texts for downtime warnings
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!101
2023-03-02 12:43:25 +00:00
