Commit Graph

7323 Commits

Author SHA1 Message Date
Weblate 0c2de033cc Merge branch 'origin/develop' into Weblate. 2020-03-06 19:51:50 +00:00
SBiOSoftWhare 602916280b Merge pull request #3020 from sucsessyan/patch-2
Update CONTRIBUTING.rst
2020-03-06 20:51:45 +01:00
Alex Yanchenko e87058dea9 Update CONTRIBUTING.rst
Change link to a right one
Signed-off-by: Alexey Yanchenko <mail@yanchenko.me>
2020-03-05 20:55:43 +01:00
Weblate 9c76f3e0f4 Merge branch 'origin/develop' into Weblate. 2020-03-04 14:59:58 +00:00
manuroe 7ebd12879d Merge pull request #3018 from vector-im/riot_3017
Push notifications: Avoid any automatic deactivation
2020-03-04 15:59:52 +01:00
manuroe 4bfd93e1a5 Push notifications: Avoid any automatic deactivation
vector-im/riot-ios#3017
2020-03-04 15:10:46 +01:00
manuroe fcfc83e273 Logs: Keep the 50 last log files
iOS13 kills the app more often. We have no more one log file a day but one log file every few hours. Increase that number of files to have a wider view of what it's going on.
2020-03-04 15:05:34 +01:00
Weblate 5e72cd9d01 Merge branch 'origin/develop' into Weblate. 2020-03-04 09:28:04 +00:00
SBiOSoftWhare 54778223b2 Update PULL_REQUEST_TEMPLATE.md 2020-03-04 10:28:00 +01:00
Weblate 6e4174c995 Merge branch 'origin/develop' into Weblate. 2020-03-04 09:23:45 +00:00
SBiOSoftWhare 9bb6e3aebd Merge pull request #2892 from vector-im/giomfo/update_3pl
Update third_party_licenses by adding DGCollectionViewLeftAlignFlowLayout
2020-03-04 10:23:40 +01:00
ctr 54e0d520c2 Translated using Weblate (Chinese (Simplified))
Currently translated at 100.0% (5 of 5 strings)

Translation: Riot iOS/Riot iOS (Dialogs)
Translate-URL: https://translate.riot.im/projects/riot-ios/riot-ios-dialogs/zh_Hans/
2020-03-02 20:25:33 +00:00
manuroe 61a7d4b8e9 Merge pull request #3001 from vector-im/neilj/update-matomo-id
update matomo id
2020-02-21 09:47:15 +01:00
Neil Johnson 8e0f682f12 Update Matomo id 2020-02-20 21:51:55 +01:00
manuroe ca17146dd5 Merge pull request #2999 from vector-im/riot_2871
Key Verification: Handle incoming self verification request
2020-02-20 19:18:59 +01:00
Neil Johnson 6fce7ad1a7 update matomo id 2020-02-20 18:57:53 +01:00
manuroe bfb012463c Key Verification: Handle incoming self verification request 2020-02-20 17:56:14 +01:00
manuroe 447379e87a Key Verification: Follow API change 2020-02-20 17:54:32 +01:00
manuroe 6e01e9a7c2 Merge pull request #2998 from vector-im/riot_2997
Fix crash due to malformed widget
2020-02-17 10:19:58 +01:00
manuroe bc6c785f38 Fix crash due to malformed widget
#2997
2020-02-17 09:25:17 +01:00
manuroe b92885a784 Merge pull request #2994 from vector-im/riot_2870
Key Verification: Support m.key.verification.ready event with new SDK API
2020-02-14 12:39:55 +01:00
manuroe 980eefb4e2 Key Verification: Support m.key.verification.ready event with new SDK API 2020-02-14 09:27:56 +01:00
manuroe c53963c19a Merge pull request #2992 from vector-im/MXKeyVerification
MXCrypto: Rename MXDeviceVerificationManager to MXKeyVerificationManager
2020-02-11 14:30:48 +01:00
manuroe d9f9d09cc8 MXCrypto: Rename MXDeviceVerificationManager to MXKeyVerificationManager
Because it makes more sense now
2020-02-11 13:56:36 +01:00
SBiOSoftWhare 08b7635893 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 3479998f7f Update changes 2020-02-11 10:29:39 +01:00
SBiOSoftWhare 23a8c317a3 Update changes 2020-02-10 17:56:25 +01:00
SBiOSoftWhare dce3059277 RoomVC: For a room preview use room canonical alias if present when joining a room. 2020-02-10 17:54:52 +01:00
SBiOSoftWhare 655c9221b7 RoomPreviewData: Add room canonical alias property. 2020-02-10 17:49:45 +01:00
SBiOSoftWhare 657d93c25c 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 bf66be1013 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 ecfb0e3f01 Settings: Show information while loading devices list. 2020-02-10 10:51:30 +01:00
Riot Translate Bot bcef164758 Update from Weblate (#2989)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:54:43 +01:00
Riot Translate Bot 0752599735 Update from Weblate (#2988)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:54:19 +01:00
Riot Translate Bot fa945b76f5 Update from Weblate (#2987)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:49:58 +01:00
Riot Translate Bot b7ec539dd1 Update from Weblate (#2986)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:49:43 +01:00
Riot Translate Bot 2adf6714b2 Update from Weblate (#2985)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:47:38 +01:00
Riot Translate Bot 240c0bc573 Update from Weblate (#2984)
Co-authored-by: Weblate (bot) <hosted@weblate.org>
2020-02-07 16:47:21 +01:00
SBiOSoftWhare 0ebaf37bb9 Merge pull request #2983 from RiotTranslateBot/weblate-riot-ios-riot-ios-push
Update from Weblate
2020-02-07 15:44:52 +01:00
SBiOSoftWhare 5de6f4ef92 Merge pull request #2982 from RiotTranslateBot/weblate-riot-ios-riot-ios-dialogs
Update from Weblate
2020-02-07 15:44:20 +01:00
SBiOSoftWhare b4cecd46a8 Merge pull request #2981 from RiotTranslateBot/weblate-riot-ios-riot-ios
Update from Weblate
2020-02-07 15:42:40 +01:00
Weblate 9bb7a1c8ad Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:37 +00:00
Weblate 63b0d8e687 Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:37 +00:00
Weblate bf5e266fd8 Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:37 +00:00
SBiOSoftWhare 8cae75e2f8 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 c2e27cdbcd Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:26 +00:00
Weblate d8be221fa3 Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:26 +00:00
Weblate 962d40d74a Merge branch 'origin/develop' into Weblate. 2020-02-07 14:34:26 +00:00
SBiOSoftWhare a7d5aa33a4 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 d89811521a Localization strings: Use ellipsis instead of three dots. 2020-02-07 14:51:19 +01:00