Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-10-01 00:32:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
10340 commits 46 branches 261 tags 144 MiB
Commit graph

10340 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
42e2818bee
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
ac1a72c03c
Merge pull request #4056 from peterlewis/patch-2 
Remove extraneous space from string
 2021-03-24 14:23:20 +01:00
manuroe
634bc7f0ce
Merge pull request #4138 from vector-im/4137_room_directory_crash 
Room directory: Fix crash
 2021-03-24 09:42:48 +01:00
manuroe
2917e56f05 cocoapods++ in Gemfile 2021-03-24 09:15:02 +01:00
manuroe
0e5f7eb3ca 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
ce08dba3ae
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
Gil Eluard
9981914a30
Merge pull request #4128 from vector-im/element_4114 
SR sizing is inconsistent with RR & Message states cosmetic changes
 2021-03-19 09:28:16 +01:00
manuroe
332ac1d0f9 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
419f20b1a2 SR sizing is inconsistent with RR & Message states cosmetic changes 2021-03-17 20:09:44 +01:00
manuroe
b88d15242d Room lists: Remove shields on room avatars 
#4115

but keep it in the room screen
 2021-03-17 15:32:01 +01:00
ismailgulek
69d1c090c9
Merge pull request #4126 from vector-im/fix_last_bubble_visibility 
RoomVC: Fix Not Visible Last Bubble Issue
 2021-03-17 16:10:16 +03:00
ismailgulek
c7bc44169b
Update CHANGES.rst 2021-03-17 15:54:50 +03:00
ismailgulek
4238c36932
Fix returning number of rows in room data source 2021-03-17 15:54:10 +03:00
ismailgulek
22fc983b21
Merge pull request #4108 from vector-im/voip_virtual_timeline_fix 
VoIP: Fix Virtual Timeline Event Sending Blink
 2021-03-17 11:57:43 +03:00
ismailgulek
715ff0c123
Update CHANGES.rst 2021-03-17 10:41:15 +03:00
ismailgulek
63ed682c99
Merge branch 'develop' into voip_virtual_timeline_fix 2021-03-17 10:40:11 +03:00
manuroe
e462ff9ad8
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
7ae0a2e27c Pods: Update FlowCommoniOS, GBDeviceInfo, KeychainAccess, MatomoTracker, SwiftJWT, SwiftLint 
#4120
 2021-03-15 12:25:46 +01:00
manuroe
9be23159d5 Prepare for new sprint 2021-03-11 14:25:50 +01:00
manuroe
98a4effe55 Merge branch 'master' into develop 2021-03-11 14:25:47 +01:00
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
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
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