Commit Graph

12797 Commits

Author SHA1 Message Date
manuroe 173758c837 Strings.swift: Update after M's commit to develop 2021-03-11 12:10:46 +01:00
manuroe 67d89b613a Merge pull request #4111 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Translations update from Weblate
2021-03-11 12:09:17 +01:00
manuroe 72e792dc7e Merge pull request #4110 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Translations update from Weblate
2021-03-11 12:08:40 +01:00
Weblate 23dc933f33 Merge branch 'origin/develop' into Weblate. 2021-03-11 09:44:29 +00:00
Weblate 30c81d278b Merge branch 'origin/develop' into Weblate. 2021-03-11 09:43:20 +00:00
Gil Eluard 00d7fee874 Merge pull request #4070 from vector-im/element_4014
Improve the status of send messages (sending, sent, received, failed)
2021-03-11 10:24:18 +01:00
Gil Eluard 0aea03fc9b Merge pull request #4101 from vector-im/element_4013
Retrying & deleting failed messages
2021-03-11 09:40:48 +01: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
Thibault Martin a489274ba6 Translated using Weblate (French)
Currently translated at 100.0% (6 of 6 strings)

Translation: Element iOS/Element iOS (Dialogs)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/fr/
2021-03-10 12:34:09 +00:00
ismailgulek 5e577729e8 Center action buttons together and align other buttons to the edges 2021-03-09 17:32:16 +03:00
ismailgulek 621e568a5f Move callee name and duration labels to the top, move avatar 2021-03-09 17:21:15 +03:00
ismailgulek 7527378e5c Move chat button to the center of icons 2021-03-09 17:03:07 +03:00
ismailgulek 475b16ccdb Adjust button sizes 2021-03-09 17:02:37 +03:00
ismailgulek 25cb6d5a86 Move chat button to the bottom left of the screen 2021-03-09 16:57:25 +03:00
ismailgulek 1861efb5f5 Merge branch 'develop' into voip_design_updates 2021-03-09 15:52:55 +03: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 1281b084eb Update CHANGES.rst 2021-03-09 01:14:30 +03:00
ismailgulek 6a02e12eb4 Merge branch 'develop' into voip_virtual_timeline_fix 2021-03-09 01:13:23 +03:00
ismailgulek e38108097a Cancel event selection on room if only a selected event exists 2021-03-09 01:12:52 +03:00
Thibault Martin 4b25c6936b Translated using Weblate (French)
Currently translated at 100.0% (33 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/fr/
2021-03-06 21:34:08 +00:00
Thibault Martin 5c7bbeac89 Translated using Weblate (French)
Currently translated at 100.0% (6 of 6 strings)

Translation: Element iOS/Element iOS (Dialogs)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-dialogs/fr/
2021-03-06 21:34:08 +00: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
Matthew Hodgson 7e54faf057 spell beginning correctly 2021-03-04 13:06:53 +00:00
Gil Eluard cb783f943e Merge branch 'develop' into element_4014 2021-03-04 11:19:40 +01:00
Gil Eluard d529314b7f Retrying & deleting failed messages
- Updated CHANGES.rst
2021-03-03 21:42:14 +01:00
Gil Eluard bb0f2819fa Retrying & deleting failed messages
- code and UI tweaks
2021-03-03 21:37:04 +01:00
ismailgulek 3ec09aa68f Prepare for new sprint 2021-03-03 23:08:41 +03:00
ismailgulek 6bc8be3506 Merge branch 'master' into develop 2021-03-03 23:08:36 +03:00
ismailgulek 262e465ba8 Merge branch 'release/1.2.5/master' 2021-03-03 22:57:29 +03:00
ismailgulek 48e06d256b finish version++ 2021-03-03 22:57:29 +03:00
ismailgulek b604bb6ed0 Merge pull request #4100 from vector-im/release/1.2.5/release
Release 1.2.5
2021-03-03 22:53:25 +03:00
ismailgulek f88b7fa28f version++ 2021-03-03 22:34:26 +03:00
HelaBasa ed98d91dfc Translated using Weblate (Sinhala)
Currently translated at 15.1% (5 of 33 strings)

Translation: Element iOS/Element iOS (Push)
Translate-URL: https://translate.element.io/projects/riot-ios/riot-ios-push/si/
2021-03-03 17:34:07 +00:00
SBiOSoftWhare db804b0384 Merge pull request #4093 from vector-im/nsfw_filter
Settings: Add option to show NSFW public rooms
2021-03-03 17:46:15 +01:00
SBiOSoftWhare 8e0743ffbf Update changes 2021-03-03 16:38:10 +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
HelaBasa a184bada4d Added translation using Weblate (Sinhala) 2021-03-02 17:13:38 +00:00
HelaBasa f991214022 Added translation using Weblate (Sinhala) 2021-03-02 17:13:05 +00:00
SBiOSoftWhare 34201cf3a2 Prepare for new sprint 2021-03-02 10:23:13 +01:00
SBiOSoftWhare 41ef4fb442 Merge branch 'master' into develop 2021-03-02 10:23:08 +01:00
SBiOSoftWhare ee7f4d6ad0 Merge branch 'release/1.2.4/master' 2021-03-02 10:23:08 +01:00
SBiOSoftWhare 14c659087e finish version++ 2021-03-02 10:23:08 +01:00