Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'CryptoNextBeta' into development | Andreas Straub | 2015-07-20 | 22 | -5/+264 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CryptoNextBeta: (60 commits) Lock TrustKeys if no trusted keys are available Optimize imports Use MD style for key trust toggle switch Fix set/remove OnUpdateBlocklistListener Fix axolotl database migration Remove device list from EditAccount Add clear devices to overflow menu in EditAccount Ask for key trust when sending messages Encrypt files for HTTP upload in encrypted chats Refactor trust key ui and show in account details Send correct body for HTTP files Handle file transmission properly in axolotl Remove unneccessary code Fix trust status for outgoing messages Don't merge messages with different trust statuses Fix copying of axolotl keys to clipboard Add refresh icon to v21 theme Disable Axolotl option if not usable Show trust status of messages' originating session Add key trust toggle to ContactDetailsActivity ... | ||||
| * | Use MD style for key trust toggle switch | Andreas Straub | 2015-07-20 | 2 | -7/+1 |
| | | |||||
| * | Remove device list from EditAccount | Andreas Straub | 2015-07-19 | 1 | -43/+0 |
| | | |||||
| * | Add clear devices to overflow menu in EditAccount | Andreas Straub | 2015-07-19 | 2 | -0/+6 |
| | | |||||
| * | Ask for key trust when sending messages | Andreas Straub | 2015-07-19 | 2 | -0/+123 |
| | | | | | | | | | | | | If the contact (or the own account) has keys that have UNDECIDED trust, we now drop the user into the new TrustKeysActivity, where they have to decide for each new key whether it should be TRUSTED or UNTRUSTED. | ||||
| * | Refactor trust key ui and show in account details | Andreas Straub | 2015-07-19 | 4 | -10/+51 |
| | | | | | | | | | | | | | | | | | | Refactored the trust key row UI element so it can be used in multiple places. It now also uses a slider to toggle the trust state, and the redundant trust state description was removed. EditAccountActivity now shows the keys of other devices associated with that account. | ||||
| * | Add refresh icon to v21 theme | Sam Whited | 2015-07-19 | 6 | -0/+1 |
| | | |||||
| * | Add key trust toggle to ContactDetailsActivity | Andreas Straub | 2015-07-19 | 12 | -0/+13 |
| | | | | | | | | Can now toggle IdentityKey trust | ||||
| * | Display trust status in ContactDetailsActivity | Andreas Straub | 2015-07-19 | 1 | -3/+15 |
| | | |||||
| * | Display axolotl chat message hint | Andreas Straub | 2015-07-19 | 1 | -0/+1 |
| | | |||||
| * | Add basic PEP managemend UI to EditAccountActivity | Andreas Straub | 2015-07-19 | 2 | -0/+107 |
| | | | | | | | | | | | | | | | | | | EditAccountActivity now show own fingerprint, and gives an option to regenerate local keying material (and wipe all sessions associated with the old keys in the process). It also now displays a list of other own devices, and gives an option to remove all but the current device. | ||||
| * | CryptoNext Menu entries added | Andreas Straub | 2015-07-19 | 2 | -0/+4 |
| | | |||||
* | | don't show 'show contact details' context menu item when contact isn not in ↵ | Daniel Gultsch | 2015-07-20 | 1 | -25/+25 |
| | | | | | | | | roster | ||||
* | | Merge pull request #1289 from kriztan/patch-2 | Daniel Gultsch | 2015-07-20 | 1 | -1/+5 |
|\ \ | | | | | | | show contact details in conference details ... | ||||
| * | | show contact details in conference details ... | Christian S | 2015-07-19 | 1 | -1/+5 |
| |/ | |||||
* / | Change CAB to accent color in v21 | Sam Whited | 2015-07-19 | 1 | -0/+3 |
|/ | |||||
* | changed switch widget | Daniel Gultsch | 2015-07-18 | 30 | -4/+58 |
| | |||||
* | pulled translations | Daniel Gultsch | 2015-07-18 | 7 | -1/+15 |
| | |||||
* | version bump to 1.5.0-beta.2 | Daniel Gultsch | 2015-07-16 | 1 | -1/+1 |
| | |||||
* | fixed some ux glitches in editaccount | Daniel Gultsch | 2015-07-16 | 2 | -2/+0 |
| | |||||
* | removed empty translation file | Daniel Gultsch | 2015-07-16 | 1 | -2/+0 |
| | |||||
* | made 'check image on http host' message more generic. fixed #1281 | Daniel Gultsch | 2015-07-16 | 27 | -103/+332 |
| | |||||
* | renamed colors | Daniel Gultsch | 2015-07-13 | 34 | -152/+153 |
| | |||||
* | display toast in ui on failed http download | Daniel Gultsch | 2015-07-10 | 1 | -0/+1 |
| | | | | fixes #954 | ||||
* | refactored message context menu | Daniel Gultsch | 2015-07-02 | 2 | -10/+15 |
| | |||||
* | pulled new translations from transifex | Daniel Gultsch | 2015-06-23 | 2 | -3/+20 |
| | |||||
* | pulled new translations from transifex | Daniel Gultsch | 2015-06-10 | 2 | -0/+10 |
| | |||||
* | upgrade build tools | Daniel Gultsch | 2015-06-02 | 1 | -2/+0 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-05-26 | 4 | -0/+20 |
| | |||||
* | added choose picture as another quick action. fixes #1221 | Daniel Gultsch | 2015-05-26 | 21 | -0/+2 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-05-20 | 7 | -0/+35 |
| | |||||
* | pulled new translations from transifex | Daniel Gultsch | 2015-05-16 | 3 | -52/+302 |
| | |||||
* | pulled updated translations from transifex | Daniel Gultsch | 2015-05-11 | 2 | -2/+4 |
| | |||||
* | rewrote parts of message adapter to avoid using NULL views | Daniel Gultsch | 2015-05-11 | 1 | -7/+0 |
| | |||||
* | changed conversation red to material red | Daniel Gultsch | 2015-05-10 | 26 | -1/+1 |
| | |||||
* | turn send button in cancel button while in whisper mode | Daniel Gultsch | 2015-05-03 | 20 | -0/+0 |
| | |||||
* | replace send button with quick action button as long as no text has been entered | Daniel Gultsch | 2015-05-02 | 115 | -405/+433 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-05-01 | 2 | -0/+70 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-04-29 | 8 | -1/+607 |
| | |||||
* | adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar) | Daniel Gultsch | 2015-04-28 | 3 | -0/+0 |
| | |||||
* | increased padding on image buttons on v21 to match material guidelines | Daniel Gultsch | 2015-04-28 | 5 | -7/+9 |
| | |||||
* | made material icons smaller (24dp) | Daniel Gultsch | 2015-04-28 | 133 | -17/+15 |
| | |||||
* | increased padding around switches in manage accounts | Daniel Gultsch | 2015-04-27 | 1 | -2/+4 |
| | |||||
* | pulled translations from transifex | Daniel Gultsch | 2015-04-26 | 9 | -3/+205 |
| | |||||
* | Merge pull request #1135 from BrianBlade/manage_certificates | Daniel Gultsch | 2015-04-25 | 3 | -5/+33 |
|\ | | | | | Add option to remove manually approved certificates | ||||
| * | Add option to remove manually approved certificates | BrianBlade | 2015-04-19 | 3 | -5/+33 |
| | | | | | | | | | | | | | | - "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options" | ||||
* | | added missing translations from transifex | Daniel Gultsch | 2015-04-21 | 11 | -8/+24 |
| | | |||||
* | | pulled latest translations from transifex | Daniel Gultsch | 2015-04-20 | 6 | -3/+727 |
|/ | |||||
* | maintain state when rotating settings activity | iNPUTmice | 2015-04-14 | 1 | -4/+10 |
| | |||||
* | Merge branch 'dont_trust_cas_preference' of ↵ | iNPUTmice | 2015-04-14 | 3 | -1/+10 |
|\ | | | | | | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference Conflicts: src/main/res/values-de/strings.xml src/main/res/values/strings.xml |