aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.6.3' into trz/rebasetrz/merge_1.6.3lookshe2015-08-2421-285/+1244
|\
| * Display error message if all contact keys purgedAndreas Straub2015-08-151-0/+10
| * show HTTP upload availability on Edit account screenhlad2015-08-141-0/+7
| * use same code that is used to open files for imagesDaniel Gultsch2015-08-111-4/+1
| * changed color of 'whispered' prefixDaniel Gultsch2015-08-111-2/+1
| * renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-084-7/+7
| * hide multi-end and otr encryption in conferencesDaniel Gultsch2015-08-061-2/+3
| * Improve TrustKeysActivity slider responsivenessAndreas Straub2015-08-051-11/+11
| * added config.java variable to hide openpgp as an encryption methodDaniel Gultsch2015-08-052-0/+3
| * added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-036-33/+104
| * Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-014-26/+32
| * Refactor axolotl message processing workflowAndreas Straub2015-07-311-1/+1
| * improved 'next encryption' selectionDaniel Gultsch2015-07-312-31/+24
| * Fix session logic: enforce same type of encryptionAndreas Straub2015-07-301-25/+3
| * fixed some colors in message adapterDaniel Gultsch2015-07-302-26/+32
| * Reset lock color for non-axolotl messagesAndreas Straub2015-07-291-0/+2
| * Highlight selected message's fingerprint in listAndreas Straub2015-07-295-13/+32
| * Rerender message bubbles on encryption changeAndreas Straub2015-07-291-0/+1
| * Tag carbon messages in parser, adapt session logicAndreas Straub2015-07-291-2/+2
| * Color plaintext messages in encrypted sessions redAndreas Straub2015-07-291-0/+30
| * Improve trust toggle responsivenessAndreas Straub2015-07-291-6/+1
| * Refactor out inner classes, cache trust storeAndreas Straub2015-07-294-14/+14
| * call refreshUi directlyDaniel Gultsch2015-07-241-1/+1
| * show warning when trying to highlight users that have left the conferenceDaniel Gultsch2015-07-221-5/+12
| * use 'interactive mode' when starting downloads from the context menuDaniel Gultsch2015-07-222-2/+2
| * Hide regenerate keys buttonAndreas Straub2015-07-221-10/+13
| * Disable trust toggle completely for INACTIVE keysAndreas Straub2015-07-221-0/+1
| * Add INACTIVE state for removed keysAndreas Straub2015-07-214-9/+37
| * allow for private messages being started from muc details in anonymous mucsDaniel Gultsch2015-07-213-15/+42
| * Start TrustKeysActivity if no keys are TRUSTEDAndreas Straub2015-07-202-4/+15
| * Do not display clear devices button if not onlineAndreas Straub2015-07-201-0/+1
| * Add purge axolotl key optionAndreas Straub2015-07-203-8/+35
| * changed message bubble appearanceRaphael Pohl2015-07-201-10/+27
| * rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-2011-66/+64
| * Merge branch 'CryptoNextBeta' into developmentAndreas Straub2015-07-2019-77/+618
| |\
| | * Lock TrustKeys if no trusted keys are availableCryptoNextBetaAndreas Straub2015-07-201-4/+26
| | * Optimize importsAndreas Straub2015-07-2018-66/+51
| | * Remove device list from EditAccountAndreas Straub2015-07-191-22/+0
| | * Add clear devices to overflow menu in EditAccountAndreas Straub2015-07-191-3/+11
| | * Ask for key trust when sending messagesAndreas Straub2015-07-194-14/+311
| | * Refactor trust key ui and show in account detailsAndreas Straub2015-07-193-48/+102
| | * Fix trust status for outgoing messagesAndreas Straub2015-07-192-7/+7
| | * Fix copying of axolotl keys to clipboardSam Whited2015-07-191-1/+1
| | * Add refresh icon to v21 themeSam Whited2015-07-191-1/+0
| | * Disable Axolotl option if not usableAndreas Straub2015-07-192-33/+10
| | * Show trust status of messages' originating sessionAndreas Straub2015-07-191-0/+13
| | * Add key trust toggle to ContactDetailsActivityAndreas Straub2015-07-191-10/+39
| | * Display trust status in ContactDetailsActivityAndreas Straub2015-07-191-0/+3
| | * Display axolotl chat message hintAndreas Straub2015-07-191-0/+3
| | * Add basic PEP managemend UI to EditAccountActivityAndreas Straub2015-07-191-4/+105