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

7340 commits

This branch
This branch
All branches
Author SHA1 Message Date
manuroe
c23b48338d Security Screen: Use MXCrossSigning.state 2020-03-18 10:01:23 +01:00
manuroe
c50215dcd1 Security screen: Create a dedicated section for cross-signing 
for future debug.
Reorder the screen a bit.
 2020-03-12 11:21:47 +01:00
manuroe
ec12212bd5
Merge pull request #3018 from vector-im/riot_3017 
Push notifications: Avoid any automatic deactivation
 2020-03-04 15:59:52 +01:00
manuroe
e7789aa411 Push notifications: Avoid any automatic deactivation 
vector-im/riot-ios#3017
 2020-03-04 15:10:46 +01:00
manuroe
949c581a7c 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
SBiOSoftWhare
db9165434c
Update PULL_REQUEST_TEMPLATE.md 2020-03-04 10:28:00 +01:00
SBiOSoftWhare
2952195c18
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
manuroe
24a9543592
Merge pull request #3001 from vector-im/neilj/update-matomo-id 
update matomo id
 2020-02-21 09:47:15 +01:00
Neil Johnson
d8ad8b9df3
Update Matomo id 2020-02-20 21:51:55 +01:00
manuroe
71a8d7dce1
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
d28a51057a update matomo id 2020-02-20 18:57:53 +01:00
manuroe
7e7127a5c8 Key Verification: Handle incoming self verification request 2020-02-20 17:56:14 +01:00
manuroe
dea39bb57a Key Verification: Follow API change 2020-02-20 17:54:32 +01:00
manuroe
b3a5b4a762
Merge pull request #2998 from vector-im/riot_2997 
Fix crash due to malformed widget
 2020-02-17 10:19:58 +01:00
manuroe
454db999b0 Fix crash due to malformed widget 
#2997
 2020-02-17 09:25:17 +01:00
manuroe
345a46b155
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
07d417bcd7 Key Verification: Support m.key.verification.ready event with new SDK API 2020-02-14 09:27:56 +01:00
manuroe
e8806a261a
Merge pull request #2992 from vector-im/MXKeyVerification 
MXCrypto: Rename MXDeviceVerificationManager to MXKeyVerificationManager
 2020-02-11 14:30:48 +01:00
manuroe
3195283768 MXCrypto: Rename MXDeviceVerificationManager to MXKeyVerificationManager 
Because it makes more sense now
 2020-02-11 13:56:36 +01:00
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