Commit Graph

1789 Commits

Author SHA1 Message Date
manuroe abbda32187 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 eec78b8978 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 d1c1afa2fc 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 7c4490eade 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 6f9d7455cb SR sizing is inconsistent with RR & Message states cosmetic changes 2021-03-17 20:09:44 +01:00
manuroe cb66b6971b Room lists: Remove shields on room avatars
#4115

but keep it in the room screen
2021-03-17 15:32:01 +01:00
ismailgulek ef38b776f5 Fix returning number of rows in room data source 2021-03-17 15:54:10 +03:00
ismailgulek 60ad3d6836 Merge branch 'develop' into voip_virtual_timeline_fix 2021-03-17 10:40:11 +03:00
Gil Eluard ddaa68fc1f Retrying & deleting failed messages
- Added unsent notice to tab bar room items
2021-03-11 09:01:44 +01:00
Gil Eluard 120425389f Retrying & deleting failed messages
- Update after code review
2021-03-10 22:19:04 +01:00
Gil Eluard c9f5e6cf0d 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 4a8bcbec1f Merge branch 'element_4014' into element_4013
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
2021-03-09 13:22:13 +01:00
Gil Eluard 62013e4e7c Improve the status of send messages (sending, sent, received, failed)
- update after review
2021-03-09 11:59:54 +01:00
ismailgulek e38108097a Cancel event selection on room if only a selected event exists 2021-03-09 01:12:52 +03:00
Johannes Marbach 08fdee469a 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 cb783f943e Merge branch 'develop' into element_4014 2021-03-04 11:19:40 +01:00
Gil Eluard bb0f2819fa Retrying & deleting failed messages
- code and UI tweaks
2021-03-03 21:37:04 +01:00
SBiOSoftWhare 7a94aa4213 Update PublicRoomsDirectoryDataSource with RiotSettings.shared.showNSFWPublicRooms value where needed. 2021-03-03 16:33:11 +01:00
SBiOSoftWhare 104f516a7f Settings: Add show NSFW public rooms toggle. 2021-03-03 16:32:05 +01:00
SBiOSoftWhare d4b1c32140 PublicRoomsDirectoryDataSource: Add showNSFWRooms property to filter NSFW public rooms. 2021-03-03 16:19:01 +01:00
Gil Eluard 8d4d7c821f 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 1862197c39 merged element_4014 into element_4013 2021-03-02 22:06:24 +01:00
Gil Eluard d58f499871 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 0c0617d69c Improve the status of send messages (sending, sent, received, failed)
- Code tweaks
2021-02-26 07:19:46 +01:00
Gil Eluard fe184cb4ae 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 db12dc87e5 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 b7bc5524ea 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 0a33b43612 Improve the status of send messages (sending, sent, received, failed)
- Code tweaks
2021-02-23 22:05:39 +01:00
Gil Eluard 82ef6141b8 Improve the status of send messages (sending, sent, received, failed)
- Bug fixing and imporvement
2021-02-23 21:21:15 +01:00
SBiOSoftWhare 26065e27b2 Merge branch 'develop' into element_3776 2021-02-23 18:51:19 +01:00
SBiOSoftWhare ac701e6467 RoomVC: Present a RoomInfoCoordinator on room creation cell quick actions. 2021-02-23 15:52:24 +01:00
SBiOSoftWhare 75dcfd43e9 RoomInfoCoordinator: Add possibility to open an initial specific section. 2021-02-23 15:51:23 +01:00
SBiOSoftWhare 1f551b20f9 RoomCreationIntroCellContentView: Improve add topic case. 2021-02-23 15:46:20 +01:00
SBiOSoftWhare 892df6ef50 RoomDataSource: Fix insertRoomCreationIntroCellDataIfNeeded method. 2021-02-23 09:34:27 +01:00
SBiOSoftWhare 2d80fd7a15 RoomCreationIntroCell: Remove unused method. 2021-02-23 08:48:17 +01:00
SBiOSoftWhare 2824cfc5a7 RoomDataSource: Add thread safety instructions for bubbles array in insertRoomCreationIntroCellDataIfNeeded. 2021-02-23 08:47:50 +01:00
SBiOSoftWhare 3da61fc78b RecentsVC: Handle room directory display. HomeVC now show room directory on join room action. 2021-02-22 17:47:40 +01:00
Gil Eluard 2523498067 Improve the status of send messages (sending, sent, received, failed)
- First implementation
2021-02-22 13:51:25 +01:00
SBiOSoftWhare cb15beb1f8 RoomVC: Handle RoomCreationIntroCell./ 2021-02-22 00:12:01 +01:00
SBiOSoftWhare 67a1f36c11 RoomParticipantsViewController: Add possibility to display cancel bar button. 2021-02-22 00:12:01 +01:00
SBiOSoftWhare 430f91929a RoomFilesViewController: Add possibility to display cancel bar button. 2021-02-22 00:12:01 +01:00
SBiOSoftWhare bcbf22c985 RoomDataSource: Handle RoomCreationIntroCell conditional display. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 83c2e93a2b RoomBubbleCellData: Add new tag to handle RoomCreationIntroCell. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare 29be9b90dd RoomAvatarView: Add view data. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare b90395f611 Room creation intro: Create RoomCreationIntroCell. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare f5a16361da Room creation intro: Create cell content view. 2021-02-22 00:12:00 +01:00
SBiOSoftWhare fb9915d00a Create room avatar view. 2021-02-22 00:12:00 +01:00
manuroe c25eba7be0 Merge branch 'develop' into element_3812 2021-02-16 11:44:13 +01:00
manuroe f79ca290d6 XcodeGen: Remove old files, probably residual from a git mv 2021-02-16 08:44:26 +01:00
ismailgulek 478b0b356f Show dialpad option only if PSTN supported 2021-02-12 15:47:35 +03:00