aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* copy commitsChristian S2015-07-20155-544/+4973
|\
| * Start TrustKeysActivity if no keys are TRUSTEDAndreas Straub2015-07-203-10/+21
| * Do not display clear devices button if not onlineAndreas Straub2015-07-201-0/+1
| * Add purge axolotl key optionAndreas Straub2015-07-206-38/+99
| * Fix getNumTrustedKeysAndreas Straub2015-07-201-2/+4
| * pulled new translations from transifexDaniel Gultsch2015-07-202-1/+6
| * attempt to fix the delay problemDaniel Gultsch2015-07-205-53/+39
| * changed sizes of avatars and padding in new message bubblesDaniel Gultsch2015-07-2015-30/+29
| * changed message bubble appearanceRaphael Pohl2015-07-2029-97/+521
| * rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-2014-76/+66
| * 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 availableAndreas 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