b6b0378030
MESSENGER-5379 removed unused label
2024-01-09 11:22:54 +01:00
d7749bb5da
MESSENGER-5379 dynamic location attribution from style.json
2024-01-09 11:02:02 +01:00
9c10374575
Merge branch 'feature/5433_foss_merge' into develop
2024-01-04 15:19:03 +01:00
ddf17f4b64
Merge branch 'hotfix/v.2.12.2' into develop
...
# Conflicts:
# Config/AppVersion.xcconfig
2024-01-04 10:34:54 +01:00
69f0bd463b
MESSENGER-5461 set app version
2024-01-04 10:28:26 +01:00
c7401f8faa
MESSENGER-5433 set sdk version
2024-01-04 10:10:22 +01:00
47c4ac8d71
Merge branch 'releaseprep/v2.12.2' into 'hotfix/v.2.12.2'
...
Releaseprep/v2.12.2
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!282
2024-01-03 15:38:11 +00:00
57c7ce79b8
update app version
2023-12-22 14:40:13 +01:00
5decccf6cb
hotfix use custom url scheme to open links if provided
2023-12-22 12:25:59 +01:00
8dfd785960
Merge branch 'feature/5204_federation_us05_user_details' into 'develop'
...
Feature/5204 federation us05 user details
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!280
2023-12-20 15:07:14 +00:00
8a186a37d8
Merge commit 'd786f7bb4f37b77478a8a55df44a6e87247f96c1' into feature/5433_foss_merge
...
* commit 'd786f7bb4f37b77478a8a55df44a6e87247f96c1': (36 commits)
finish version++
Release notes
version++
changelog.d: Upgrade MatrixSDK version ([v0.27.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.27.4 )).
Fix missing placeholder.
Translated using Weblate (Catalan)
Translated using Weblate (Catalan)
Translated using Weblate (Catalan)
Translated using Weblate (Arabic)
Translated using Weblate (Arabic)
Translated using Weblate (Chinese (Simplified))
Translated using Weblate (Vietnamese)
Translated using Weblate (Chinese (Simplified))
Translated using Weblate (Chinese (Simplified))
Fix: Remove the “Quote” action from the menu of the selected message.
Update RTE to 2.18.0 to fix an issue with Speech-to-Text
Code cleanup
Dismiss the keyboard and minimise the composer when pasting an image, a video or a file
Fix: focus, keyboard visibility, composer height
Restore composer tint color
...
# Conflicts:
# Config/AppVersion.xcconfig
# Riot/Modules/Room/RoomViewController.m
2023-12-20 15:11:56 +01:00
776b88008f
MESSENGER-5204 us05 add federation icons user details view
2023-12-18 16:33:46 +01:00
7a378ed99c
MESSENGER-5204 us05 add federation icons user details view
2023-12-18 16:17:40 +01:00
a0ec6d147a
Merge branch 'feature/reset_marketing_version' into 'develop'
...
Rest marketing version to 2.13.0
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!279
2023-12-15 06:49:30 +00:00
25f4f2b9f3
Rest marketing version to 2.13.0
2023-12-14 13:36:31 +01:00
f7b485b522
Merge branch 'feature/5311_change_text_size' into 'develop'
...
MESSENGER-5311 change text size
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!277
2023-12-14 11:55:55 +00:00
4f2815f721
MESSENGER-5311 change text size
2023-12-13 13:58:35 +01:00
cbd5d4bddb
Merge branch 'feature/federation_check_refactor' into 'develop'
...
Refactor federation check
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!266
2023-12-12 15:31:35 +00:00
c4cf606158
Merge branch 'feature/5276_appstore_link' into 'develop'
...
Feature/5276 appstore link
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!262
2023-12-12 14:48:48 +00:00
b6c6d9c28b
MESSENGER-5276 add Unit Test
2023-12-12 15:42:18 +01:00
69cddeedb4
Merge branch 'release/v2.12.1' into develop
2023-12-12 13:05:57 +01:00
59ee43ed5c
Merge branch 'release/v2.12.1'
2023-12-12 13:05:47 +01:00
866aae5cbd
Merge branch 'release/release_prep_2.12.1_2' into 'release/v2.12.1'
...
MESSENGER-5359 fix crosssigning crash in sdk
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!276
2023-12-12 11:54:56 +00:00
be2eb9f05c
MESSENGER-5359 fix crosssigning crash in sdk
2023-12-12 10:25:55 +01:00
d0833e2845
Merge branch 'release/release_prep_2.12.1' into 'release/v2.12.1'
...
Release/release prep 2.12.1
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!274
2023-12-11 16:02:36 +00:00
6f979affb8
Release/release prep 2.12.1
2023-12-11 16:02:36 +00:00
75de3bacc4
Merge branch 'feature/5408_hashes' into 'develop'
...
MESSENGER-5308 hashes
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!273
2023-12-08 15:55:15 +00:00
196412badd
MESSENGER-5308 hashes
2023-12-08 13:02:15 +01:00
3d4a679f30
Merge branch 'feature/5308_SSO_on_internal_browser' into 'develop'
...
Feature/5308 sso on internal browser
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!272
2023-12-08 11:42:02 +00:00
02bb97687d
Feature/5308 sso on internal browser
2023-12-08 11:42:02 +00:00
e7bbd677ab
Refactor federation check
2023-12-08 12:35:11 +01:00
bdb8a7a92f
Merge branch 'feature/4846_us02_add_federate_toggle_for_room_creation' into 'develop'
...
Feature/4846 us02 add federate toggle for room creation
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!271
2023-12-08 09:37:45 +00:00
5974c24118
MESSENGER-4846 add federate toggle for room creation
2023-12-07 12:27:21 +01:00
7849724638
MESSENGER-4846 add federate toggle for room creation
2023-12-07 12:15:16 +01:00
39e6e299eb
Merge branch 'feature/5271_crosssigning_with_button' into 'develop'
...
MESSENGER-5271 crosssigning - verification request on button click
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!267
2023-12-05 14:19:30 +00:00
02fafc966e
MESSENGER-5271 hide crosssigning information when only one device
2023-12-05 14:55:00 +01:00
d67a713630
Merge branch 'feature/5311_add_userid_to_room_member_details_view' into 'develop'
...
Feature/5311 add userid to room member details view
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!263
2023-12-05 12:20:00 +00:00
665be642e3
Merge branch 'feature/5358_add_wysiwyg_composer_switch' into 'develop'
...
MESSENGER-5358 add switch in settings for wysiwyg composer
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!264
2023-12-05 12:18:03 +00:00
b391e08702
Merge branch 'feature/fix_nexus_upload' into 'develop'
...
Feature/fix nexus upload
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!265
2023-12-05 12:17:09 +00:00
cd1b7053e8
MESSENGER-5271 buildfix
2023-12-05 13:00:17 +01:00
41b16a668b
Merge branch 'feature/sonarqube' into 'develop'
...
add sonarqube job
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!269
2023-12-05 11:52:26 +00:00
948672d840
add sonarqube job
2023-12-05 11:52:25 +00:00
c8a32e3431
MESSENGER-5271 crosssigning - add alert and better strings, only show button when usable
2023-12-05 12:46:26 +01:00
9a997510c5
MESSENGER-5271 crosssigning - verification request on button click
2023-11-30 14:19:58 +01:00
da471b22ca
fix nexus upload path
2023-11-30 10:11:52 +01:00
2842f021ab
MESSENGER-5358 add switch in settings for wysiwyg composer
2023-11-29 15:32:00 +01:00
d71e58bf0a
Refactor federation check
2023-11-29 13:47:08 +01:00
f26928de8f
MESSENGER-5311 change label name
2023-11-29 12:19:25 +01:00
73f6db4dca
MESSENGER-5311 add userid to room member details view
2023-11-29 11:56:54 +01:00
d446aaf24e
Merge branch 'feature/5307_fix_add_room_button_appearance' into 'develop'
...
MESSENGER-5307 fix add room button appearance
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!261
2023-11-29 07:45:21 +00:00
Frank Rotermund
JanNiklas Grabowski
Juergen Wischer