Commit Graph

10267 Commits

Author SHA1 Message Date
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
manuroe 2dccfc4227 Merge pull request #4121 from vector-im/4120_pods_update
Pods: Update FlowCommoniOS, GBDeviceInfo, KeychainAccess, MatomoTrack…
2021-03-15 13:58:00 +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 8707268ee6 Merge branch 'master' into develop 2021-03-11 14:25:47 +01:00
manuroe b484dda104 Merge branch 'release/1.2.6/master' 2021-03-11 14:25:41 +01:00
manuroe 4e6168b3cb finish version++ 2021-03-11 14:25:41 +01:00
manuroe af8b465f50 Merge pull request #4112 from vector-im/release/1.2.6/release
Release 1.2.6
2021-03-11 14:25:06 +01:00
manuroe 03b3c2b872 version++ 2021-03-11 13:30:12 +01:00
manuroe acd0c6dffc Strings.swift: Update after M's commit to develop 2021-03-11 12:10:46 +01:00
manuroe b53611a599 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 93e3a5dd7e 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 3dd1e731fa Merge branch 'origin/develop' into Weblate. 2021-03-11 09:44:29 +00:00
Weblate 9d3a625f75 Merge branch 'origin/develop' into Weblate. 2021-03-11 09:43:20 +00:00
Gil Eluard f8d993364b 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 1c9a7132d9 Merge pull request #4101 from vector-im/element_4013
Retrying & deleting failed messages
2021-03-11 09:40:48 +01:00
Gil Eluard d625a4405a Retrying & deleting failed messages
- Added unsent notice to tab bar room items
2021-03-11 09:01:44 +01:00
Gil Eluard b7bf281c57 Retrying & deleting failed messages
- Update after code review
2021-03-10 22:19:04 +01:00
Gil Eluard b3b10d1a4d 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 0c7c3ec519 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
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
Gil Eluard 66d4305644 Improve the status of send messages (sending, sent, received, failed)
- update after review
2021-03-09 11:59:54 +01:00
Thibault Martin fdfb58f658 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 8f0de270a6 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
Matthew Hodgson ce15a53ac5 spell beginning correctly 2021-03-04 13:06:53 +00: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
Gil Eluard ebf94c781f Retrying & deleting failed messages
- code and UI tweaks
2021-03-03 21:37:04 +01:00
ismailgulek 48f5195b78 Prepare for new sprint 2021-03-03 23:08:41 +03:00
ismailgulek 51b33f41b6 Merge branch 'master' into develop 2021-03-03 23:08:36 +03:00
ismailgulek 1d843c9284 Merge branch 'release/1.2.5/master' 2021-03-03 22:57:29 +03:00
ismailgulek b3f78aab4d finish version++ 2021-03-03 22:57:29 +03:00
ismailgulek bc78711b4f 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 254f9f7f31 version++ 2021-03-03 22:34:26 +03:00
HelaBasa 11f64cb641 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 028e74a6ef 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 a7e6413a8a Update changes 2021-03-03 16:38:10 +01:00
SBiOSoftWhare e74d61b68a Update PublicRoomsDirectoryDataSource with RiotSettings.shared.showNSFWPublicRooms value where needed. 2021-03-03 16:33:11 +01:00
SBiOSoftWhare b0cd50e77c Settings: Add show NSFW public rooms toggle. 2021-03-03 16:32:05 +01:00
SBiOSoftWhare 3b166bcd4b PublicRoomsDirectoryDataSource: Add showNSFWRooms property to filter NSFW public rooms. 2021-03-03 16:19:01 +01:00
Gil Eluard f763ad90d7 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 ab7ec48aae merged element_4014 into element_4013 2021-03-02 22:06:24 +01:00
Gil Eluard bcb1682a11 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 025b30a056 Added translation using Weblate (Sinhala) 2021-03-02 17:13:38 +00:00
HelaBasa 984a0c043c Added translation using Weblate (Sinhala) 2021-03-02 17:13:05 +00:00
SBiOSoftWhare c16d1edca7 Prepare for new sprint 2021-03-02 10:23:13 +01:00
SBiOSoftWhare 73edb863bc Merge branch 'master' into develop 2021-03-02 10:23:08 +01:00
SBiOSoftWhare dfc19026e8 Merge branch 'release/1.2.4/master' 2021-03-02 10:23:08 +01:00
SBiOSoftWhare 18ade838ea finish version++ 2021-03-02 10:23:08 +01:00
SBiOSoftWhare 536fed5ff0 Merge branch 'release/1.2.4/master' 2021-03-01 18:57:58 +01:00