Commit Graph

101 Commits

Author SHA1 Message Date
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 040416d745 Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +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 34d8cf24fe Merge branch 'develop' into doug/4609_support_functional_members
# Conflicts:
#	CHANGES.rst
2021-08-09 10:20:08 +01:00
Stefan Ceriu 7c637939a9 Remove labs setting for voice messages, enable the feature by default. Fixed incorrect ffmpeg arguments. 2021-08-06 14:22:52 +03:00
Doug 13c4881ef1 Enable functional members by default. 2021-08-06 10:42:18 +01:00
Doug 94e47cd6e7 Cherry-pick from fc058c7 and eae64dc. Update CHANGES.rst. 2021-08-04 10:12:50 +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 21049b5ad0 Merge branch 'develop' into doug/4519_decrypt_notifications_by_default_fix
# Conflicts:
#	CHANGES.rst
#	Config/BuildSettings.swift
2021-07-23 10:15:44 +01:00
Doug c340e60886 Merge branch 'develop' into doug/4521_remove_directory_from_rooms_tab 2021-07-22 14:37:25 +01:00
manuroe f6483d7262 Merge branch 'develop' into element_4090 2021-07-22 14:16:35 +02: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 134250d486 #4094 - Sending voice message recording length and waveform samples. 2021-07-13 16:03:20 +03:00
Stefan Ceriu 844d946432 Merge branch 'develop' into element_4090
# Conflicts:
#	CHANGES.rst
2021-07-13 11:30:16 +03:00
Gil Eluard a803a025a4 Show / hide reset button in secrets recovery screen (#4546). 2021-07-12 22:51:56 +02:00
Doug afd4d16696 Add decryptNotificationsByDefault build setting. 2021-07-09 15:00:03 +01:00
Doug 542533aa1b Don't include directorySection in RecentsDataSource when in RecentsDataSourceModeRooms mode. 2021-07-07 11:48:23 +01:00
langleyd 88d816ddf2 disable new settings ui again 2021-07-06 22:46:31 +01:00
langleyd f240fbf0d2 Enabled new room settings UI while I do ad hoc build 2021-07-06 13:14:15 +01:00
langleyd 997cf15dd3 Add new settings notification feature flag and update ui entry point 2021-06-22 13:39:50 +01:00
Stefan Ceriu 14f312ad61 #4090 - Added voice messages feature flag. 2021-06-22 09:42:37 +03:00
SBiOSoftWhare 386d9f8de0 BuildSettings: Add help url and side menu feature flag. 2021-06-07 18:46:16 +02:00
Gil Eluard 93ee283656 Merge pull request #4286 from vector-im/element_4285
Show / Hide More and Report Content contextual menu from settings
2021-04-29 20:36:48 +02:00
manuroe 1a1e3bd7d2 Merge pull request #4283 from vector-im/element_3158_v2
Jitsi: use HS preferredDomain as Jitsi server to create conference v2
2021-04-29 19:54:45 +02:00
Gil Eluard 14189d2a5c Merge branch 'develop' into element_4285 2021-04-29 19:49:42 +02:00
Gil Eluard 899e8c692f Show / hide NSFW and decrypted content options in Settings screen from build settings 2021-04-29 17:53:18 +02:00
manuroe 99457cc959 Merge branch 'develop' into element_3158_v2 2021-04-29 17:52:19 +02:00
Gil Eluard 7ca8fb5d50 Show / Hide More and Report Content contextual menu from settings 2021-04-29 17:03:34 +02:00
Gil Eluard 8dadd54d5f Enable / disable "Hide all messages from this user" of Room Member Screen from settings 2021-04-29 15:38:19 +02:00
SBiOSoftWhare ce3a9869ae WidgetManager: Update Jitsi domain retrieval. 2021-04-29 12:37:27 +02:00
Gil Eluard 7a15c5ab57 Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-21 09:08:58 +02:00
Gil Eluard b6c6e7ffa0 Merge branch 'develop' into element_4211
# Conflicts:
#	CHANGES.rst
2021-04-21 08:23:33 +02:00
Gil Eluard a4fccf4a63 Merge branch 'develop' into element_4218
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:27:27 +02:00
Gil Eluard 591cd261e5 Merge branch 'develop' into element_4211
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 15:05:20 +02:00
Gil Eluard 1c455ed4d9 Show / Hide integrations and actions in rooms
- Initial Build Settings
2021-04-20 14:57:31 +02:00
Gil Eluard 5a29506407 Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
manuroe 6af4652c72 Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
Gil Eluard 3de2531180 Merge branch 'develop' into element_4242
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 11:52:47 +02:00
Gil Eluard 16ff9fb44a Merge branch 'develop' into element_4236
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-20 10:38:30 +02:00
Gil Eluard 05b5c5f992 Enable / Disable VoIP feature in Rooms
- Update after review
2021-04-20 10:36:05 +02:00
Gil Eluard 257f3a8f42 Show/Hide public directory in Unified Search 2021-04-20 10:31:04 +02:00
Eric Eastwood 84e45d744a Add gitter.im to default list of room directories
Fix https://github.com/vector-im/element-ios/issues/4233
2021-04-19 14:09:45 -05:00
Gil Eluard 78fa1d0219 Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard 61abfd0e70 Show/Hide Home Screen tabs 2021-04-19 18:53:32 +02:00
Gil Eluard 09e0c95c8a Make room settings screen configurable dynamically 2021-04-14 15:52:25 +02:00
Gil Eluard 7da3bd1296 Make joining public rooms configurable 2021-04-13 19:21:07 +02:00
Gil Eluard cbb4ae7233 Merge branch 'develop' into element_4181
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
2021-04-06 15:59:40 +02:00
Gil Eluard da038f34d4 Possibility to lock some room creation parameters from settings
- Update after review
2021-04-06 10:51:07 +02:00