Commit Graph

843 Commits

Author SHA1 Message Date
Gil Eluard aceccba27f 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 13aded46b9 Updated CHANGES.rst 2021-04-01 07:55:04 +02:00
Gil Eluard 0737ee4f87 Merge branch 'develop' into element_4085 2021-03-27 08:02:13 +01:00
manuroe cd7d533edd Prepare for new sprint 2021-03-26 17:23:48 +01:00
manuroe ca28199205 version++ 2021-03-26 17:07:59 +01:00
Gil Eluard aeac807686 Updated CHANGES.rst 2021-03-26 13:06:38 +01:00
Gil Eluard 3df5034a95 Merge branch 'develop' into element_4085 2021-03-24 22:42:24 +01:00
manuroe d58cfe748d Prepare for new sprint 2021-03-24 17:30:55 +01:00
manuroe 42a5862b21 version++ 2021-03-24 16:51:51 +01:00
manuroe c92b854e87 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 6849fa8083 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 07e9fa4d41 Merge branch 'develop' into element_4085 2021-03-19 10:51:40 +01:00
manuroe cbced365be 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 c128a81792 Room lists: Remove shields on room avatars
#4115

but keep it in the room screen
2021-03-17 15:32:01 +01:00
ismailgulek 9bd8f4a4e7 Update CHANGES.rst 2021-03-17 15:54:50 +03:00
ismailgulek a3e502de19 Update CHANGES.rst 2021-03-17 10:41:15 +03:00
ismailgulek 4d572d5d6b Merge branch 'develop' into voip_virtual_timeline_fix 2021-03-17 10:40:11 +03:00
Gil Eluard 79b6392e56 Merge branch 'develop' into element_4085 2021-03-15 14:37:46 +01:00
Gil Eluard 293520cb5d Composer Update - Typing and sending a message 2021-03-15 14:27:59 +01:00
manuroe ceef9c4f63 Pods: Update FlowCommoniOS, GBDeviceInfo, KeychainAccess, MatomoTracker, SwiftJWT, SwiftLint
#4120
2021-03-15 12:25:46 +01:00
manuroe 8273205ed6 Prepare for new sprint 2021-03-11 14:25:50 +01:00
manuroe 03b3c2b872 version++ 2021-03-11 13:30:12 +01:00
Gil Eluard 5014af92d3 Merge branch 'element_4014' into element_4013
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-03-09 13:22:13 +01:00
ismailgulek 5945f8e4e5 Update CHANGES.rst 2021-03-09 01:14:30 +03:00
Johannes Marbach e10bfcd47b 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 2a63baa202 Merge branch 'develop' into element_4014 2021-03-04 11:19:40 +01:00
Gil Eluard 581f845c4d Retrying & deleting failed messages
- Updated CHANGES.rst
2021-03-03 21:42:14 +01:00
ismailgulek 48f5195b78 Prepare for new sprint 2021-03-03 23:08:41 +03:00
ismailgulek 254f9f7f31 version++ 2021-03-03 22:34:26 +03:00
SBiOSoftWhare a7e6413a8a Update changes 2021-03-03 16:38:10 +01:00
SBiOSoftWhare c16d1edca7 Prepare for new sprint 2021-03-02 10:23:13 +01:00
SBiOSoftWhare ecdd3f4924 Update changes 2021-03-01 18:19:57 +01:00
SBiOSoftWhare 4e5fe8da43 version++ 2021-03-01 18:06:49 +01:00
manuroe 5a1fc3e0d3 Prepare for new sprint 2021-02-26 18:53:47 +01:00
manuroe 98ce88b44e version++ 2021-02-26 18:34:28 +01:00
Gil Eluard fe083516e2 Updated CHANGES.rst 2021-02-25 18:11:20 +01:00
manuroe c911f16834 Prepare for new sprint 2021-02-24 12:09:50 +01:00
manuroe f149d5a2a2 version++ 2021-02-24 11:19:54 +01:00
SBiOSoftWhare 3c9acb3883 Merge branch 'develop' into element_3776 2021-02-23 18:51:19 +01:00
manuroe 966b23c477 CHANGES 2021-02-23 11:50:35 +01:00
manuroe 82b9ca9046 Merge remote-tracking branch 'origin/develop' into element_3867 2021-02-23 11:48:43 +01:00
SBiOSoftWhare f69bcaeadc Update changes 2021-02-22 17:48:42 +01:00
SBiOSoftWhare 2ee3be024f Update changes 2021-02-22 00:19:49 +01:00
manuroe ad0d5f1ade Merge branch 'develop' into element_3867 2021-02-18 15:35:21 +01:00
manuroe 9e3a9cc55a Merge branch 'develop' into element_3812 2021-02-16 11:44:13 +01:00
manuroe a490989820 XcodeGen: More polishing 2021-02-16 11:29:45 +01:00
ismailgulek 9d1701f47e Prepare for new sprint 2021-02-12 18:19:11 +03:00
ismailgulek 629d780b36 version++ 2021-02-12 17:36:53 +03:00
ismailgulek 74b2eb99ca Merge branch 'develop' into element_4029 2021-02-12 16:08:57 +03:00
ismailgulek d610ccc505 Update CHANGES.rst 2021-02-12 15:48:22 +03:00