felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-05 23:47:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
32,138 Commits 1 Branch 67 Tags
5dd5dc2db7fce685b4eacdfdce9e3217ff22b0b2
Commit Graph

314 Commits

Author SHA1 Message Date
Doug fc8484b467 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-27 16:28:15 +01:00
Doug 1408095129 Merge branch 'develop' into doug/4479_media_size_selection 2021-08-27 16:28:15 +01:00
Stefan Ceriu fc0f8e2163 #4693 - Updates following code review. 2021-08-25 13:57:32 +03:00
Stefan Ceriu 79c5fe7dab #4693 - Updates following code review. 2021-08-25 13:57:32 +03:00
Doug 040416d745 Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +01:00
Doug c7f426f977 Combine confirm image/video size settings into one. 2021-08-23 11:16:32 +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 a9d5d4d5d7 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 7dea78bae9 Merge branch 'develop' into doug/4479_media_size_selection 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
 2021-08-16 10:01:54 +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
Stefan Ceriu ecfa544cd0 Remove labs setting for voice messages, enable the feature by default. Fixed incorrect ffmpeg arguments. 2021-08-06 14:22:52 +03:00
Doug ab50ed05e9 Add "Confirm image size before sending" setting. 
Use this when sending images.
 2021-07-28 14:14:34 +01:00
Doug abd1bd2a41 Add "Confirm image size before sending" setting. 
Use this when sending images.
 2021-07-28 14:14:34 +01:00
manuroe f6483d7262 Merge branch 'develop' into element_4090 2021-07-22 14:16:35 +02:00
manuroe 09f7701e09 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 031ef98ac4 #4090 - Added voice messages switch to the labs section in settings. 2021-07-16 16:57:29 +03:00
Gil Eluard a803a025a4 Show / hide reset button in secrets recovery screen (#4546). 2021-07-12 22:51:56 +02:00
Gil Eluard fb2b215a45 Show / hide reset button in secrets recovery screen (#4546). 2021-07-12 22:51:56 +02:00
SBiOSoftWhare 8a15d0e993 Merge branch 'spaces_beta' into spaces_feature_unavailable 
# Conflicts:
#	Riot/Modules/Application/LegacyAppDelegate.h
 2021-05-07 15:08:45 +02:00
SBiOSoftWhare 5e7e07eef0 Merge branch 'spaces_beta' into spaces_feature_unavailable 
# Conflicts:
#	Riot/Modules/Application/LegacyAppDelegate.h
 2021-05-07 15:08:45 +02:00
SBiOSoftWhare ecbedf955a GroupsViewController: Add space beta announce cell. 2021-05-06 12:09:12 +02:00
SBiOSoftWhare 0cd3f9a5e6 GroupsViewController: Add space beta announce cell. 2021-05-06 12:09:12 +02:00
ismailgulek 17e11c6663 Merge branch 'develop' into voip_design_updates 2021-05-04 19:10:22 +03:00
ismailgulek ac1e5525ab Merge branch 'develop' into voip_design_updates 2021-05-04 19:10:22 +03:00
Gil Eluard 14189d2a5c Merge branch 'develop' into element_4285 2021-04-29 19:49:42 +02:00
Gil Eluard 08d6f3acda 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
Gil Eluard b88deda0ba Show / hide NSFW and decrypted content options in Settings screen from build settings 2021-04-29 17:53:18 +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 148b52829b 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
Gil Eluard 4f7526dfbe Enable / disable "Hide all messages from this user" of Room Member Screen from settings 2021-04-29 15:38:19 +02:00
ismailgulek 5266254232 Merge branch 'develop' into voip_design_updates 2021-04-28 14:03:13 +03:00
ismailgulek f44ac75b0c Merge branch 'develop' into voip_design_updates 2021-04-28 14:03:13 +03:00
Gil Eluard d4a1729e52 clear cache support for RiotSettings 2021-04-23 22:26:54 +02:00
Gil Eluard c9dad4adda clear cache support for RiotSettings 2021-04-23 22:26:54 +02:00
ismailgulek 36f43c52ee Merge branch 'develop' into voip_design_updates 2021-04-21 12:49:21 +03:00
ismailgulek ddfebb4384 Merge branch 'develop' into voip_design_updates 2021-04-21 12:49:21 +03: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 0aa76f94c4 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 67f86cafe9 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 bc282c7fdb 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 b5a7af8b3a Merge branch 'develop' into element_4211 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:05:20 +02:00
Gil Eluard 5a29506407 Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
Gil Eluard a3cc1849ca Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00