JanNiklas Grabowski
ebcb633892
MESSENGER-5706 merge from #5660 and refactoring
2024-03-01 14:06:46 +01:00
JanNiklas Grabowski
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
Arnfried Griesert
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
Arnfried Griesert
9f6fff8270
Added BWIThemeService helper class
2024-03-01 03:27:14 +01:00
Arnfried Griesert
559eeea1cd
Bugfixes and changes from the approval
2024-02-28 16:22:51 +01:00
Arnfried Griesert
f3edc3d3a1
Fixed some bugs
2024-02-28 06:26:05 +01:00
JanNiklas Grabowski
3ddb4e4d04
MESSENGER-5706 change appearance and use wellknown
2024-02-27 14:36:30 +01:00
Arnfried Griesert
5025925d3a
Check for wellknown and account data flag
2024-02-27 07:36:51 +01:00
JanNiklas Grabowski
507eeabf75
MESSENGER-5668 change button appearance key backup
2024-02-23 16:45:48 +01:00
JanNiklas Grabowski
d15d8e9f76
MESSENGER-5706 show federation announcement promt
2024-02-22 15:15:29 +01:00
JanNiklas Grabowski
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
Arnfried Griesert
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
Arnfried Griesert
3d75c4ad84
MESSENGER-5610 change profile hint
2024-02-16 06:46:48 +00:00
Arnfried Griesert
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
JanNiklas Grabowski
01c5e038bc
MESSENGER-5595 text changes reset whs
2024-02-12 16:03:13 +01:00
JanNiklas Grabowski
b8ccdc84c6
MESSENGER-5602 hide keyboard when app goes into background state
2024-02-12 15:06:28 +01:00
Arnfried Griesert
315e040d93
Delete video files in temp folder when the upload is done or has failed
2024-02-09 09:33:50 +01:00
Arnfried Griesert
95f2332738
Merge branch 'develop' into feature/5365_photos_picker
2024-02-06 10:21:02 +01:00
Arnfried Griesert
b4285c367b
Run uploadVideo on main thread
2024-02-06 06:17:31 +01:00
Arnfried Griesert
3c08657eb2
Make a copy of a video file before uploading
2024-02-06 05:50:11 +01:00
JanNiklas Grabowski
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
Frank Rotermund
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
JanNiklas Grabowski
a573e15ea3
MESSENGER-5671 deactivate swpie gesture room participants list
2024-02-02 16:17:09 +01:00
Frank Rotermund
af9354320a
MESSENGER-5290 fix klickable events part two
2024-02-02 13:57:50 +01:00
Arnfried Griesert
d080240b77
Made some changes in video upload for debugging only
2024-02-02 11:04:43 +01:00
Frank Rotermund
9f55da8b53
MESSENGER-5290 fix klickable events
2024-02-02 09:27:58 +01:00
JanNiklas Grabowski
e0e0c9b34e
MESSENGER-5383 check for canonical alias
2024-02-01 14:48:10 +01:00
Arnfried Griesert
0999fd3d7c
Merge branch 'develop' into 'feature/5365_photos_picker'
...
# Conflicts:
# Config/BWIBuildSettings.swift
2024-01-31 07:41:57 +00:00
JanNiklas Grabowski
5f41692969
fix pipeline
2024-01-30 13:54:25 +01:00
JanNiklas Grabowski
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
Frank Rotermund
ebbd5a5c78
Merge branch 'feature/4478_wellknown_from_homeserver' into 'develop'
...
MESSENGER-4478 refresh wellknown on app start
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!301
2024-01-30 12:04:57 +00:00
JanNiklas Grabowski
ba4e145039
MESSENGER-5383 Check alias on acl update
2024-01-30 12:45:05 +01:00
Arnfried Griesert
a1e169f1f1
Replaced photo and video picker in new composer
2024-01-30 05:29:35 +01:00
Arnfried Griesert
0031ec044f
Replace old MediePickerBridgePresenter with new PhotosUI
2024-01-30 03:56:11 +01:00
Frank Rotermund
53617a2d19
MESSENGER-4478 refresh wellknown on app start
2024-01-29 15:21:41 +01:00
Arnfried Griesert
060bc19baf
Merge branch 'feature/5205_matrix_id' into 'develop'
...
MESSENGER-5205 Show matrix identifier in second line
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!296
2024-01-29 12:50:32 +00:00
Frank Rotermund
11beae52ab
Merge branch 'feature/5290_mark_federated_users' into 'develop'
...
Feature/5290 mark federated users
See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!299
2024-01-29 12:26:06 +00:00
Frank Rotermund
9b00e5a392
MESSENGER-5290 refactor to consider if sender or target
2024-01-29 08:12:33 +01:00
JanNiklas Grabowski
58282bd602
add checks for federated flag for room
2024-01-26 14:17:55 +01:00
JanNiklas Grabowski
56c544797d
refactor set serveracl and fix json key
2024-01-26 13:25:27 +01:00
JanNiklas Grabowski
65864cc1ab
Merge commit '653554e759f81eb0d18852ac8a46b462c514b245' into feature/refactoring_federation
...
* commit '653554e759f81eb0d18852ac8a46b462c514b245':
reset versions
MESSENGER-5304 refactoring
MESSENGER-5304 add condition
MESSENGER-5386 change alert appearance
MESSENGER-5381 disable federated admins
MESSENGER-5386 us17 invite federated users only if room is federated
MESSENGER-5304 refactoring and english translation
MESSENGER-5304 add text styling and spacing
MESSENGER-5304 add room federation decision sheet
2024-01-26 11:56:58 +01:00
JanNiklas Grabowski
f1e6b04542
refactoring get federation status
2024-01-25 17:23:17 +01:00
JanNiklas Grabowski
2724144c27
Merge branch 'feature/5304_us14_add_federation_info_view_for_old_rooms' into feature/5381_disable_federated_admins
...
* feature/5304_us14_add_federation_info_view_for_old_rooms:
reset versions
MESSENGER-5304 refactoring
MESSENGER-5304 add condition
MESSENGER-5386 change alert appearance
MESSENGER-5386 us17 invite federated users only if room is federated
MESSENGER-5304 refactoring and english translation
MESSENGER-5304 add text styling and spacing
MESSENGER-5304 add room federation decision sheet
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
2024-01-25 15:34:17 +01:00
JanNiklas Grabowski
90701f4d9d
Merge commit '17b2fa5409f49e10a7f136101989960a7f50dc73' into feature/5304_us14_add_federation_info_view_for_old_rooms
...
* commit '17b2fa5409f49e10a7f136101989960a7f50dc73':
MESSENGER-5386 change alert appearance
MESSENGER-5386 us17 invite federated users only if room is federated
fix pipeline
MESSENGER-5226 us12 federation in timeline header
# Conflicts:
# Riot/Assets/de.lproj/Bwi.strings
# Riot/Assets/en.lproj/Bwi.strings
2024-01-25 15:24:03 +01:00
JanNiklas Grabowski
9e233f696b
MESSENGER-5304 refactoring
2024-01-25 14:48:06 +01:00
JanNiklas Grabowski
128f24c62a
MESSENGER-5226 us12 check if room is personal notes room
2024-01-25 13:19:10 +01:00
JanNiklas Grabowski
81abd348be
MESSENGER-5304 add condition
2024-01-25 12:58:32 +01:00
Frank Rotermund
6c63bab67f
MESSENGER-5290 remove debug code
2024-01-25 11:36:19 +01:00
Frank Rotermund
02baa617c4
MESSENGER-5290 mark more federated user status events
2024-01-25 11:35:11 +01:00
JanNiklas Grabowski
30b2ba61bb
MESSENGER-5386 change alert appearance
2024-01-25 11:11:45 +01:00
