felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-14 03:40:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
18,861 Commits 1 Branch 67 Tags
bcf877d64fb002e3fed7585e6f0ebf443c704d2b
Commit Graph

1081 Commits

Author SHA1 Message Date
Frank Rotermund c5886f1836 Merge branch 'feature/4174_better_error_message_when_backend_down' into 'develop' 
Feature/4174 better error message when backend down

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!103
 2023-03-07 12:28:55 +00:00
Frank Rotermund e435aebd55 Feature/4174 better error message when backend down 2023-03-07 12:28:55 +00:00
JanNiklas Grabowski 6344fa6cb6 MESSENGER-4197 fix status messages cut off 2023-03-07 12:14:51 +00:00
Frank Rotermund 8741d904e9 MESSENGER-4157 Better Texts for downtime warnings 2023-03-01 08:47:25 +01:00
Frank Rotermund 241d322543 Feature/4218 wellknown defaults 2023-02-28 10:07:25 +00:00
Arnfried Griesert eb618b395d MESSENGER-4093 scan permalinks as qr 2023-02-23 06:50:16 +00:00
Frank Rotermund 79743b5165 MESSENGER-4211 Notes room improvements for new layout 2023-02-22 07:19:05 +00:00
Frank Rotermund cb100fab66 Merge branch 'release/v.2.3.0' into develop 
# Conflicts:
#	Podfile
 2023-02-16 16:29:24 +01:00
Frank Rotermund 8b0ff57d69 MESSENGER-4258 Fixes from Testprotocol 2023-02-16 15:40:21 +01:00
JanNiklas Grabowski b4d4330109 Merge commit '8b96dce52c015ca629dea38c32307cddbcd2577c' into feature/4260_merge_foss_1_10_2 
# Conflicts:
#	Config/AppVersion.xcconfig
#	Podfile
#	Podfile.lock
#	Riot.xcworkspace/xcshareddata/swiftpm/Package.resolved
#	Riot/Managers/EncryptionKeyManager/EncryptionKeyManager.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Authentication/AuthenticationCoordinator.swift
#	Riot/Modules/Authentication/Legacy/LegacyAuthenticationCoordinator.swift
#	Riot/Modules/ContextMenu/ActionProviders/RoomActionProvider.swift
#	Riot/Modules/Home/AllChats/AllChatsViewController.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoCoordinator.swift
#	Riot/Modules/Room/RoomInfo/RoomInfoList/RoomInfoListViewController.swift
#	Riot/Modules/Room/Settings/RoomSettingsViewController.m
#	fastlane/Fastfile
 2023-02-15 14:56:55 +01:00
Frank Rotermund f347864261 Merge branch 'feature/4088_emoji_name_changes' into 'develop' 
Align emoji names with other platforms

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!79
 2023-02-10 10:01:16 +00:00
Arnfried Griesert 5fadb61abf Align emoji names with other platforms 2023-02-10 10:01:15 +00:00
Frank Rotermund 19ff9e0371 Feature/2821 server maintenance info 2023-02-07 12:48:46 +00:00
Andy Uhnak 0bdde0e26c Track crypto sdk being enabled 2023-02-02 17:55:09 +00:00
Flescio 67f3401bce Merge pull request #7314 from vector-im/flescio/1040-poll_detail 
Details screen of a poll (PSG-1039)
 2023-02-01 15:46:08 +01:00
Alfonso Grillo 16e54b7141 Merge branch 'develop' into alfogrillo/sync_polls_rulles_error_handling 2023-02-01 14:07:21 +01:00
Alfonso Grillo 3f5beece27 Add error handling for push sync 2023-02-01 11:38:38 +01:00
Flavio Alescio d1333a8c45 Merge commit '32beb2393ceb08e585e8d62c145d133d9bba5ce6' into flescio/1040-poll_detail 2023-02-01 10:13:28 +01:00
aringenbach 32beb2393c Merge pull request #7317 from vector-im/aringenbach/7316_indentation_support 
Labs: Rich text editor: enable list items indentation
 2023-02-01 09:44:45 +01:00
Flavio Alescio 368892d2ad Merge commit '35d6d9ada3d92068f328e31b547a348ef035380b' into flescio/1040-poll_detail 2023-01-31 16:03:49 +01:00
Flescio 35d6d9ada3 Merge pull request #7301 from vector-im/flescio/7253-Add_mar_kas_unread_option_for_rooms 
Flescio/7253 add mar kas unread option for rooms
 2023-01-31 12:37:40 +01:00
Nicolas Mauri f6229d1b65 Merge pull request #7302 from vector-im/nimau/7189_vb_decryption_error 
Inform the user about decryption errors during a voice broadcast
 2023-01-31 10:23:47 +01:00
Flavio Alescio 321de767c5 Merge branch 'develop' into flescio/1040-poll_detail 2023-01-31 09:18:59 +01:00
Andy Uhnak ea6c6b171d Display backup import progress 2023-01-30 15:49:10 +00:00
Flavio Alescio 0f75dbd40d Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms 2023-01-30 15:55:30 +01:00
aringenbach a903196e48 Labs: Rich text editor: enable list items indentation 2023-01-30 15:38:56 +01:00
Flavio Alescio f66170b9cd generated String 2023-01-27 15:23:44 +01:00
Flavio Alescio 4e4ad5074c Merge branch 'develop' into flescio/1040-poll_detail 
# Conflicts:
#	Riot/Generated/Strings.swift
#	RiotSwiftUI/Modules/Room/PollHistory/Coordinator/PollHistoryCoordinator.swift
#	RiotSwiftUI/Modules/Room/PollHistory/PollHistoryModels.swift
#	RiotSwiftUI/Modules/Room/PollHistory/PollHistoryViewModel.swift
 2023-01-27 15:22:15 +01:00
Andy Uhnak 746fd99ddb Generate crypto store key 2023-01-27 10:20:40 +00:00
Frank Rotermund cdb37aaab7 Feature/4014 new layout notes room 2023-01-27 10:18:49 +00:00
Alfonso Grillo 844da02c74 Add alert on error 2023-01-25 18:40:09 +01:00
Nicolas Mauri 13b7f78de7 Inform the user about decryption errors during a voice broadcast 2023-01-25 17:23:42 +01:00
Flavio Alescio 08fc35d4fe fix strings after merge 2023-01-25 16:06:40 +01:00
Flavio Alescio a8c82abd35 Merge branch 'develop' into flescio/1040-poll_detail 
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
 2023-01-25 15:49:40 +01:00
Flavio Alescio 89ffbcfa3f Merge branch 'develop' into flescio/7253-Add_mar_kas_unread_option_for_rooms 2023-01-25 10:28:37 +01:00
Flavio Alescio 9199407f2f added view poll in timeline button 2023-01-25 10:27:21 +01:00
Gil Eluard 04f85ad8b8 App Layout: Removed the onboarding flow 2023-01-24 21:25:58 +01:00
Alfonso Grillo ee43787857 Localize load more button 2023-01-24 09:27:20 +01:00
JanNiklas Grabowski fb92b09f64 MESSENGER-4016 add netiquette 2023-01-23 14:42:33 +00:00
Alfonso Grillo a7dea54852 Add empty screen with number of days 2023-01-23 12:09:46 +01:00
Alfonso Grillo e067e044ef Add loading view 2023-01-23 12:09:46 +01:00
Anderas 4aee4cef82 Merge pull request #7272 from vector-im/andy/migrate_crypto 
Add labs settings for Crypto SDK
 2023-01-23 09:22:11 +00:00
Alfonso Grillo fb01e2278e Merge pull request #7284 from vector-im/alfogrillo/reply_to_ended_polls 
Render replies to ended polls (PSG-1131)
 2023-01-19 10:34:42 +01:00
Andy Uhnak f7cd7c4459 Display migration progress during startup 2023-01-18 16:45:32 +00:00
Yoan Pintas a42f231a6d Voice broadcast connection error handling while recording (#7282) 2023-01-18 16:27:13 +00:00
Alfonso Grillo 129140b729 Add new localisation for ended poll replies 2023-01-18 16:35:39 +01:00
aringenbach dee0aad1be Merge pull request #7239 from vector-im/aringenbach/7238_rte_enable_bulleted_numbered_lists 
Rich Text Composer: Enable bulleted/numbered lists, quote & code blocks support
 2023-01-18 09:42:24 +01:00
Yoan Pintas 947f67ec93 Handle a connection issue when we try to start a new voice broadcast (#7276) 2023-01-17 14:49:36 +00:00
Nicolas Mauri be2a6f15b1 Merge pull request #7257 from vector-im/nimau/PSF-1734_vb_control_center 
Fix the now playing info center while a voice broadcast is played
 2023-01-17 09:38:28 +01:00
Frank Rotermund 3288335a79 MESSENGER-4068 buildfixes 2023-01-16 14:37:53 +01:00