Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-10-01 00:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
11796 commits 46 branches 261 tags 144 MiB
Commit graph

1049 commits

Author SHA1 Message Date
ismailgulek
cf3c4ac073
Merge branch 'voip_design_updates' into voip_jitsi_remover 2021-04-28 14:03:24 +03:00
Gil Eluard
4f22adc923 Merge branch 'develop' into element_4261 
# Conflicts:
#	CHANGES.rst
 2021-04-28 10:07:56 +02:00
ismailgulek
62ccbee487
Update CHANGES.rst 2021-04-27 11:39:45 +03:00
Gil Eluard
8d02b5668e Users must not be allowed to add or otherwise manage widgets in rooms 
- Avoid navigation to integration management using integration popup with settings set to integration disabled
 2021-04-26 20:17:43 +02:00
Gil Eluard
ea689bdbd6
Update CHANGES.rst 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2021-04-26 14:14:39 +02:00
Gil Eluard
7a31ea526e Widget navigation button still visible with settings set to integration disabled 2021-04-23 22:44:23 +02:00
Gil Eluard
2eece8153a clear cache support for RiotSettings 2021-04-23 22:26:54 +02:00
manuroe
2ec7b84ed7 Prepare for new sprint 2021-04-22 12:00:47 +02:00
manuroe
d671df4105 version++ 2021-04-22 11:23:40 +02:00
ismailgulek
3cbeba8563
Merge pull request #4250 from vector-im/fix_room_leave 
Fixes on Room Leave
 2021-04-21 14:17:37 +03:00
manuroe
2e9da81bc7
Merge pull request #4135 from vector-im/gh-actions 
Introduce GitHub Actions
 2021-04-21 13:14:17 +02:00
ismailgulek
bcd82c97b5
Update CHANGES.rst 2021-04-21 12:52:29 +03:00
manuroe
29552ce93f GH Actions: Polish 2021-04-21 09:25:18 +02:00
Gil Eluard
b1e932a356 Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-21 09:08:58 +02:00
Gil Eluard
ae3b6950fa Merge branch 'develop' into element_4211 
# Conflicts:
#	CHANGES.rst
 2021-04-21 08:23:33 +02:00
Gil Eluard
a8e3b9db11 Updated CHANGES.rst 2021-04-20 15:28:46 +02:00
Gil Eluard
27f51f863b Merge branch 'develop' into element_4218 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:27:27 +02:00
Gil Eluard
5d63f431b0 Merge branch 'develop' into element_4211 
# Conflicts:
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 15:05:20 +02:00
Gil Eluard
16da1f5648 Show / Hide integrations and actions in rooms 2021-04-20 14:54:53 +02:00
SBiOSoftWhare
873aa9fd8d
Merge branch 'develop' into fix_public_search 2021-04-20 14:20:41 +02:00
manuroe
15f983017e
Merge branch 'develop' into MadLittleMods/gitter.im-room-directory 2021-04-20 14:04:03 +02:00
SBiOSoftWhare
dff2a7ea15 Update changes 2021-04-20 12:01:55 +02:00
Gil Eluard
a61cc09e5a Merge branch 'develop' into element_4242 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 11:52:47 +02:00
SBiOSoftWhare
924867bf12 Update changes 2021-04-20 11:31:43 +02:00
Gil Eluard
575d5c8ee4 Merge branch 'develop' into element_4236 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-20 10:38:30 +02:00
Gil Eluard
a1d359d5aa Show/Hide public directory in Unified Search 2021-04-20 10:31:04 +02:00
Eric Eastwood
55ffff260e
Update CHANGES.rst 2021-04-19 14:16:46 -05:00
Gil Eluard
b229ff6da3 Enable / Disable VoIP feature in Rooms 
- Updated CHANGES.rst
 2021-04-19 20:41:06 +02:00
Gil Eluard
450de18c8c Enable / Disable VoIP feature in Rooms 2021-04-19 20:39:07 +02:00
Gil Eluard
a3e8c737b3 Show/Hide Home Screen tabs 
- Updated CHANGES.rst
 2021-04-19 18:55:46 +02:00
manuroe
fc72cc3441 Prepare for new sprint 2021-04-19 18:01:06 +02:00
manuroe
3eecc0e15c version++ 2021-04-19 15:07:56 +02:00
Gil Eluard
25981d805a RoomVC: Crash in refreshTypingNotification 2021-04-19 13:18:26 +02:00
manuroe
0341c47dd2 Prepare for new sprint 2021-04-16 17:35:29 +02:00
manuroe
a6ded4ded1 version++ 2021-04-16 17:13:16 +02:00
manuroe
74f7f08f99 Prepare for new sprint 2021-04-16 17:03:06 +02:00
manuroe
887b5156b1 version++ 2021-04-16 15:54:12 +02:00
manuroe
bab4c2a746 Notifications: Fix sender display name that can miss 
Fix #4222
 2021-04-16 15:02:02 +02:00
manuroe
2200b2b36a Self-verification: Fix compatibility with Element-Web when logging in on iOS 
#4217

Just after login, send request instead of waiting for an incoming one as per recent EW changes
 2021-04-14 17:21:35 +02:00
Gil Eluard
609e621639 Updated CHANGES.rst 2021-04-14 15:55:26 +02:00
manuroe
50046e4487 Prepare for new sprint 2021-04-14 12:36:50 +02:00
manuroe
1b82372f12 version++ 2021-04-14 12:22:34 +02:00
manuroe
651767da22 Prepare for new sprint 2021-04-09 17:56:23 +02:00
manuroe
94423be694 version++ 2021-04-09 17:03:41 +02:00
Gil Eluard
7710e97f13
Merge pull request #4147 from vector-im/element_4134 
Explore typing notifications inspired by web
 2021-04-08 16:25:51 +02:00
Gil Eluard
52f5ffa9d5
Update CHANGES.rst 
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
 2021-04-08 13:44:23 +02:00
Gil Eluard
3c1fa6f1d2
Update CHANGES.rst 
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
 2021-04-08 10:38:32 +02:00
Gil Eluard
820e859a76
Update CHANGES.rst 
Co-authored-by: ismailgulek <ismailgulek@users.noreply.github.com>
 2021-04-08 10:38:23 +02:00
Gil Eluard
4d280bd69a Merge branch 'element_4087' into element_4134 
# Conflicts:
#	CHANGES.rst
 2021-04-07 21:02:24 +02:00
Gil Eluard
f1104730d9 Increase grow/shrink animation speed in new composer 2021-04-07 21:01:07 +02:00
Gil Eluard
b7f880751e Black theme uses dark background for composer 2021-04-07 20:15:09 +02:00
Gil Eluard
43059ee714 Updated CHANGES.rst 2021-04-07 14:43:44 +02:00
Gil Eluard
9b63c6fc59 Updated CHANGES.rst 2021-04-07 14:41:17 +02:00
Gil Eluard
1790b3bd20 Merge branch 'develop' into element_4181 
# Conflicts:
#	CHANGES.rst
#	Riot/Managers/Settings/RiotSettings.swift
 2021-04-06 15:59:40 +02:00
Gil Eluard
53a9a9a1b1 Possibility to lock some room creation parameters from settings 2021-04-02 15:54:21 +02:00
Gil Eluard
97d5435719 Updated CHANGES.rst 2021-04-02 11:49:02 +02:00
Gil Eluard
2364711802
Merge pull request #4122 from vector-im/element_4085 
Composer Update - Typing and sending a message
 2021-04-02 11:34:05 +02:00
Gil Eluard
4ce8ae65bf Updated CHANGES.rst 2021-04-01 07:55:04 +02:00
Gil Eluard
656bb5d581 Merge branch 'develop' into element_4085 2021-03-27 08:02:13 +01:00
manuroe
7fa28127ec Prepare for new sprint 2021-03-26 17:23:48 +01:00
manuroe
6a37b893b4 version++ 2021-03-26 17:07:59 +01:00
Gil Eluard
a050881d60 Updated CHANGES.rst 2021-03-26 13:06:38 +01:00
Gil Eluard
f6d50fba6e Merge branch 'develop' into element_4085 2021-03-24 22:42:24 +01:00
manuroe
49839b543b Prepare for new sprint 2021-03-24 17:30:55 +01:00
manuroe
49ac151c45 version++ 2021-03-24 16:51:51 +01:00
manuroe
42e2818bee
Merge pull request #4105 from Johennes/feature/emoji-short-name 
EmojiStore: Include short name when searching for emojis
 2021-03-24 14:24:57 +01:00
manuroe
0e5f7eb3ca Room directory: Fix crash 
#4137

This is a quick fix. We should remove all forced unwrapping
 2021-03-24 09:14:31 +01:00
Gil Eluard
55f95c72a5 Merge branch 'develop' into element_4085 2021-03-19 10:51:40 +01:00
manuroe
ce08dba3ae
Merge pull request #4127 from vector-im/4115_remove_shields_from_room_list 
Room lists: Remove shields on room avatars
 2021-03-19 09:54:54 +01:00
manuroe
b88d15242d Room lists: Remove shields on room avatars 
#4115

but keep it in the room screen
 2021-03-17 15:32:01 +01:00
ismailgulek
c7bc44169b
Update CHANGES.rst 2021-03-17 15:54:50 +03:00
ismailgulek
715ff0c123
Update CHANGES.rst 2021-03-17 10:41:15 +03:00
ismailgulek
63ed682c99
Merge branch 'develop' into voip_virtual_timeline_fix 2021-03-17 10:40:11 +03:00
Gil Eluard
98337af98f Merge branch 'develop' into element_4085 2021-03-15 14:37:46 +01:00
Gil Eluard
95b2e4c296 Composer Update - Typing and sending a message 2021-03-15 14:27:59 +01:00
manuroe
7ae0a2e27c Pods: Update FlowCommoniOS, GBDeviceInfo, KeychainAccess, MatomoTracker, SwiftJWT, SwiftLint 
#4120
 2021-03-15 12:25:46 +01:00
manuroe
9be23159d5 Prepare for new sprint 2021-03-11 14:25:50 +01:00
manuroe
bfbf64801b version++ 2021-03-11 13:30:12 +01:00
Gil Eluard
d0e0dc856e Merge branch 'element_4014' into element_4013 
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
 2021-03-09 13:22:13 +01:00
ismailgulek
d04ace29bf
Update CHANGES.rst 2021-03-09 01:14:30 +03:00
Johannes Marbach
d3b578e440 EmojiStore: Include short name when searching for emojis 
This adds the "common" short name to the list of strings to match the search text
against. Previously, only the "other" short names were included in the comparison.
This causes an issue for certain emojis like, for instance, the "Hundred Points
Symbol" where the term "100" is *only* included in the common short name. As a
result, the emoji did not previously show up when searching for "100".

Note that as a side effect, searching for "2" will now also return things such as
the "dog2" emoji. This matches the behavior in the Element Android app and also in
the emoji-mart Node.js package.

Closes: #4063

Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
 2021-03-05 19:48:00 +01:00
Gil Eluard
a9c0d5c589 Merge branch 'develop' into element_4014 2021-03-04 11:19:40 +01:00
Gil Eluard
66c4c696d0 Retrying & deleting failed messages 
- Updated CHANGES.rst
 2021-03-03 21:42:14 +01:00
ismailgulek
90b6ef9878 Prepare for new sprint 2021-03-03 23:08:41 +03:00
ismailgulek
e8ed5f4798 version++ 2021-03-03 22:34:26 +03:00
SBiOSoftWhare
8cb4efd08d Update changes 2021-03-03 16:38:10 +01:00
SBiOSoftWhare
a492ee7bf7 Prepare for new sprint 2021-03-02 10:23:13 +01:00
SBiOSoftWhare
49ef6889d7 Update changes 2021-03-01 18:19:57 +01:00
SBiOSoftWhare
0395e009b1 version++ 2021-03-01 18:06:49 +01:00
manuroe
7090f72f35 Prepare for new sprint 2021-02-26 18:53:47 +01:00
manuroe
5b4a92f575 version++ 2021-02-26 18:34:28 +01:00
Gil Eluard
f162adffc1 Updated CHANGES.rst 2021-02-25 18:11:20 +01:00
manuroe
d3d7f329c2 Prepare for new sprint 2021-02-24 12:09:50 +01:00
manuroe
866024ea13 version++ 2021-02-24 11:19:54 +01:00
SBiOSoftWhare
a8f7713a16
Merge branch 'develop' into element_3776 2021-02-23 18:51:19 +01:00
manuroe
4e0fd24333 CHANGES 2021-02-23 11:50:35 +01:00
manuroe
171705d05b Merge remote-tracking branch 'origin/develop' into element_3867 2021-02-23 11:48:43 +01:00
SBiOSoftWhare
3a7db906ca Update changes 2021-02-22 17:48:42 +01:00
SBiOSoftWhare
ad16c702d3 Update changes 2021-02-22 00:19:49 +01:00
manuroe
22d6d16f79 Merge branch 'develop' into element_3867 2021-02-18 15:35:21 +01:00
manuroe
69fee7d1a2 Merge branch 'develop' into element_3812 2021-02-16 11:44:13 +01:00
manuroe
f8b045d05a XcodeGen: More polishing 2021-02-16 11:29:45 +01:00
ismailgulek
9f11756034 Prepare for new sprint 2021-02-12 18:19:11 +03:00
ismailgulek
7f454efdb1 version++ 2021-02-12 17:36:53 +03:00
ismailgulek
aa90c4fcf3
Merge branch 'develop' into element_4029 2021-02-12 16:08:57 +03:00
ismailgulek
37dc1783e6 Update CHANGES.rst 2021-02-12 15:48:22 +03:00
ismailgulek
73770a0228 Update CHANGES.rst 2021-02-12 15:30:17 +03:00
manuroe
4f908bd4bf Fastlane: Re-enable parallelised builds 
release build takes 6min instead of 6min. It should work better with the 2 previous commits.
 2021-02-12 12:26:48 +01:00
manuroe
c435b58948 Fastlane: Use the "New Build System" to build releases 
This is mandatory to make $(inherited) work when you include other xcconfig files. Else, build settings are just overwritten.

This lane works now thanks to the previous commit on the Podfile
 2021-02-12 12:23:48 +01:00
manuroe
9df8c2c86f Podfile: Use MatrixKit for all targets and remove MatrixKit/AppExtension 
MatrixKit/AppExtension is no more useful because DTCoreText does not need anymore a special handling for extensions. It does not use `[UIApplication sharedApplication] openURL:]` anymore.
 2021-02-12 12:06:02 +01:00
SBiOSoftWhare
cf207c4e49 Update changes 2021-02-11 15:08:56 +01:00
ismailgulek
8fe054b9dd Prepare for new sprint 2021-02-11 16:18:54 +03:00
ismailgulek
0d40964c81
Update CHANGES.rst 2021-02-11 15:31:52 +03:00
ismailgulek
51b5b120f2 version++ 2021-02-11 15:24:12 +03:00
ismailgulek
f41efd90d9 Merge branch 'voip_2746' into voip_tiles 
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
 2021-02-10 21:41:51 +03:00
ismailgulek
190e111f66 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-10 00:40:47 +03:00
ismailgulek
46f4a4f3d1 Merge branch 'voip_dialpad' into voip_dtmf 
# Conflicts:
#	CHANGES.rst
 2021-02-10 00:40:22 +03:00
ismailgulek
ab92b8b3f4 Merge branch 'voip_2746' into voip_tiles 2021-02-10 00:38:49 +03:00
SBiOSoftWhare
458763e1e8 Update changes 2021-02-05 18:34:23 +01:00
manuroe
ef6fd61a6f Prepare for new sprint 2021-02-03 19:36:11 +01:00
manuroe
3db559135c version++ 2021-02-03 19:09:29 +01:00
SBiOSoftWhare
9797b9f3c6
Merge branch 'develop' into element_3995 2021-02-03 17:16:36 +01:00
SBiOSoftWhare
d5412dfc61 Update changes 2021-02-03 12:15:07 +01:00
manuroe
6ecb2b1b26 Logs: Add a size limitation so that we can upload them in bug reports 
#3903
 2021-02-03 12:12:28 +01:00
manuroe
79cdebf9d2
Merge branch 'develop' into 3990_matrix.to 2021-02-03 12:06:04 +01:00
manuroe
bcf57406ef matrix.to: The app does not open a permalink from matrix.to 
#3993
 2021-02-02 17:59:44 +01:00
manuroe
e42a2597d0 matrix.to: Support room preview when the permalink has parameters (like "via=") 
It works. There is no reason for not doing it
 2021-02-02 17:13:01 +01:00
manuroe
ac7c62fbd3 matrix.to: Cannot open/preview a new room given by alias 
#3991

Add a patch to try to build the right string and to avoid to loop forever
 2021-02-02 17:07:12 +01:00
manuroe
c28dbf2f35 matrix.to: Cannot open links with query parameters 
#3990

The string can come percent encoded but we parse it with ascii chars ("?", "&", ...).
So, remove one layer of encoding to fix the bug.
 2021-02-02 16:26:49 +01:00
Gil Eluard
1192589980 Merge branch 'develop' into element_3969 
# Conflicts:
#	CHANGES.rst
 2021-02-02 12:07:10 +01:00
ismailgulek
9d6beb1406 Merge branch 'voip_dtmf' into voip_call_transfer 2021-02-02 12:36:35 +03:00
ismailgulek
49bc653332 Merge branch 'voip_2746' into voip_tiles 2021-02-02 12:36:11 +03:00
ismailgulek
b14c8f84d4 Merge branch 'voip_dialpad' into voip_dtmf 
# Conflicts:
#	CHANGES.rst
 2021-02-02 12:35:38 +03:00
ismailgulek
93afe7853c
Merge pull request #3989 from vector-im/element_3986 
Fix PushKit Crashes due to Undecryptable Call Invites
 2021-02-02 11:51:47 +03:00
ismailgulek
d0a2b33d97 Update CHANGES.rst 2021-02-01 18:01:45 +03:00
manuroe
32f8198c8b Widgets: Support $matrix_room_id and $matrix_widget_id parameters 
#3987
 2021-02-01 12:59:45 +01:00
Gil Eluard
e076690a2f Merge branch 'develop' into element_3969 2021-01-29 11:32:22 +01:00
SBiOSoftWhare
1c655d7b16 Update changes 2021-01-28 19:54:35 +01:00
manuroe
ef416f536e Prepare for new sprint 2021-01-27 13:58:23 +01:00
manuroe
fbf425ccc5 version++ 2021-01-27 13:33:49 +01:00
Gil Eluard
ccbf29ab84 Avoid megolm share requests if the device is not verified 2021-01-26 17:33:05 +01:00
SBiOSoftWhare
99ed2ecb84 Update changes 2021-01-22 14:52:30 +01:00
ismailgulek
0931fae8d6 Update CHANGES.rst 2021-01-21 21:30:15 +03:00
ismailgulek
67c0ab349a Merge branch 'voip_2746' into voip_tiles 2021-01-20 16:28:28 +03:00
ismailgulek
d2d16be0e0 Merge branch 'voip_dialpad' into voip_dtmf 
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
 2021-01-20 16:27:55 +03:00
ismailgulek
418af55a68 Update CHANGES.rst 2021-01-20 15:14:20 +03:00
manuroe
40d463938c Navigation: BF: Unable to open a room from a room list 
Fix #3863

Remove weak because of https://github.com/vector-im/element-ios/issues/3863#issuecomment-762723419
 2021-01-19 13:07:25 +01:00
manuroe
b123699594 Prepare for new sprint 2021-01-18 16:28:46 +01:00
manuroe
ce736bbf5a version++ 2021-01-18 15:04:01 +01:00
manuroe
bed286da1b Prepare for new sprint 2021-01-15 17:57:13 +01:00
manuroe
3e84f9a7ba version++ 2021-01-15 17:34:19 +01:00
SBiOSoftWhare
03c39660c7 Update changes 2021-01-15 17:08:46 +01:00
ismailgulek
15a97777b6 Update CHANGES.rst 2021-01-14 18:23:59 +03:00
Gil Eluard
731942c3b8 Updated CHANGES.rst 2021-01-14 10:59:33 +01:00
SBiOSoftWhare
1f0079a5c5
Merge pull request #3912 from vector-im/invite_friends 2021-01-13 09:19:11 +01:00
SBiOSoftWhare
68ca3393b9 Update changes 2021-01-11 18:30:03 +01:00
Gil Eluard
21f652b31a Merge branch 'develop' into element_3816 
# Conflicts:
#	CHANGES.rst
#	Riot/Modules/BugReport/BugReportViewController.m
 2021-01-11 12:18:30 +01:00
Gil Eluard
ed4b8a9762 Merge branch 'develop' into element_3867 
# Conflicts:
#	CHANGES.rst
#	Riot.xcodeproj/project.pbxproj
 2021-01-11 11:58:53 +01:00
Gil Eluard
31398d277e
Update CHANGES.rst 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2021-01-11 09:56:51 +01:00
Gil Eluard
94c355f2d9
Merge branch 'develop' into element_3881 2021-01-11 09:53:32 +01:00
SBiOSoftWhare
b77ec3e25d
Merge branch 'develop' into element_3846 2021-01-08 17:48:11 +01:00
SBiOSoftWhare
984e0789fc Update changes 2021-01-07 16:04:12 +01:00
Gil Eluard
3df1214b84
Merge pull request #3894 from vector-im/element_3819 
Dismiss description textview on user tap on background.
 2020-12-24 10:23:22 +01:00
Gil Eluard
eb26fc6151 Dismiss description textview on user tap on background. 2020-12-23 14:58:59 +01:00
Gil Eluard
6b2721c205 Added "Continue in background" button to bug report screen 2020-12-23 13:59:40 +01:00
Gil Eluard
49eea8f04a Show user id in the room invite preview screen 2020-12-21 16:31:02 +01:00
ismailgulek
3f16bf82d8 Prepare for new sprint 2020-12-18 16:49:51 +03:00
ismailgulek
771254a8fa
Update CHANGES.rst 2020-12-18 15:45:57 +03:00
ismailgulek
ddcbe1ca52 version++ 2020-12-18 15:43:06 +03:00
ismailgulek
1ae06936ed Update CHANGES.rst 2020-12-18 15:03:58 +03:00
Gil Eluard
4f5f68f614 Merge branch 'develop' into element_3867 2020-12-16 21:06:01 +01:00
ismailgulek
16fe73c2c3 Prepare for new sprint 2020-12-16 19:23:37 +03:00
ismailgulek
6da7a79859 version++ 2020-12-16 18:17:18 +03:00
Gil Eluard
c9848307b9 Added change PIN code feature from the settings 2020-12-16 14:15:41 +01:00
SBiOSoftWhare
15b17bf5d5 Update changes 2020-12-16 13:09:08 +01:00
Gil Eluard
361e62ff08 Updated CHANGES.rst 2020-12-14 23:12:14 +01:00
Gil Eluard
52855e24a8 Updated CHANGES.rst 2020-12-14 23:09:38 +01:00
ismailgulek
c909654f35 Update CHANGES.rst 2020-12-11 12:58:04 +03:00
manuroe
df8c1f3347
Merge pull request #3747 from vector-im/element_3579 
Background Sync on Pushes
 2020-12-10 11:17:49 +01:00
Gil Eluard
c46360f77c
Update CHANGES.rst 
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
 2020-12-09 10:15:47 +01:00
Gil Eluard
db4ba58399 Plugged BuildSettings.messageDetailsAllowShare to self.allowActionsInDocumentPreview MXKRoomViewController's property 2020-12-08 22:01:46 +01:00
manuroe
1b8fd6c036 Merge branch 'develop' into element_3579 2020-12-02 17:22:48 +01:00
manuroe
f267151f0c Prepare for new sprint 2020-12-02 11:35:12 +01:00
manuroe
06b8798448 version++ 2020-12-02 10:53:21 +01:00
Giom Foret
6484a6d32f Update Changes 2020-12-01 09:08:42 +01:00
giomfo
c0f6ebe92d
Merge branch 'develop' into giomfo/fix_content_report 2020-12-01 09:03:01 +01:00
Gil Eluard
380cb1c1e0
Merge pull request #3845 from vector-im/element_3842 
Added blur background support for iPhone and iPad. Slight API changes…
 2020-12-01 08:42:09 +01:00
SBiOSoftWhare
ae43baff30 Merge develop into element_3836 2020-11-30 17:54:16 +01:00
SBiOSoftWhare
b69d15157d Update changes 2020-11-30 16:46:43 +01:00
Gil Eluard
827438a827 Added blur background support for iPhone and iPad. Slight API changes to avoid race conditions while sharing a presenter. 2020-11-30 15:11:08 +01:00
Giom Foret
ffeac21abf Room History: Remove the report option for outgoing messages 
I don't think the user wants to report on themselves
(This check was lost during the recent refactoring)
 2020-11-30 14:12:47 +01:00
SBiOSoftWhare
9d7ff0544d Merge branch 'develop' into invites_quick_approval 
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
 2020-11-27 14:50:04 +01:00
manuroe
b9c2f1a02c Merge branch 'develop' into element_3579 2020-11-25 17:37:09 +01:00
manuroe
5ffebd7f4d Prepare for new sprint 2020-11-24 18:29:44 +01:00
manuroe
f7b0069b19 version++ 2020-11-24 17:56:47 +01:00
SBiOSoftWhare
6d0e33fa74 Update changes 2020-11-20 14:55:21 +01:00
ismailgulek
1cc3c967c9 Merge branch 'develop' into element_3579 2020-11-20 14:25:17 +03:00
manuroe
c75ccaaa74 Prepare for new sprint 2020-11-17 18:43:54 +01:00
manuroe
31af070781 version++ 2020-11-17 18:16:22 +01:00
manuroe
e68c2f158e bundle update to use the latest cocoapods version 
With cocoapods 1.10.0 and Realm 10.1.2, we are full compliant with arm64 simulator. We do not need any trick anymore
 2020-11-16 10:35:03 +01:00