Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 08:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
10755 commits 46 branches 261 tags 144 MiB
Commit graph

10755 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
792e792426 Merge branch 'release/1.2.6/master' 2021-03-11 14:25:41 +01:00
manuroe
61dcf7ec23 finish version++ 2021-03-11 14:25:41 +01:00
manuroe
5e83010517
Merge pull request #4112 from vector-im/release/1.2.6/release 
Release 1.2.6
 2021-03-11 14:25:06 +01:00
ismailgulek
0b2b8b5463
Merge branch 'develop' into voip_design_updates 2021-03-11 15:48:58 +03:00
manuroe
bfbf64801b version++ 2021-03-11 13:30:12 +01:00
manuroe
908e0b20cc Strings.swift: Update after M's commit to develop 2021-03-11 12:10:46 +01:00
manuroe
372ca6d202
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
7ddab5ff61
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
962d22ea81 Merge branch 'origin/develop' into Weblate. 2021-03-11 09:44:29 +00:00
Weblate
9f7554182c Merge branch 'origin/develop' into Weblate. 2021-03-11 09:43:20 +00:00
Gil Eluard
f4733ad3c2
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
7c53bb00d0
Merge pull request #4101 from vector-im/element_4013 
Retrying & deleting failed messages
 2021-03-11 09:40:48 +01:00
Gil Eluard
522d6a3eee Retrying & deleting failed messages 
- Added unsent notice to tab bar room items
 2021-03-11 09:01:44 +01:00
Gil Eluard
877356138b Retrying & deleting failed messages 
- Update after code review
 2021-03-10 22:19:04 +01:00
Gil Eluard
986a8a8bb0
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
ba8f16ed51 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
e21c8d45ea
Center action buttons together and align other buttons to the edges 2021-03-09 17:32:16 +03:00
ismailgulek
87cf479076
Move callee name and duration labels to the top, move avatar 2021-03-09 17:21:15 +03:00
ismailgulek
7fd466e652
Move chat button to the center of icons 2021-03-09 17:03:07 +03:00
ismailgulek
4d61b3ba3d
Adjust button sizes 2021-03-09 17:02:37 +03:00
ismailgulek
7ea7cb6ffd
Move chat button to the bottom left of the screen 2021-03-09 16:57:25 +03:00
ismailgulek
3e827d69ec
Merge branch 'develop' into voip_design_updates 2021-03-09 15:52:55 +03:00
Gil Eluard
d0e0dc856e Merge branch 'element_4014' into element_4013 
# Conflicts:
#	Riot/Modules/Room/DataSources/RoomDataSource.m
 2021-03-09 13:22:13 +01:00
Gil Eluard
1a71e61a66 Improve the status of send messages (sending, sent, received, failed) 
- update after review
 2021-03-09 11:59:54 +01:00
ismailgulek
d04ace29bf
Update CHANGES.rst 2021-03-09 01:14:30 +03:00
ismailgulek
a969041b9b
Merge branch 'develop' into voip_virtual_timeline_fix 2021-03-09 01:13:23 +03:00
ismailgulek
3f3e5053ec
Cancel event selection on room if only a selected event exists 2021-03-09 01:12:52 +03:00
Thibault Martin
44459b50c5 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
e37924578c 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
d3b578e440 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
85670a409f spell beginning correctly 2021-03-04 13:06:53 +00:00
Gil Eluard
a9c0d5c589 Merge branch 'develop' into element_4014 2021-03-04 11:19:40 +01:00
Gil Eluard
66c4c696d0 Retrying & deleting failed messages 
- Updated CHANGES.rst
 2021-03-03 21:42:14 +01:00
Gil Eluard
cde3bf64e6 Retrying & deleting failed messages 
- code and UI tweaks
 2021-03-03 21:37:04 +01:00
ismailgulek
90b6ef9878 Prepare for new sprint 2021-03-03 23:08:41 +03:00
ismailgulek
775d844d79 Merge branch 'master' into develop 2021-03-03 23:08:36 +03:00
ismailgulek
9826c0b063 Merge branch 'release/1.2.5/master' 2021-03-03 22:57:29 +03:00
ismailgulek
b4fc4fba58 finish version++ 2021-03-03 22:57:29 +03:00
ismailgulek
aa63724f13
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
e8ed5f4798 version++ 2021-03-03 22:34:26 +03:00
HelaBasa
4fa1d8c2d8 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
a7187a1d06
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
8cb4efd08d Update changes 2021-03-03 16:38:10 +01:00
SBiOSoftWhare
3a0d133cd0 Update PublicRoomsDirectoryDataSource with RiotSettings.shared.showNSFWPublicRooms value where needed. 2021-03-03 16:33:11 +01:00
SBiOSoftWhare
e14a280b6c Settings: Add show NSFW public rooms toggle. 2021-03-03 16:32:05 +01:00
SBiOSoftWhare
44dee659ee PublicRoomsDirectoryDataSource: Add showNSFWRooms property to filter NSFW public rooms. 2021-03-03 16:19:01 +01:00
Gil Eluard
1e67bad138 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
bfccb32b22 merged element_4014 into element_4013 2021-03-02 22:06:24 +01:00
Gil Eluard
9a41f0d4b8 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
8aedecc5ec Added translation using Weblate (Sinhala) 2021-03-02 17:13:38 +00:00