Commit Graph

16923 Commits

Author SHA1 Message Date
Frank Rotermund 1647e883fa Merge branch 'release/v1.26.0' into develop 2022-10-31 19:37:38 +01:00
Frank Rotermund 7c24cf3848 MESSENGER-3745 fix nexus upload 2022-10-31 18:33:48 +01:00
Frank Rotermund 8f0a4c2010 MESSENGER-3745 patches from bwm release 2022-10-28 12:09:20 +02:00
Arnfried Griesert 36ebad3fe7 New lottie animation with small changes 2022-10-28 11:14:32 +02:00
Arnfried Griesert 9c5e67e911 Merge branch 'feature/3352_build_settings' into 'develop'
MESSENGER-3352 build settings

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!38
2022-10-27 09:06:24 +00:00
Arnfried Griesert 4f407e6923 MESSENGER-3352 build settings 2022-10-27 09:06:24 +00:00
Frank Rotermund 51a7d48e2c Merge branch 'feature/lottie_animation_finetuning' into 'develop'
Removed frames from lottie animation

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!37
2022-10-24 10:32:30 +00:00
Arnfried Griesert 7c9a293ad9 Removed frames from lottie animation 2022-10-24 11:28:47 +02:00
Frank Rotermund 54c76f6d27 Merge branch 'feature/3595_keysharing' into 'develop'
MESSENGER-3595 keysharing + room creation settings

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!36
2022-10-20 06:26:04 +00:00
Frank Rotermund 17bc1920a6 MESSENGER-3595 keysharing + room creation settings 2022-10-20 06:26:03 +00:00
Arnfried Griesert 8777e3871c Fixed wrong bwi specific translation 2022-10-20 07:37:50 +02:00
Frank Rotermund 6a0b530ce8 Merge branch 'feature/3688_bitv_contrast_button' into 'develop'
MESSENGER-3688 BITV contrast button

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!27
2022-10-20 05:20:48 +00:00
Arnfried Griesert 0b82c5f24d MESSENGER-3688 BITV contrast button 2022-10-20 05:20:47 +00:00
Frank Rotermund 4364e072b6 MESSENGER-3620 Show Lottie on first startup 2022-10-19 23:17:25 +02:00
Frank Rotermund 5559766ee3 build fix 2022-10-19 20:18:31 +02:00
Frank Rotermund 77061fa2b9 Merge branch 'feature/3620_launchscreen_animation' into 'develop'
Messenger-3620 launchscreen animation

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!28
2022-10-18 10:36:49 +00:00
Arnfried Griesert 2f6fa7bb87 Messenger-3620 launchscreen animation 2022-10-18 10:36:49 +00:00
Frank Rotermund 6116fc3b4d Merge branch 'feature/ort_scan_integration' into 'develop'
Feature/ort scan integration

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!33
2022-10-18 06:42:15 +00:00
Juergen Wischer 9be1447102 Feature/ort scan integration 2022-10-18 06:42:15 +00:00
Frank Rotermund fea8136d54 Merge branch 'feature/3699_double_taps_zoom' into 'develop'
MESSENGER-3699 double tap for image attachments

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!32
2022-10-18 06:07:42 +00:00
Arnfried Griesert 6de8a95b04 MESSENGER-3699 double tap for image attachments 2022-10-18 06:07:42 +00:00
Arnfried Griesert 672db2606e Enable location sharing for testing 2022-10-12 12:55:33 +02:00
Frank Rotermund bb2bfb6ff8 Merge branch 'feature/3639_show_favorites_toogle_for_dm' into 'develop'
MESSENGER-3639 Show favorites toggle in room settings for DMs

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!31
2022-10-11 11:41:04 +00:00
Arnfried Griesert 3fee961c5b MESSENGER-3639 Show favorites toggle in room settings for DMs 2022-10-11 11:41:03 +00:00
Frank Rotermund 1d438e48ab Merge branch 'feature/3639_room_settings_dm' into 'develop'
MESSENGER-3639 Hide room related settings from direct messages

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!29
2022-10-06 06:19:33 +00:00
Arnfried Griesert abebaf6866 MESSENGER-3639 Hide room related settings from direct messages 2022-10-06 06:19:33 +00:00
Frank Rotermund 9e4631ac06 Merge branch 'feature/3652_text_change_closed_polls' into 'develop'
MESSENGER-3652 changed text closed poll into hidden poll

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!25
2022-10-06 05:57:49 +00:00
Arnfried Griesert 4868f7fe2a MESSENGER-3652 changed text closed poll into hidden poll 2022-10-06 05:57:49 +00:00
Frank Rotermund 3185dbc003 Merge branch 'feature/3510_text_change_rolls_and_rights' into 'develop'
MESSENGER-3510 changed text rolls and rights

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!26
2022-10-06 05:57:09 +00:00
Arnfried Griesert e378ca5ea6 MESSENGER-3510 changed text rolls and rights 2022-10-06 05:57:09 +00:00
Frank Rotermund e262bf7fbc Merge branch 'feature/3626_change_copyright_url' into 'develop'
MESSENGER-3626 replaced copyright url

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!24
2022-10-06 05:55:50 +00:00
Arnfried Griesert cf64ede9ad MESSENGER-3626 replaced copyright url 2022-10-06 05:55:50 +00:00
Frank Rotermund 4f4735cb9d MESSENGER-3671 corrected versions 2022-10-06 07:51:52 +02:00
Frank Rotermund 9ec5e2226c MESSENGER-3671 Buildfixes 2022-10-05 16:43:20 +02:00
Frank Rotermund 4d1ead2479 MESSENGER-3671 Merge FOSS 1.9.8
Conflicts:
 - CommonConfiguration.swift
 - BuildSettings.swift
 - Generated/images.Swift
 - RoomMemberDetailsViewController.m
 - LiveLocationSharingViewModell
-  PinCodeEnterViewController.m
2022-10-05 15:47:27 +02:00
Frank Rotermund bcba73d558 MESSENGER-3675 Security fix faceID, master tag for sdk 2022-10-05 15:15:48 +02:00
Frank Rotermund d2a3c2b956 MESSENGER-3675 remove message bubbles from prod build, make them setable on beta build 2022-10-05 14:44:04 +02:00
Frank Rotermund c4e914f485 MESSENGER-3675 fix for content scanner bubbles 2022-10-05 13:19:30 +02:00
Frank Rotermund 45b8fc9c9d MESSENGER-3675 corrected licence message for rolls and rights 2022-10-05 13:17:14 +02:00
Frank Rotermund 3edf7d56b1 MESSENGER-3675 show Analytics Alert only when analytics is enabled, show correct feature banner 2022-10-05 13:14:25 +02:00
Doug 375508a0e4 Merge branch 'release/1.9.8/master' 2022-10-04 18:12:10 +01:00
Doug 75128346af finish version++ 2022-10-04 18:12:10 +01:00
Doug d74b894082 Merge pull request #6795 from vector-im/release/1.9.8/release
Release 1.9.8
2022-10-04 18:10:06 +01:00
Doug b5292bb51d Merge pull request #6799 from vector-im/doug/fix-swiftui-navigation-bars
Fix navigation bars inside of VectorHostingController.
2022-10-04 17:15:42 +01:00
Doug 504103d69e Merge pull request #6796 from vector-im/doug/fix-empty-state-toolbar
Fix missing toolbar in AllChatsViewController.
2022-10-04 16:29:20 +01:00
Doug ce3810ecad Fix navigation bars inside of VectorHostingController. 2022-10-04 16:05:09 +01:00
Doug 1fb580edea Fix missing toolbar in AllChatsViewController.
The empty artwork view was obscuring it.
2022-10-04 14:59:27 +01:00
Doug fc0ee8c00b version++ 2022-10-04 13:00:09 +01:00
Doug 4ca8f2703f changelog.d: Upgrade MatrixSDK version ([v0.24.0](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.24.0)). 2022-10-04 13:00:09 +01:00
Doug 05eaa23609 Merge pull request #6794 from vector-im/doug/weblate
Weblate
2022-10-04 12:58:46 +01:00