Commit Graph

1789 Commits

Author SHA1 Message Date
manuroe b6bde39895 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 de4f115de6 Room directory: Fix crash
#4137

This is a quick fix. We should remove all forced unwrapping
2021-03-24 09:14:31 +01:00
manuroe ccca2efc99 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 b309c2fe96 Room lists: Do not encryptedRoomIcon in the code
Let it sleep hidden in the xib
2021-03-19 09:19:02 +01:00
Gil Eluard de5da473fa SR sizing is inconsistent with RR & Message states cosmetic changes 2021-03-17 20:09:44 +01:00
manuroe c7e413dc37 Room lists: Remove shields on room avatars
#4115

but keep it in the room screen
2021-03-17 15:32:01 +01:00
ismailgulek cad67a88f9 Fix returning number of rows in room data source 2021-03-17 15:54:10 +03:00
ismailgulek 278cf44ce4 Merge branch 'develop' into voip_virtual_timeline_fix 2021-03-17 10:40:11 +03:00
Gil Eluard 7d7a546166 Retrying & deleting failed messages
- Added unsent notice to tab bar room items
2021-03-11 09:01:44 +01:00
Gil Eluard f00281c20f Retrying & deleting failed messages
- Update after code review
2021-03-10 22:19:04 +01:00
Gil Eluard 3ab8635344 Update Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m
Co-authored-by: manuroe <manuroe@users.noreply.github.com>
2021-03-10 21:31:24 +01:00
Gil Eluard 84d49f1344 Merge branch 'element_4014' into element_4013
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-03-09 13:22:13 +01:00
Gil Eluard 230498192a Improve the status of send messages (sending, sent, received, failed)
- update after review
2021-03-09 11:59:54 +01:00
ismailgulek 4ee0f39b74 Cancel event selection on room if only a selected event exists 2021-03-09 01:12:52 +03:00
Johannes Marbach 2050c0dd3f 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 066b82e9d3 Merge branch 'develop' into element_4014 2021-03-04 11:19:40 +01:00
Gil Eluard 8d546430d6 Retrying & deleting failed messages
- code and UI tweaks
2021-03-03 21:37:04 +01:00
SBiOSoftWhare 5e724b893f Update PublicRoomsDirectoryDataSource with RiotSettings.shared.showNSFWPublicRooms value where needed. 2021-03-03 16:33:11 +01:00
SBiOSoftWhare 436bbfd0fc Settings: Add show NSFW public rooms toggle. 2021-03-03 16:32:05 +01:00
SBiOSoftWhare b573c0d6ff PublicRoomsDirectoryDataSource: Add showNSFWRooms property to filter NSFW public rooms. 2021-03-03 16:19:01 +01:00
Gil Eluard e5042aa3f9 Retrying & deleting failed messages
- If users press on Retry, send again the message and display a loading wheel
- code and UI tweaks
2021-03-03 10:27:08 +01:00
Gil Eluard 8abede870a merged element_4014 into element_4013 2021-03-02 22:06:24 +01:00
Gil Eluard 5cb904d2ee Retrying & deleting failed messages
- Display an exclamation mark (on a red background). In case of a multi-line message
- When a message with an error is selected, show a bottom bar with the 4 following actions: Retry - Delete - Edit - Copy
- If users press on Delete, a confirmation dialog is displayed
- When error messages occur, a general error message appears above the composer. Selecting Delete will delete all error messages. Pressing on Retry will attempt to resend error messages
- If users press on Delete, a confirmation dialog is displayed
- In room lists, decorate rooms with errored messages with the error icon. Rooms with errors should be sorted first
2021-03-02 21:56:50 +01:00
Gil Eluard 20d0d43b0a Improve the status of send messages (sending, sent, received, failed)
- Code tweaks
2021-02-26 07:19:46 +01:00
Gil Eluard 380ef917c0 Retrying & deleting failed messages
- When a message with an error is selected, show a bottom bar with the 4 following actions: Retry - Delete - Edit - Copy
2021-02-25 16:51:39 +01:00
Gil Eluard 100c16b032 Merge branch 'develop' into element_4014
# Conflicts:
#	Riot.xcodeproj/project.pbxproj
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-02-25 15:49:53 +01:00
Gil Eluard 44f1e827cd Improve the status of send messages (sending, sent, received, failed)
- tweaks and new L&F for download progress
2021-02-25 11:07:21 +01:00
Gil Eluard 36cb9c49d5 Improve the status of send messages (sending, sent, received, failed)
- Code tweaks
2021-02-23 22:05:39 +01:00
Gil Eluard f09c64439a Improve the status of send messages (sending, sent, received, failed)
- Bug fixing and imporvement
2021-02-23 21:21:15 +01:00
SBiOSoftWhare 0a9ef1f04c Merge branch 'develop' into element_3776 2021-02-23 18:51:19 +01:00
SBiOSoftWhare 48e51eb186 RoomVC: Present a RoomInfoCoordinator on room creation cell quick actions. 2021-02-23 15:52:24 +01:00
SBiOSoftWhare 0fd2bcb62c RoomInfoCoordinator: Add possibility to open an initial specific section. 2021-02-23 15:51:23 +01:00
SBiOSoftWhare 9a9b63fbd3 RoomCreationIntroCellContentView: Improve add topic case. 2021-02-23 15:46:20 +01:00
SBiOSoftWhare 46dc396628 RoomDataSource: Fix insertRoomCreationIntroCellDataIfNeeded method. 2021-02-23 09:34:27 +01:00
SBiOSoftWhare 84f02abd0b RoomCreationIntroCell: Remove unused method. 2021-02-23 08:48:17 +01:00
SBiOSoftWhare 75414f8ebe RoomDataSource: Add thread safety instructions for bubbles array in insertRoomCreationIntroCellDataIfNeeded. 2021-02-23 08:47:50 +01:00
SBiOSoftWhare 948103b1ba RecentsVC: Handle room directory display. HomeVC now show room directory on join room action. 2021-02-22 17:47:40 +01:00
Gil Eluard cd76369f9d Improve the status of send messages (sending, sent, received, failed)
- First implementation
2021-02-22 13:51:25 +01:00
SBiOSoftWhare 2ed9cb1a70 RoomVC: Handle RoomCreationIntroCell./ 2021-02-22 00:12:01 +01:00
SBiOSoftWhare 1adf074bbe RoomParticipantsViewController: Add possibility to display cancel bar button. 2021-02-22 00:12:01 +01:00
SBiOSoftWhare 9aadd4d205 RoomFilesViewController: Add possibility to display cancel bar button. 2021-02-22 00:12:01 +01:00
SBiOSoftWhare 2b6008cea1 RoomDataSource: Handle RoomCreationIntroCell conditional display. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare e5796073c8 RoomBubbleCellData: Add new tag to handle RoomCreationIntroCell. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 165621a7ae RoomAvatarView: Add view data. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 7cd48413c4 Room creation intro: Create RoomCreationIntroCell. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 2bfeb6b25a Room creation intro: Create cell content view. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 97669e9a0c Create room avatar view. 2021-02-22 00:12:00 +01:00
manuroe ec8455e105 Merge branch 'develop' into element_3812 2021-02-16 11:44:13 +01:00
manuroe cecb1b0bed XcodeGen: Remove old files, probably residual from a git mv 2021-02-16 08:44:26 +01:00
ismailgulek 8d5022575c Show dialpad option only if PSTN supported 2021-02-12 15:47:35 +03:00