Commit Graph

5230 Commits

Author SHA1 Message Date
Arnfried Griesert 8a41cb72a8 Merge branch 'feature/4231_add_new_loginflow' into 'develop'
MESSENGER-4231 add new loginflow

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!98
2023-03-02 13:09:34 +00:00
JanNiklas Grabowski 1d95c8354b Merge branch 'feature/4157_better_serverdowntime_messages' into 'develop'
MESSENGER-4157 Better Texts for downtime warnings

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!101
2023-03-02 12:43:25 +00:00
JanNiklas Grabowski 76deae25ca MESSENGER-4173 fix invites mismatched number 2023-03-02 11:08:23 +01:00
Frank Rotermund 8741d904e9 MESSENGER-4157 Better Texts for downtime warnings 2023-03-01 08:47:25 +01:00
JanNiklas Grabowski 7830c3c6f0 MESSENGER-4231 add new loginflow 2023-02-28 18:06:13 +01:00
Frank Rotermund 41a266871e MESSENGER-4211 Fix Notes clickablility 2023-02-28 13:08:57 +01:00
Frank Rotermund 241d322543 Feature/4218 wellknown defaults 2023-02-28 10:07:25 +00:00
Arnfried Griesert cd2303e446 Merge branch 'feature/3948_show_hide_login_password' into 'develop'
MESSENGER-3948 show hide login password

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!95
2023-02-24 12:01:56 +00:00
Arnfried Griesert dfb5e47985 MESSENGER-3948 show hide login password 2023-02-24 12:01:55 +00:00
Arnfried Griesert 856692111f Merge branch 'feature/3076_alphabetic_user_search_results' into 'develop'
MESSENGER-3076 display user search results alphabetically

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!96
2023-02-24 11:59:29 +00:00
Arnfried Griesert eb618b395d MESSENGER-4093 scan permalinks as qr 2023-02-23 06:50:16 +00:00
Frank Rotermund 1a5980c79a MESSENGER-3076 display user search results alphabetically 2023-02-23 07:44:38 +01: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
Andy Uhnak 0588f5bca7 Crashes in verification view models 2023-02-09 08:44:31 +00:00
Andy Uhnak 599e20ea01 Fix some crashes 2023-02-09 08:44:31 +00:00
Flescio 1a33d6976d "Mark as unread" dot appears on rooms that are actually unread, not marked as such (#7352)
* fix green dot only to appear for marked action
2023-02-09 09:01:16 +01:00
Frank Rotermund 8465630063 Feature/4041 new layout new feature banner 2023-02-08 15:39:51 +00:00
Arnfried Griesert 4264e3b02f MESSENGER-4034 app icon name 2023-02-08 14:53:45 +00:00
Alfonso Grillo 9686f324d6 Merge pull request #7335 from vector-im/alfogrillo/automatic_poll_rules_sync
Automatic poll rules sync (PSG-1135)
2023-02-03 11:57:53 +01:00
Alfonso Grillo b259f9ed0d Refactor PushRulesUpdater API 2023-02-03 10:49:59 +01:00
Andy Uhnak 0bdde0e26c Track crypto sdk being enabled 2023-02-02 17:55:09 +00:00
Alfonso Grillo e31819061a Remove debug prints 2023-02-02 17:01:24 +01:00
Alfonso Grillo 5c1dca8fe4 Put logic back in AppCoordinator 2023-02-02 15:02:13 +01:00
Andy Uhnak ba367d149d Enable Crypto SDK for production 2023-02-02 12:32:14 +00:00
Alfonso Grillo 1114177a16 Move logic in AppConfiguration 2023-02-02 11:04:28 +01:00
Alfonso Grillo 4400b75225 Continue PushRulesUpdater logics 2023-02-02 09:58:29 +01:00
Alfonso Grillo b2d77e3455 Start PushRulesUpdater 2023-02-01 19:11:00 +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
Anderas 7950518db7 Merge pull request #7323 from vector-im/andy/reset_crypto
Reset Crypto SDK labs on logout
2023-01-31 16:35:39 +00:00
Andy Uhnak c2ace3e350 Fix develop 2023-01-31 16:29:17 +00:00
Flavio Alescio fae76cf002 indentation 2023-01-31 16:55:59 +01:00
Flavio Alescio 368892d2ad Merge commit '35d6d9ada3d92068f328e31b547a348ef035380b' into flescio/1040-poll_detail 2023-01-31 16:03:49 +01:00
Flavio Alescio 7b4333e9af code restyle for poll detail 2023-01-31 16:03:38 +01:00
Andy Uhnak 7352cd479c Reset Crypto SDK on logout 2023-01-31 13:14:47 +00: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
Nicolas Mauri 0d49c043a7 Hide decryption errors only for voice broadcast chunks. 2023-01-30 16:37:58 +01:00
Flavio Alescio 1a3529d09b function renamed as in sdk 2023-01-30 16:04:58 +01: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
Anderas aaaec987d8 Merge pull request #7310 from vector-im/andy/crypto_password
Generate Crypto SDK store key
2023-01-30 11:42:40 +00:00
Frank Rotermund f7110e461a MESSENGER-4029 remove longpress and context menus for state events 2023-01-30 10:35:09 +00:00