aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-07-201-1/+0
|\
| * Remove duplicate dependencyAndreas Straub2015-07-201-1/+0
* | fixed monospace font and android LDaniel Gultsch2015-07-205-6/+13
|/
* Merge branch 'CryptoNextBeta' into developmentAndreas Straub2015-07-2082-308/+3315
|\
| * Lock TrustKeys if no trusted keys are availableCryptoNextBetaAndreas Straub2015-07-203-4/+48
| * Optimize importsAndreas Straub2015-07-2047-195/+167
| * Use MD style for key trust toggle switchAndreas Straub2015-07-202-7/+1
| * Fix set/remove OnUpdateBlocklistListenerAndreas Straub2015-07-201-5/+5
| * Fix axolotl database migrationAndreas Straub2015-07-201-2/+5
| * Remove device list from EditAccountAndreas Straub2015-07-192-65/+0
| * Add clear devices to overflow menu in EditAccountAndreas Straub2015-07-193-3/+17
| * Ask for key trust when sending messagesAndreas Straub2015-07-1911-57/+580
| * Encrypt files for HTTP upload in encrypted chatsAndreas Straub2015-07-192-3/+7
| * Refactor trust key ui and show in account detailsAndreas Straub2015-07-198-58/+154
| * Send correct body for HTTP filesAndreas Straub2015-07-191-1/+7
| * Handle file transmission properly in axolotlAndreas Straub2015-07-191-4/+12
| * Remove unneccessary codeAndreas Straub2015-07-191-2/+1
| * Fix trust status for outgoing messagesAndreas Straub2015-07-195-28/+43
| * Don't merge messages with different trust statusesAndreas Straub2015-07-191-1/+7
| * Fix copying of axolotl keys to clipboardSam Whited2015-07-191-1/+1
| * Add refresh icon to v21 themeSam Whited2015-07-197-1/+1
| * Disable Axolotl option if not usableAndreas Straub2015-07-192-33/+10
| * Show trust status of messages' originating sessionAndreas Straub2015-07-192-0/+17
| * Add key trust toggle to ContactDetailsActivityAndreas Straub2015-07-1913-10/+52
| * Ensure that available sessions are always usedAndreas Straub2015-07-191-9/+30
| * Fix setIdentityKeyTrust update statementAndreas Straub2015-07-191-2/+2
| * Fix IdentityKey storage modelAndreas Straub2015-07-191-2/+6
| * Fix and expand key regeneration functionAndreas Straub2015-07-191-9/+18
| * Display trust status in ContactDetailsActivityAndreas Straub2015-07-192-3/+18
| * Overhauled Message taggingAndreas Straub2015-07-195-88/+138
| * Postpone initAccountService until roster loadedAndreas Straub2015-07-191-3/+1
| * Fix getSubDeviceSessions SQL queryAndreas Straub2015-07-191-1/+1
| * Display axolotl chat message hintAndreas Straub2015-07-192-0/+4
| * Use full int range for device IDsAndreas Straub2015-07-191-1/+1
| * Clean up unused constantAndreas Straub2015-07-191-1/+0
| * Make some fields finalAndreas Straub2015-07-191-3/+3
| * Clean up loggingAndreas Straub2015-07-195-67/+75
| * Add basic PEP managemend UI to EditAccountActivityAndreas Straub2015-07-195-4/+266
| * Fix devicelist update handlingAndreas Straub2015-07-192-0/+6
| * Refactor axolotl database recreationAndreas Straub2015-07-191-8/+14
| * Adapt prettifyFingerprint() to axolotl FP sizesAndreas Straub2015-07-192-6/+5
| * Fix displaying Contact IdentityKeysAndreas Straub2015-07-192-65/+2
| * Only cache session if successfully establishedAndreas Straub2015-07-191-1/+6
| * Return empty set on invalid PEP devicelistAndreas Straub2015-07-192-19/+20
| * Trust all IdentityKeysAndreas Straub2015-07-191-2/+3
| * Refresh PEP on session establishAndreas Straub2015-07-191-0/+18
| * Fix asynchronous axolotl message sendingAndreas Straub2015-07-192-8/+27
| * Properly track message senderAndreas Straub2015-07-193-15/+16
| * Rework PEP content verificationAndreas Straub2015-07-192-48/+62
| * Formatting fixesAndreas Straub2015-07-191-2/+2