Commit Graph

12250 Commits

Author SHA1 Message Date
giomfo 2dec577af6 Bug fix - User settings: The toggle buttons are disabled by mistake. 2016-11-23 09:34:06 +01:00
giomfo 84f9fbda44 version++ 2016-11-22 16:07:24 +01:00
manuroe df4800bbe5 Merge pull request #818 from vector-im/no_redact_on_m_room_encryption
Crypto: Do not allow to redact the event that enabled encryption in a room
2016-11-22 14:54:45 +01:00
manuroe 4accf4f043 Crypto: Do not allow to redact the event that enabled encryption in a room (m.room.encryption) 2016-11-22 14:39:20 +01:00
giomfo ff2dfec81b Merge pull request #817 from vector-im/settings_crypto_info
Settings: Add cryptography information
2016-11-22 14:32:18 +01:00
giomfo efd70c011d Settings: Add cryptography information
- take into account Manu's comment
2016-11-22 14:19:41 +01:00
giomfo 37abfdf301 Settings: Add cryptography information 2016-11-22 11:16:59 +01:00
manuroe 319d5a362a version++ 2016-11-18 17:28:26 +01:00
David Baker f0336404cc Merge pull request #798 from vector-im/dbkr/e2e_release_backport
Backport fixes from e2e_release branch
2016-11-18 10:55:17 +00:00
David Baker a90ba16113 Remove ITSAppUsesNonExemptEncryption key
as e2e is non-exempt

Port 05065dfa3f259f1ae332716206210f3a706fbf03 from e2e_release
2016-11-18 10:40:52 +00:00
David Baker cbe6bdf2b6 Fix padlock icons on text messages
Port d54c80dba0804c716d45a0e6a4713a80102d5326 from e2e_release branch
2016-11-18 10:39:32 +00:00
manuroe 4adf5cc408 i18n: Remove "File transfers are not yet encrypted." from the e2e enabling popup as we support it 2016-11-18 09:21:41 +01:00
giomfo f12a0cbd92 Version ++
Update Podfile.lock
2016-11-17 18:08:18 +01:00
giomfo 805925d613 Upgrade vector ios version: 0.3.0 2016-11-17 17:49:31 +01:00
giomfo 9f209068e0 Settings: Add olm version 2016-11-17 14:16:11 +01:00
giomfo 53800fd029 Prepare new release v0.3.0 Changes 2016-11-17 11:56:07 +01:00
giomfo 3fb001a0cd String: Update encryption string 2016-11-17 09:42:59 +01:00
David Baker ff90555c3d Merge pull request #786 from vector-im/dbkr/dont_clobber_attachment_urls
Don't clobber thumbnail url on MXKAttachment
2016-11-16 17:21:03 +00:00
manuroe 02ceb01cb4 Merge pull request #794 from vector-im/app_update_for_e2e
Crypto: Show a popup when people updates their app and did not have a device id
2016-11-16 18:11:15 +01:00
manuroe 236caca0cb Crypto: Show a popup when people updates their app and did not have a device id 2016-11-16 17:16:42 +01:00
giomfo 746c400b3d Merge pull request #793 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-16 16:55:31 +01:00
giomfo ebc3de4ead End-to-end encryption UI/UX
#723

- prompt user before verifying a device
2016-11-16 16:45:31 +01:00
giomfo 8f8f7e20d6 Enhancement - Encryption device information:
Hide the Verify and Block buttons when the device is the current one.
2016-11-16 15:53:52 +01:00
giomfo f5e5355a5d Merge pull request #791 from vector-im/fix_encryption_icon_offset
Bug Fix - Chat screen: the vertical offset on encryption icon due to …
2016-11-16 15:43:31 +01:00
manuroe 17351d43a6 Merge pull request #792 from vector-im/enable_voip_in_encrypted_room
Crypto: Enable voip in encrypted 1:1 room
2016-11-16 15:43:13 +01:00
giomfo 080f0f1335 Bug Fix - Chat screen: the vertical offset on encryption icon due to the timestamp 2016-11-16 15:36:35 +01:00
manuroe 785ee5ca87 Crypto: Enable voip in encrypted 1:1 room 2016-11-16 15:35:46 +01:00
manuroe e032818f99 Merge pull request #790 from vector-im/enabled_e2e_by_default
Crypto: Enable e2e by default
2016-11-16 15:04:33 +01:00
manuroe 74ee297421 i18n: s/in beta/experimental/ 2016-11-16 13:53:45 +01:00
manuroe 53221bffd4 Crypto: Enable e2e by default
Once enabled, it is still not possible to disable it but do some cleaning in case of disabling in case we change our mind on this button.
2016-11-16 13:52:38 +01:00
manuroe 6000916cfa Crypto: Enable e2e by default
Once enabled, it is still not possible to disable it but do some cleaning in case of disabling in case we change our mind on this button.
2016-11-16 13:40:04 +01:00
giomfo 8e1f3dc8e3 Merge pull request #789 from vector-im/fake_encrypted_event
Bug Fix: unencrypted outgoing messages are displayed with the verifie…
2016-11-16 12:40:54 +01:00
giomfo 1b389452f2 Bug Fix: unencrypted outgoing messages are displayed with the verified icon 2016-11-16 11:49:25 +01:00
giomfo 8441180b5d Merge pull request #788 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-16 10:48:04 +01:00
giomfo 9fdbc258bc End-to-end encryption UI/UX
#723

- fix Manu's comment
2016-11-16 10:46:25 +01:00
giomfo c79e84f4d6 End-to-end encryption UI/UX
#723

- Display device information when user taps on the encryption icon.
- Add this option in event context menu
2016-11-16 09:31:58 +01:00
David Baker 43a6a30c2b Don't clobber thumbnail url on MXKAttachment
Goes with https://github.com/matrix-org/matrix-ios-kit/pull/191

This might cause a file search view to use larger thumbnails than
it did previously, although I'm not actually sure this is wired up
anywhere. If it is, I'd rather find the place they're used and
switch it to use getThumbnailUrlForSize with the size it wants.
2016-11-15 16:30:20 +00:00
David Baker 21dfbb7c44 Merge pull request #780 from vector-im/dbkr/encrypted_attachments
Don't disable the upload button in encrypted rooms
2016-11-15 09:21:12 +00:00
giomfo 36c631c62f End-to-end encryption UI/UX
#723

- fix Manu's comments
2016-11-15 09:46:47 +01:00
David Baker b1107abb4c Don't disable the upload button in encrypted rooms
Attachments will be sent encrypted with the corresponding
matrixkit / matrix-ios-sdk branches.
2016-11-11 17:31:44 +00:00
giomfo baa3a946d1 End-to-end encryption UI/UX
#723

- Add an unencrypted icon in the composer of a non-crypto room
2016-11-10 16:23:43 +01:00
giomfo 8b16a8119d End-to-end encryption UI/UX
#723

-Prompt the user to log in again when no device id is available.
2016-11-10 16:11:51 +01:00
giomfo b4d1be2e6c Disable voip call on members/contacts details.
Contact details: Start voice call failed silently #745
2016-11-10 15:21:28 +01:00
giomfo 7ad31254a8 Merge pull request #774 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-10 10:25:50 +01:00
giomfo 859e9e582a End-to-end encryption UI/UX
#723

Patch: Display the verified icon on outgoing messages in the encrypted rooms (until #773 is fixed)
2016-11-10 10:24:59 +01:00
giomfo 8049c3b5b8 Merge pull request #769 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-09 11:00:36 +01:00
giomfo 77ec06b131 End-to-end encryption UI/UX
#723

- Let user send clear attachments in encrypted rooms
2016-11-09 10:58:11 +01:00
giomfo 5d4afb1b1f Merge pull request #763 from vector-im/vector_723
End-to-end encryption UI/UX
2016-11-08 18:26:13 +01:00
giomfo b70b1e9104 End-to-end encryption UI/UX
#723

- Disable attachments and call options in encrypted room
2016-11-08 18:25:21 +01:00
giomfo 61b8980070 Merge pull request #762 from vector-im/vector_723
Vector 723
2016-11-08 17:59:31 +01:00