d4e3751d03
MESSENGER-5781 fix trigger for federation decision sheet in room preview
2024-03-14 16:39:32 +01:00
5f80a8f2a4
Merge branch 'feature/photos_picker_filter' into 'develop'
...
Fix in image picker filter to prevent live photos and videos to be picked
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!331
2024-03-06 11:23:26 +00:00
2c0bd9f5ba
Removed obsolete debug output
2024-03-06 08:24:37 +01:00
b6a9d8ba56
Fix in image picker filter to prevent live photos and videos to be picked
2024-03-06 08:12:30 +01:00
d6a22fd2ba
Merge branch 'feature/feature/5706_fix_alert_triggering_for_new_users' into 'develop'
...
MESSENGER-5706 fix alert triggering for new users
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!329
2024-03-05 14:20:36 +00:00
a2fdb559e7
MESSENGER-5706 fix crash missing wellknown
2024-03-05 11:05:25 +01:00
3d5e33b565
Merge branch 'feature/5393_matomo_tracking_for_federation' into 'develop'
...
Feature/5393 matomo tracking for federation
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!330
2024-03-05 09:50:32 +00:00
aa5982a80e
MESSENGER-5706 fix crash missing wellknown
2024-03-05 10:38:27 +01:00
52d40ca517
MESSENGER-5393 some tracking fixes
2024-03-05 08:23:02 +01:00
588030542b
MESSENGER-5393 matomo ztracking for federation
2024-03-05 07:36:19 +01:00
1023cfca24
MESSENGER-5706 fix alert triggering for new users
2024-03-04 17:41:35 +01:00
99e5488ff0
Merge branch 'feature/5706_show_federation_info' into 'develop'
...
Feature/5706 show federation info
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!325
2024-03-04 10:00:50 +00:00
1196cee418
MESSENGER-5695 remove borders from avatar photos
2024-03-04 06:57:19 +00:00
787c1211a0
Merge commit 'ba936df9dff7039634397670f5a18bd1be8da222' into feature/5706_show_federation_info
...
* commit 'ba936df9dff7039634397670f5a18bd1be8da222':
MESSENGER-5575 spelling
MESSENGER-5575 use sdk with fixed event mapping
MESSENGER-5575 ACL status event handling in the timeline
MESSENGER-5575 decide first ACL event based on state
MESSENGER-5570 build fix strigntables in NSE
MESSENGER-5570 build with correct sdk
MESSENGER-5570 acl status events up to collapsability
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
# Riot/Generated/BWIStrings.swift
2024-03-01 15:55:15 +01:00
11a27b2346
MESSENGER-5706 refactoring
2024-03-01 14:34:41 +01:00
ebcb633892
MESSENGER-5706 merge from #5660 and refactoring
2024-03-01 14:06:46 +01:00
784c31ce02
Merge branch 'develop' into 'feature/5575_acl_status_in_timeline'
...
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
2024-03-01 12:29:59 +00:00
8c5666ec06
Merge branch 'develop' into feature/5706_show_federation_info
...
* develop:
MESSENGER-5734 SweT kompatible Readme
Added BWIThemeService helper class
Some minor changes from review
Changed name WellknownFederation
Removed #preview macros
Fixed a wrong frame size in the first federation screen
Bugfixes and changes from the approval
Layout and color changes
Replaced asset for federation screen
New button text for federation screen
Fixed some bugs
Check for wellknown and account data flag
Added screens for federation introduction
MESSENGER-5668 change button appearance key backup
MESSENGER-5603 fix handle reply to link in app
MESSENGER-5768 set old composer as default
fix pipeline
MESSENGER-5759 allow http only in web content
MESSENGER-5578 add success alert to federation decision sheet
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
# Riot/Modules/Home/AllChats/AllChatsCoordinator.swift
# Riot/Modules/Home/AllChats/AllChatsViewController.swift
# bwi/Wellknown/WellknownBWI.swift
2024-03-01 12:55:12 +01:00
385ee21774
Merge branch 'feature/5660_introduce_federation' into 'develop'
...
MESSENGER-5660 introduce federation
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!324
2024-03-01 11:33:07 +00:00
272d6de13f
Merge branch 'develop' into 'feature/5575_acl_status_in_timeline'
...
# Conflicts:
# Podfile
2024-03-01 09:00:34 +00:00
2867bae23e
MESSENGER-5575 ACL status event handling in the timeline
2024-03-01 07:25:42 +01:00
9f6fff8270
Added BWIThemeService helper class
2024-03-01 03:27:14 +01:00
559eeea1cd
Bugfixes and changes from the approval
2024-02-28 16:22:51 +01:00
f3edc3d3a1
Fixed some bugs
2024-02-28 06:26:05 +01:00
3ddb4e4d04
MESSENGER-5706 change appearance and use wellknown
2024-02-27 14:36:30 +01:00
5025925d3a
Check for wellknown and account data flag
2024-02-27 07:36:51 +01:00
d07f992659
MESSENGER-5575 decide first ACL event based on state
2024-02-26 14:41:29 +01:00
507eeabf75
MESSENGER-5668 change button appearance key backup
2024-02-23 16:45:48 +01:00
d15d8e9f76
MESSENGER-5706 show federation announcement promt
2024-02-22 15:15:29 +01:00
4aaf86e41e
MESSENGER-5570 acl status events up to collapsability
2024-02-21 16:50:20 +01:00
bb84e862c3
Merge branch 'feature/5595_text_changes_reset_whs' into 'develop'
...
MESSENGER-5595 text changes reset whs
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!314
2024-02-19 11:22:50 +00:00
f9f3b69763
Merge branch 'feature/5610_change_profile_hint' into 'develop'
...
MESSENGER-5610 change profile hint
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!315
2024-02-16 06:46:48 +00:00
3d75c4ad84
MESSENGER-5610 change profile hint
2024-02-16 06:46:48 +00:00
51ba79dc15
Merge branch 'feature/5365_photos_picker' into 'develop'
...
MESSENGER-5365 photos picker
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!302
2024-02-16 06:46:13 +00:00
01c5e038bc
MESSENGER-5595 text changes reset whs
2024-02-12 16:03:13 +01:00
b8ccdc84c6
MESSENGER-5602 hide keyboard when app goes into background state
2024-02-12 15:06:28 +01:00
315e040d93
Delete video files in temp folder when the upload is done or has failed
2024-02-09 09:33:50 +01:00
95f2332738
Merge branch 'develop' into feature/5365_photos_picker
2024-02-06 10:21:02 +01:00
b4285c367b
Run uploadVideo on main thread
2024-02-06 06:17:31 +01:00
3c08657eb2
Make a copy of a video file before uploading
2024-02-06 05:50:11 +01:00
37882d5610
Merge branch 'feature/5383_check_alias_old_rooms' into 'develop'
...
Feature/5383 check alias old rooms
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!304
2024-02-05 12:25:27 +00:00
2dcf1b48ae
Merge branch 'feature/5290_fix_clickable_invitation_events' into 'develop'
...
Feature/5290 fix clickable invitation events
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!309
2024-02-05 12:12:34 +00:00
a573e15ea3
MESSENGER-5671 deactivate swpie gesture room participants list
2024-02-02 16:17:09 +01:00
af9354320a
MESSENGER-5290 fix klickable events part two
2024-02-02 13:57:50 +01:00
d080240b77
Made some changes in video upload for debugging only
2024-02-02 11:04:43 +01:00
9f55da8b53
MESSENGER-5290 fix klickable events
2024-02-02 09:27:58 +01:00
e0e0c9b34e
MESSENGER-5383 check for canonical alias
2024-02-01 14:48:10 +01:00
0999fd3d7c
Merge branch 'develop' into 'feature/5365_photos_picker'
...
# Conflicts:
# Config/BWIBuildSettings.swift
2024-01-31 07:41:57 +00:00
5f41692969
fix pipeline
2024-01-30 13:54:25 +01:00
88b166f815
Merge branch 'develop' into feature/5383_check_alias_old_rooms
...
* develop:
MESSENGER-5290 refactor to consider if sender or target
MESSENGER-5290 remove debug code
MESSENGER-5290 mark more federated user status events
Fixed bool value
MESSENGER-5290 mark federated user status events
Show matrix identifier in second line
# Conflicts:
# RiotNSE/target.yml
2024-01-30 13:06:22 +01:00
JanNiklas Grabowski
Arnfried Griesert
Frank Rotermund