felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-05 15:37:45 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,392 Commits 1 Branch 67 Tags
84d4da2e42bb83eda3e5932fe8aac087a6cd96db
Commit Graph

1322 Commits

Author SHA1 Message Date
SBiOSoftWhare aaec54896b Split view: Set navigationItem.leftItemsSupplementBackButton to YES for view controllers used as detail. 2021-10-05 10:48:51 +02:00
SBiOSoftWhare 15e9ca5941 Split view: Set navigationItem.leftItemsSupplementBackButton to YES for view controllers used as detail. 2021-10-05 10:48:51 +02:00
ismailgulek cc46decec2 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
ismailgulek 6761404d2d Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-30 12:35:46 +03:00
Stefan Ceriu 8b80b3f4c7 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
Stefan Ceriu 7b75dec011 vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods. 2021-09-30 09:40:12 +03:00
ismailgulek 05d71297b5 Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
ismailgulek f76f778e0b Merge branch 'develop' into ismail/4384_room_summary_store 2021-09-28 17:30:39 +03:00
Gil Eluard 8fd88b2053 [Spaces] M10.6.1 Handle space link #4498 
- Update after code review
 2021-09-23 17:15:32 +02:00
Gil Eluard 5521802bc2 [Spaces] M10.6.1 Handle space link #4498 
- Update after code review
 2021-09-23 17:15:32 +02:00
Gil Eluard 96a3624cf6 Merge branch 'spaces' into gil/4498_Handle_space_link 2021-09-23 15:26:29 +02:00
Gil Eluard bcd72924c2 Merge branch 'spaces' into gil/4498_Handle_space_link 2021-09-23 15:26:29 +02:00
Gil Eluard bfe5835082 Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
Gil Eluard c03997f97c Merge branch 'develop' into spaces 2021-09-23 15:26:06 +02:00
David Langley 5f046fbfe0 Merge pull request #4892 from vector-im/langleyd/4772_voice_message_drafts 
Voice message draft persistence
 2021-09-23 11:21:26 +00:00
David Langley 427519398e Merge pull request #4892 from vector-im/langleyd/4772_voice_message_drafts 
Voice message draft persistence
 2021-09-23 11:21:26 +00:00
David Langley f539fbbc85 Remove space 2021-09-23 09:39:09 +01:00
David Langley 625534a7a3 Remove space 2021-09-23 09:39:09 +01:00
David Langley 351e60780b Use RoomId for room by room drafts. 2021-09-23 08:48:15 +01:00
David Langley 350fc0fe30 Use RoomId for room by room drafts. 2021-09-23 08:48:15 +01:00
Gil Eluard 8ced741f66 Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-22 16:58:28 +02:00
Gil Eluard 6044ea45f5 Merge branch 'gil/pre_release_fixes' into gil/4498_Handle_space_link 2021-09-22 16:58:28 +02:00
Stefan Ceriu e6327eb955 Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings 
# Conflicts:
#	Riot/Generated/Strings.swift
 2021-09-22 17:17:05 +03:00
Stefan Ceriu fc3e70891a Merge branch 'develop' into stefan/4881-configurable-app-name-localization-strings 
# Conflicts:
#	Riot/Generated/Strings.swift
 2021-09-22 17:17:05 +03:00
Stefan Ceriu 9957f8f59a Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class. 2021-09-22 16:59:47 +03:00
Stefan Ceriu b41cd1e1a4 Fixes #4881 - Replaced InfoPlist.cfBundleDisplayName with AppInfo.current.displayName and removed the now unused InfoPlist generated class. 2021-09-22 16:59:47 +03:00
Gil Eluard 3c0a4c0633 Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
 2021-09-22 15:39:06 +02:00
Gil Eluard 4068c1a55f Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
 2021-09-22 15:39:06 +02:00
Gil Eluard 1403d464ee [Spaces] M10.6.1 Handle space link #4498 
- Fixed universal links
- Added support for space links
 2021-09-22 14:58:19 +02:00
Gil Eluard 3db7e10c15 [Spaces] M10.6.1 Handle space link #4498 
- Fixed universal links
- Added support for space links
 2021-09-22 14:58:19 +02:00
Stefan Ceriu 4dd70594cc Fixes #4881 - Using the bundle display name as the app name in localizable .strings files. Exposing generated .strings and info.plist members to Objective-C. 2021-09-22 14:10:16 +03:00
Stefan Ceriu cc8b6a8d75 Fixes #4881 - Using the bundle display name as the app name in localizable .strings files. Exposing generated .strings and info.plist members to Objective-C. 2021-09-22 14:10:16 +03:00
David Langley e2c2d3023c Merge pull request #4876 from vector-im/langleyd/4773_pause_resume_voice_messages 
Add Pause/Resume support between rooms.
 2021-09-22 09:38:35 +00:00
David Langley 5a91047f7e Merge pull request #4876 from vector-im/langleyd/4773_pause_resume_voice_messages 
Add Pause/Resume support between rooms.
 2021-09-22 09:38:35 +00:00
ismailgulek 5357e196d4 Adapt sentStatus changes 2021-09-22 11:41:22 +03:00
ismailgulek c7b40f408b Adapt sentStatus changes 2021-09-22 11:41:22 +03:00
David Langley 82bcd8ce79 Add Pause/Resume support between rooms. 2021-09-21 15:52:53 +01:00
David Langley 6e642c4374 Add Pause/Resume support between rooms. 2021-09-21 15:52:53 +01:00
Stefan Ceriu 8c7076d5f5 Fixes #4830 - Automatically dismissing invites for empty rooms after failing to join. 2021-09-21 16:28:48 +03:00
Stefan Ceriu 9a12590dc3 Fixes #4830 - Automatically dismissing invites for empty rooms after failing to join. 2021-09-21 16:28:48 +03:00
Gil Eluard ca83d8258f Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
Gil Eluard d6b824c54f Merge branch 'develop' into spaces 2021-09-20 10:18:01 +02:00
SBiOSoftWhare 3e8dc6dfa8 Merge pull request #4814 from vector-im/steve/4734_room_vc_refacto 
RoomVC: Add a delegate, factorize and reduce usage of AppDelegate
 2021-09-17 15:58:05 +02:00
SBiOSoftWhare 46b7dd67a9 Merge pull request #4814 from vector-im/steve/4734_room_vc_refacto 
RoomVC: Add a delegate, factorize and reduce usage of AppDelegate
 2021-09-17 15:58:05 +02:00
Gil Eluard 9279d17226 Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
 2021-09-15 14:42:04 +02:00
Gil Eluard 6335acc0cd Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
 2021-09-15 14:42:04 +02:00
Stefan Ceriu 62cdb29331 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
Stefan Ceriu ee417c21d8 Revert "Revert "#4693 - Drop iOS 11 support."" 2021-09-14 11:41:36 +03:00
SBiOSoftWhare 787f78bb82 Merge branch 'develop' into steve/4734_nav_room_stack 
# Conflicts:
#	Riot/Modules/Room/RoomViewController.m
 2021-09-09 16:45:35 +02:00
SBiOSoftWhare ee7f6b52f7 Merge branch 'develop' into steve/4734_nav_room_stack 
# Conflicts:
#	Riot/Modules/Room/RoomViewController.m
 2021-09-09 16:45:35 +02:00