Commit Graph

538 Commits

Author SHA1 Message Date
Doug bb98bbe1c0 Merge branch 'develop' into doug/888_add_url_previews 2021-09-07 17:51:31 +01:00
Doug a05b1cab03 Move url preview setting under labs section. 2021-09-07 16:00:12 +01:00
Doug 24bfe36712 Add setting to disable URL previews.
Using a temporary position in the settings screen whilst waiting for feedback.
2021-09-03 10:19:26 +01:00
Doug d1eaa90984 Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
2021-08-27 16:30:01 +01:00
Doug fc8484b467 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-27 16:28:15 +01:00
Doug 4c59f1bd37 Update media settings strings. Update share extension image size prompt. 2021-08-27 16:15:46 +01:00
David Langley f49af07c11 Merge pull request #4752 from vector-im/langleyd/4467_account_notification_settings
Account Notification Settings and Keywords
2021-08-26 11:07:11 +01:00
David Langley b8fe7ec453 Remove unneeded string from bad merge 2021-08-25 14:25:57 +01:00
David Langley 73d5aaa966 Add Chips, InputStyles, Service Implementation, swift-collections and UI cleanup. 2021-08-25 13:03:36 +01:00
Stefan Ceriu f93ed348c9 Implements #4693 - Alert users of Element on iOS11 deprecation. 2021-08-25 13:57:32 +03:00
Doug 13846d02ad Merge branch 'develop' into doug/4479_media_size_selection 2021-08-23 12:49:06 +01:00
Doug 040416d745 Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +01:00
Doug 6513b6ada8 Update from feedback.
Set notificationBodyLocalizationKey in CommonConfiguration. Remove redundant customisation. Use MXRoomMemberEventContent.
2021-08-18 12:32:32 +01:00
David Langley c7833d86df Add NotificationSettings and Keywords UI and VM 2021-08-18 09:33:56 +01:00
Doug 168a91fa42 Add reaction content to notifications when available. 2021-08-17 15:51:18 +01:00
Doug 6165a89f33 Update strings from feedback. 2021-08-17 15:38:01 +01:00
David Langley 0336c80db8 run template, add entrypoint and update BuildSetting 2021-08-17 15:00:20 +01:00
Doug aebec5daeb Add an (optional) prompt when sending a video to select its size.
Use high quality when filming video in-app.
2021-08-16 17:48:26 +01:00
Doug 09f68529cd Merge branch 'develop' into doug/4479_media_size_selection
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-08-16 10:01:54 +01:00
Doug 696b4eba32 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-11 17:18:09 +01:00
Doug d9d20d0042 Merge branch 'develop' into doug/4132_improve_notification_content 2021-08-10 10:28:40 +01:00
Thomas Weiland f5b06198cd fixed typo "adress" issue #4480 2021-08-10 10:20:35 +02:00
ismailgulek 96c1615055 New strings 2021-08-06 16:19:53 +03:00
Stefan Ceriu 79b430b4fa #4655 - Localized lock screen voice message name placeholder. 2021-08-05 16:55:02 +03:00
Doug 2ba1adc263 Add voice message notification body. 2021-08-04 16:14:02 +01:00
Doug 9b43034ec8 Add notification body tweaks for video, audio and file messages. 2021-08-04 16:08:33 +01:00
Doug c6757a1a0f Move strings. 2021-08-04 15:31:22 +01:00
Doug c9659a0b11 Strip the original message from reply notifications. 2021-08-04 15:25:16 +01:00
Doug 64a36bca6d Use the body text "Notification" instead of message as the event may not be a message. 2021-08-04 14:18:18 +01:00
ismailgulek 2a4f29e4f3 Merge branch 'develop' into element_4642 2021-08-04 10:57:34 +03:00
Doug b05809cb58 Merge branch 'develop' into doug/2368_allow_silent_notifications 2021-08-03 16:02:53 +01:00
ismailgulek 6d117e374d Add strings for incoming calls 2021-08-03 17:07:15 +03:00
ismailgulek 775250368e Update strings 2021-08-03 17:00:35 +03:00
Doug 20eb92afbb Add fallback notification for reactions. Add fallback notifications for member displayname and avatar changes. 2021-08-03 14:55:06 +01:00
Doug ab50ed05e9 Add "Confirm image size before sending" setting.
Use this when sending images.
2021-07-28 14:14:34 +01:00
Doug cd807d718e Update notifications disabled alert. 2021-07-28 12:45:06 +01:00
Doug 1b184c988f Update string. 2021-07-27 17:38:40 +01:00
Gil Eluard e058b55161 Voice Messages copy could be improved #4604
- Fixed
2021-07-26 22:24:36 +02:00
Doug c340e60886 Merge branch 'develop' into doug/4521_remove_directory_from_rooms_tab 2021-07-22 14:37:25 +01:00
Stefan Ceriu f19511d372 #4090 - Added voice messages switch to the labs section in settings. 2021-07-16 16:57:29 +03:00
Stefan Ceriu 844d946432 Merge branch 'develop' into element_4090
# Conflicts:
#	CHANGES.rst
2021-07-13 11:30:16 +03:00
Stefan Ceriu 22bf808cc6 #4094 - Updated english NSMicrophoneUsageDescription. 2021-07-12 11:53:02 +03:00
Gil Eluard 67613cffa2 #4090 - Update after review 2021-07-10 00:16:23 +02:00
David Baker 84b8a56f9d Merge remote-tracking branch 'origin/develop' into dbkr/scan_button_title 2021-07-09 16:40:16 +01:00
Doug 12918931ef Remove room_recents_directory_section_network localization string. 2021-07-09 12:36:02 +01:00
langleyd 816513cee6 Fix logging, add "Notify me for" label, fix theme on avatar and add changes 2021-07-08 20:54:32 +01:00
Gil Eluard e0415e5a58 Update Riot/Assets/en.lproj/Vector.strings
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
2021-07-06 15:17:54 +02:00
langleyd 0fb949b294 spacing and cleanup dead code 2021-07-05 16:49:06 +01:00
David Baker 62abdf444f Use different title for scan button for self verification
Because it's not 'their' device, it's your own device.
2021-07-02 17:38:12 +01:00
langleyd 8b52cda3f7 Fix typo and don't show link to account settings until we have global notification settings. 2021-07-02 10:30:44 +01:00