Commit Graph

9846 Commits

Author SHA1 Message Date
JanNiklas Grabowski b5b8458dff MESSENGER-5307 fix add room button appearance 2023-11-28 14:50:29 +01:00
Arnfried Griesert 84a087e951 Removed adress label and enabled multiline for room names 2023-11-24 06:44:27 +01:00
Frank Rotermund 958727d304 Feature/5327 releaseprep 2023-11-21 06:33:20 +00:00
Arnfried Griesert 212c32adb4 Merge branch 'feature/5216_federation_us03' into 'develop'
MESSENGER-5216 Added federation indicator to room info screen

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!249
2023-11-15 07:42:32 +00:00
Frank Rotermund aff701d45f Merge branch 'feature/5184_restore_keys_from_backup' into 'develop'
MESSENGER-5148 Restore Backup option

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!254
2023-11-14 14:53:23 +00:00
Frank Rotermund b255b67f86 MESSENGER-5148 Restore Backup option 2023-11-14 12:56:34 +01:00
Arnfried Griesert 12087babd4 Pill heigh set to 20px 2023-11-14 12:49:19 +01:00
Arnfried Griesert f662d519be Set federation pill height to 16px 2023-11-14 11:14:03 +01:00
Arnfried Griesert 9054a802d8 Small gap removed at the bottom of the federation icon 2023-11-14 11:01:23 +01:00
JanNiklas Grabowski 795961a2ed Merge branch 'feature/5203_us01_add_federation_room_overview' into 'develop'
MESSENGER-5203 change image position

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!253
2023-11-14 07:38:14 +00:00
Arnfried Griesert 03312447ce Pill size adjustment 2023-11-14 06:40:31 +01:00
JanNiklas Grabowski edfa89f313 MESSENGER-5203 change image position 2023-11-13 18:13:46 +01:00
JanNiklas Grabowski d6da4e7f75 MESSENGER-5208 and 5220 us09 and us04 2023-11-13 17:33:21 +01:00
Arnfried Griesert 55084fd91a Added federation indicator to room info screen 2023-11-13 12:39:33 +01:00
JanNiklas Grabowski 6fca6743d3 Merge branch 'feature/5265_add_decryption_time_events_matomo' into 'develop'
Feature/5265 add decryption time events matomo

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!246
2023-11-13 09:25:48 +00:00
JanNiklas Grabowski 9bfca03f0b Merge branch 'feature/5297_fix_empty_chat_bubble' into 'develop'
MESSENGER-5297 fix empty chat bubble

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!247
2023-11-10 13:08:19 +00:00
JanNiklas Grabowski ecea582d85 MESSENGER-5297 fix empty chat bubble 2023-11-09 18:11:04 +01:00
JanNiklas Grabowski 63f3b96ad3 MESSENGER-5265 add decryption time events matomo 2023-11-09 16:47:43 +01:00
JanNiklas Grabowski c6c874cf43 Merge branch 'develop' into 'feature/5203_us01_add_federation_room_overview'
# Conflicts:
#   Config/BWIBuildSettings.swift
2023-11-02 14:55:09 +00:00
JanNiklas Grabowski a213954135 MESSENGER-5203 add federation to lab settings and refactor 2023-11-02 15:35:25 +01:00
JanNiklas Grabowski be45b997da Merge branch 'feature/5236_remove_grey_shield' into 'develop'
MESSENGER 5236 remove grey green and red shield for room and user avatar

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!243
2023-11-02 12:01:58 +00:00
JanNiklas Grabowski 5f5aa69a73 MESSENGER-5203 add federation icon to tableview cell 2023-10-31 17:10:22 +01:00
Frank Rotermund 75ad20833b Merge branch 'release/v2.11.0' into develop
# Conflicts:
#	Podfile
2023-10-27 18:21:24 +02:00
JanNiklas Grabowski 2d07813bdc set imageview hidden 2023-10-27 15:22:25 +02:00
JanNiklas Grabowski 628d420dd9 MESSENGER 5236 remove grey green and red shield for room and user avatar 2023-10-27 14:37:22 +02:00
Frank Rotermund e98e1b2195 MESSENGER-5252 releaseprep 2023-10-27 13:59:03 +02:00
Arnfried Griesert 54aca03fc4 Merge branch 'master' into feature/5254_merge_element_into_bum
# Conflicts:
#	Config/AppVersion.xcconfig
#	Gemfile
2023-10-22 18:57:22 +02:00
JanNiklas Grabowski 430342eba0 MESSENGER-4956 matomo add decryption error information 2023-10-16 18:55:56 +02:00
JanNiklas Grabowski e9ddd4733b Merge branch 'feature/4821_matomo_add_dimension_for_decryption_errors' into 'develop'
Feature/4821 matomo add dimension for decryption errors

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!230
2023-10-12 08:55:17 +00:00
Frank Rotermund 41761ec280 Merge branch 'hotfix/v2.10.1' into develop
# Conflicts:
#	Config/AppVersion.xcconfig
2023-10-12 07:40:20 +02:00
Frank Rotermund f9e7278c54 MESSENGER-3811 hotfix 2.10.1 crash on mdm 2023-10-11 16:08:10 +02:00
JanNiklas Grabowski 77705a42ae MESSENGER-4821 add dimension for decryption error tracking 2023-10-11 15:07:07 +02:00
Arnfried Griesert 7312ad09ad Merge branch 'feature/4433_content_scanner_upload' into 'develop'
MESSENGER-4433 content scanner upload

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!229
2023-10-10 12:33:47 +00:00
Arnfried Griesert f5d7597547 Fixed retry buttons text and image color 2023-10-10 06:57:03 +02:00
Arnfried Griesert c2d44580e4 Merge branch 'develop' into 'feature/5161_basis_update_element'
# Conflicts:
#   Podfile
2023-10-05 12:17:36 +00:00
Alfonso Grillo 7612d82f8e Fix DM crash with RTE enabled 2023-10-03 17:11:32 +02:00
JanNiklas Grabowski 27f73a06c9 MESSENGER-5159 update chat overview on hiding notes room 2023-09-29 12:33:10 +02:00
Arnfried Griesert 3c2c021287 Merged element 1.11.3 into bum 2023-09-29 05:24:53 +02:00
JanNiklas Grabowski 90f0349e2f MESSENGER-5160 disable quote function temporary 2023-09-28 12:21:46 +02:00
Doug 80bed39d2c Allow the use of Jitsi for 1:1 calls via the client well-known. 2023-09-28 10:01:57 +01:00
Arnfried Griesert c4d1baaaf5 MESSENGER-4807 bum assets floating button 2023-09-20 07:44:22 +00:00
Frank Rotermund 738512711d Merge branch 'feature/3811_appconfig' into 'develop'
Feature/3811 appconfig

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!218
2023-09-19 11:21:12 +00:00
Frank Rotermund 5dd5dc2db7 Feature/3811 appconfig 2023-09-19 11:21:12 +00:00
JanNiklas Grabowski 7f61eab4da MESSENGER-4751 add feature flag 2023-09-18 17:54:49 +02:00
JanNiklas Grabowski 043d277563 MESSENGER-4751 use privacy url of well known 2023-09-18 14:37:34 +02:00
JanNiklas Grabowski 22f6a85c04 MESSENGER-5017 translate voice message cancel text 2023-09-15 14:41:58 +02:00
JanNiklas Grabowski 0f3a48e414 MESSENGER-4857 translate invalid password message 2023-09-15 11:35:08 +02:00
Frank Rotermund 9a99402181 Merge branch 'feature/4730_personal_notes_visibilty' into 'develop'
MESSENGER-4730 personal notes visibility old style

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!204
2023-09-15 07:39:41 +00:00
Frank Rotermund 6a83893e3a MESSENGER-4730 personal notes visibility old style 2023-09-15 07:39:41 +00:00
Hugh Nimmo-Smith dde602beac Use ASWebAuthenticationSession to display OIDC account management URL (#7671)
Co-authored-by: Doug <douglase@element.io>
2023-09-12 18:05:52 +01:00