843 commits

Author	SHA1	Message	Date
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