Commit graph

7320 commits

Author SHA1 Message Date
SBiOSoftWhare
477b1c6baf
Merge pull request #2991 from vector-im/room_preview_canonical_alias
RoomVC: For a room preview use room canonical alias if present when joining a room
2020-02-11 10:42:40 +01:00
SBiOSoftWhare
12d65acaf7 Update changes 2020-02-11 10:29:39 +01:00
SBiOSoftWhare
83d7f47919 Update changes 2020-02-10 17:56:25 +01:00
SBiOSoftWhare
a46e8e025b RoomVC: For a room preview use room canonical alias if present when joining a room. 2020-02-10 17:54:52 +01:00
SBiOSoftWhare
7586324796 RoomPreviewData: Add room canonical alias property. 2020-02-10 17:49:45 +01:00
SBiOSoftWhare
e09e2c9bc7
Merge pull request #2889 from chrismoos/fix_join_room_no_guest_access
Fix issue with joining public rooms with no guest access.
2020-02-10 17:41:28 +01:00
SBiOSoftWhare
675d97b280
Merge pull request #2990 from vector-im/riot_2973
Settings > Security: Missing loading state for getting devices
2020-02-10 13:41:38 +01:00
SBiOSoftWhare
43b4ab2800 Settings: Show information while loading devices list. 2020-02-10 10:51:30 +01:00
Riot Translate Bot
8b9b3afffa
Update from Weblate (#2989)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:54:43 +01:00
Riot Translate Bot
c94bd21e57
Update from Weblate (#2988)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:54:19 +01:00
Riot Translate Bot
7c2db0191e
Update from Weblate (#2987)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:49:58 +01:00
Riot Translate Bot
9ac81aab32
Update from Weblate (#2986)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:49:43 +01:00
Riot Translate Bot
c18f93b188
Update from Weblate (#2985)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:47:38 +01:00
Riot Translate Bot
a5c0130e1f
Update from Weblate (#2984)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:47:21 +01:00
SBiOSoftWhare
091a76eb8e
Merge pull request #2983 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2020-02-07 15:44:52 +01:00
SBiOSoftWhare
73cf2c276d
Merge pull request #2982 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2020-02-07 15:44:20 +01:00
SBiOSoftWhare
531f1a10a7
Merge pull request #2981 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2020-02-07 15:42:40 +01:00
Weblate
869d080312 Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:37 +00:00
Weblate
904cff5726 Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:37 +00:00
Weblate
523a47ffb4 Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:37 +00:00
SBiOSoftWhare
074be00ab5
Merge pull request #2980 from vector-im/riot_2976
Localization: Make sure "Session" replaces "Device" everywhere
2020-02-07 15:34:32 +01:00
Weblate
d9ed6ab83b Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:26 +00:00
Weblate
859307c435 Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:26 +00:00
Weblate
9ee05ad325 Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:26 +00:00
SBiOSoftWhare
3a7e146e3b
Merge pull request #2979 from vector-im/riot_2978
Room decoration: Remove horizontal empty space when there is no decoration badge to set on room message
2020-02-07 15:34:19 +01:00
SBiOSoftWhare
6c7f277d26 Localization strings: Use ellipsis instead of three dots. 2020-02-07 14:51:19 +01:00
SBiOSoftWhare
db780c0773 Localization strings: Replace "device" by "session" where needed. 2020-02-07 14:49:06 +01:00
Chris Moos
a4a810e393
Merge branch 'develop' into fix_join_room_no_guest_access 2020-02-06 11:34:10 -07:00
SBiOSoftWhare
050a315216 Update changes 2020-02-06 18:47:59 +01:00
SBiOSoftWhare
97dc906553 RoomVC: Use cells with encryption badge only if needed in order to recover horizontal white space. 2020-02-06 18:46:32 +01:00
Weblate
fa10840cde Merge branch 'origin/develop' into Weblate. 2020-02-06 10:21:32 +00:00
random
796fb8cc53 Translated using Weblate (Italian)
Currently translated at 100.0% (912 of 912 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
2020-02-06 10:21:32 +00:00
Szimszon
0d0ffd381c Translated using Weblate (Hungarian)
Currently translated at 100.0% (912 of 912 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/hu/
2020-02-06 10:21:30 +00:00
Kévin C
fa8c74089d Translated using Weblate (French)
Currently translated at 100.0% (912 of 912 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/fr/
2020-02-06 10:21:28 +00:00
Weblate
5a5b0799e9 Merge branch 'origin/develop' into Weblate. 2020-02-06 10:21:21 +00:00
Weblate
58670075f8 Merge branch 'origin/develop' into Weblate. 2020-02-06 10:21:21 +00:00
SBiOSoftWhare
ab1f5bb830
Merge pull request #2977 from vector-im/riot_2974
Message decoration: No shield by default
2020-02-06 11:21:15 +01:00
SBiOSoftWhare
17d443de42 Message decoration: Fix shield appearance behavior. 2020-02-06 11:14:13 +01:00
Weblate
34d4be2513 Merge branch 'origin/develop' into Weblate. 2020-02-04 16:08:47 +00:00
random
c0e01896ae Translated using Weblate (Italian)
Currently translated at 96.8% (883 of 912 strings)

Translation: Riot iOS/Riot iOS
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios/it/
2020-02-04 16:08:47 +00:00
Weblate
d041e70adc Merge branch 'origin/develop' into Weblate. 2020-02-04 16:08:45 +00:00
Weblate
4d88d83019 Merge branch 'origin/develop' into Weblate. 2020-02-04 16:08:45 +00:00
SBiOSoftWhare
9140ce4619
Merge pull request #2970 from vector-im/fix_room_participants_shields
Room participants: Fix user trust level shields always black
2020-02-04 17:08:40 +01:00
SBiOSoftWhare
e956d801a8 Room participants: Fix user trust level shields always black. 2020-02-04 17:04:54 +01:00
Weblate
e0934d58a4 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:27:42 +00:00
Weblate
808a981b91 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:27:42 +00:00
Weblate
cf1e2ef764 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:27:42 +00:00
SBiOSoftWhare
260d05ab81
Merge pull request #2967 from vector-im/riot_2960_2
User verification: Use localization strings
2020-02-04 10:27:37 +01:00
SBiOSoftWhare
48125b6147 RoomMemberDetailsViewController: Use NSArray instead of NSMutableArray for security section. 2020-02-04 10:23:19 +01:00
Weblate
a267ad2e32 Merge branch 'origin/develop' into Weblate. 2020-02-04 09:10:39 +00:00