Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
12047 commits 46 branches 261 tags 144 MiB
Commit graph

171 commits

Author SHA1 Message Date
manuroe
6b31995d0d Prepare for new sprint 2021-08-12 16:28:03 +02:00
manuroe
33d8b0021d Prepare for new sprint 2021-08-11 15:21:10 +02:00
manuroe
6165b0f280 version++ 2021-08-11 14:48:25 +02:00
Doug
64758a98bb Merge branch 'develop' into doug/4609_support_functional_members 
# Conflicts:
#	CHANGES.rst
 2021-08-09 10:20:08 +01:00
Stefan Ceriu
66f248de2d Remove labs setting for voice messages, enable the feature by default. Fixed incorrect ffmpeg arguments. 2021-08-06 14:22:52 +03:00
Doug
8b480f0e56 Enable functional members by default. 2021-08-06 10:42:18 +01:00
Doug
cefe001295
Merge branch 'develop' into doug/4609_support_functional_members 2021-08-04 11:48:04 +01:00
Doug
8ddca6b0d1 Cherry-pick from fc058c7 and eae64dc. Update CHANGES.rst. 2021-08-04 10:12:50 +01:00
manuroe
37cd8000ce Prepare for new sprint 2021-08-03 15:16:36 +02:00
manuroe
ad9caf9d22 Prepare for new sprint 2021-07-29 16:58:40 +02:00
Doug
6229055e3a 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
d7b77f2fd1
Merge branch 'develop' into doug/4521_remove_directory_from_rooms_tab 2021-07-22 14:37:25 +01:00
manuroe
671f2118cc
Merge branch 'develop' into element_4090 2021-07-22 14:16:35 +02:00
SBiOSoftWhare
24fd98ea01 Prepare for new sprint 2021-07-22 12:36:33 +02:00
SBiOSoftWhare
14ccfe4440 Prepare for new sprint 2021-07-16 17:26:50 +02:00
Stefan Ceriu
089c6889d6 #4090 - Added voice messages switch to the labs section in settings. 2021-07-16 16:57:29 +03:00
SBiOSoftWhare
7983c873ca version++ 2021-07-16 15:13:45 +02:00
Stefan Ceriu
488338f7d9 #4090 - Changed FFMpeg-Kit to the LTS version and moved the project back to deployment target 11.0. 2021-07-16 13:32:19 +03:00
Stefan Ceriu
227197375c #4094 - Sending voice message recording length and waveform samples. 2021-07-13 16:03:20 +03:00
Stefan Ceriu
cf00d3e8c2 Merge branch 'develop' into element_4090 
# Conflicts:
#	CHANGES.rst
 2021-07-13 11:30:16 +03:00
Gil Eluard
a650e49533 Show / hide reset button in secrets recovery screen (#4546). 2021-07-12 22:51:56 +02:00
Doug
9ba4066257 Add decryptNotificationsByDefault build setting. 2021-07-09 15:00:03 +01:00
Doug
b5c3cbe93e Don't include directorySection in RecentsDataSource when in RecentsDataSourceModeRooms mode. 2021-07-07 11:48:23 +01:00
langleyd
a95c8d17da disable new settings ui again 2021-07-06 22:46:31 +01:00
langleyd
ef87cf1f90 Merge branch 'develop' of github.com:vector-im/element-ios into roomNotificationSettings 2021-07-06 19:51:17 +01:00
langleyd
15917907b7 Enabled new room settings UI while I do ad hoc build 2021-07-06 13:14:15 +01:00
Gil Eluard
eee5499145 Merge branch 'develop' into element_4090 
# Conflicts:
#	CHANGES.rst
 2021-07-06 09:27:28 +02:00
manuroe
6f6df03a63 Prepare for new sprint 2021-06-30 16:55:28 +02:00
Stefan Ceriu
a80736038d Merge branch 'develop' into element_4090 2021-06-24 14:45:27 +03:00
Stefan Ceriu
aa6064431e #4094 - Added Opus Ogg support through FFmpegKit backed media conversion. 2021-06-24 12:28:50 +03:00
manuroe
4ff90ed4df Prepare for new sprint 2021-06-24 10:27:14 +02:00
langleyd
c8add12654 Add new settings notification feature flag and update ui entry point 2021-06-22 13:39:50 +01:00
Stefan Ceriu
1294c273a5 #4090 - Added voice messages feature flag. 2021-06-22 09:42:37 +03:00
manuroe
e6f6136b9c Prepare for new sprint 2021-06-21 18:03:06 +02:00
SBiOSoftWhare
367940475b
Merge pull request #4399 from vector-im/element_4398 2021-06-09 11:00:47 +02:00
manuroe
fad2a61eb0 Prepare for new sprint after the 1.4.1 hotfix release 
I applied manually what the release script does like in f4e28ce478
 2021-06-08 12:11:07 +02:00
SBiOSoftWhare
25edc9f5ea BuildSettings: Add help url and side menu feature flag. 2021-06-07 18:46:16 +02:00
manuroe
f4e28ce478 Prepare for new sprint 2021-06-03 11:40:45 +02:00
manuroe
2a61f52050 version++ 2021-06-03 11:02:26 +02:00
SBiOSoftWhare
9fa2c7151a Prepare for new sprint 2021-05-18 13:57:45 +02:00
SBiOSoftWhare
da4922ad40 Prepare for new sprint 2021-05-17 17:51:00 +02:00
SBiOSoftWhare
4e84db511f Prepare for new sprint 2021-05-12 17:59:02 +02:00
manuroe
048a30551e Prepare for new sprint 2021-05-07 16:29:53 +02:00
Gil Eluard
ed3f0450b6
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
a5051978b3
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
eab687d9ec
Merge branch 'develop' into element_4285 2021-04-29 19:49:42 +02:00
Gil Eluard
ddd1a6b60e Show / hide NSFW and decrypted content options in Settings screen from build settings 2021-04-29 17:53:18 +02:00
manuroe
f1317173b2
Merge branch 'develop' into element_3158_v2 2021-04-29 17:52:19 +02:00
Gil Eluard
235df71607 Show / Hide More and Report Content contextual menu from settings 2021-04-29 17:03:34 +02:00
Gil Eluard
9cc897b0c4 Enable / disable "Hide all messages from this user" of Room Member Screen from settings 2021-04-29 15:38:19 +02:00