aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* removed recursion in message.getMerged*()Daniel Gultsch2015-07-281-13/+19
* changed logging. (work around logcat null pointerDaniel Gultsch2015-07-282-2/+1
* log reason for message failureDaniel Gultsch2015-07-281-0/+7
* linked XEPs in READMEDaniel Gultsch2015-07-281-9/+9
* set time on resend to current timeDaniel Gultsch2015-07-281-1/+2
* rewrote dns fallbackDaniel Gultsch2015-07-242-9/+9
* call refreshUi directlyDaniel Gultsch2015-07-241-1/+1
* switch/case can't deal with null pointersDaniel Gultsch2015-07-231-0/+3
* show warning when trying to highlight users that have left the conferenceDaniel Gultsch2015-07-223-5/+22
* treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch2015-07-224-4/+11
* Always build own device session automaticallyAndreas Straub2015-07-221-6/+13
* add no-store to chat statesDaniel Gultsch2015-07-221-0/+2
* use type=chat more often to go along with new, simple carbon and mam rulesDaniel Gultsch2015-07-222-12/+15
* use 'interactive mode' when starting downloads from the context menuDaniel Gultsch2015-07-223-3/+2
* Hide regenerate keys buttonAndreas Straub2015-07-223-11/+16
* Disable trust toggle completely for INACTIVE keysAndreas Straub2015-07-221-0/+1
* made image file format configurable by Config.javaDaniel Gultsch2015-07-213-8/+18
* bump to version 1.5.2Daniel Gultsch2015-07-211-2/+2
* fixed npe in error message handlingDaniel Gultsch2015-07-211-1/+1
* decreased saturation of received message bubbles by 25 unitsDaniel Gultsch2015-07-2111-1/+1
* Add INACTIVE state for removed keysAndreas Straub2015-07-219-40/+102
* Fill own device sessions into SessionMapAndreas Straub2015-07-211-7/+14
* allow for private messages being started from muc details in anonymous mucsDaniel Gultsch2015-07-215-15/+47
* version bump to 1.5.1 and changelogDaniel Gultsch2015-07-212-2/+6
* and now do that properlyDaniel Gultsch2015-07-211-1/+1
* end otr session when receiving failed otr message warningsDaniel Gultsch2015-07-211-1/+7
* bugfix: also add no-permanent-storage to message hintsDaniel Gultsch2015-07-212-1/+2
* bugfix: changed condition of onOtrSessionEstablished being calledDaniel Gultsch2015-07-211-6/+6
* very subtleDaniel Gultsch2015-07-219-60/+75
* Use properly fixed numeral values in Trust enumAndreas Straub2015-07-212-9/+31
* Remove unused importAndreas Straub2015-07-211-1/+0
* Switch payload encryption to AES-GCMAndreas Straub2015-07-213-17/+46
* Also decrypt messages from UNTRUSTED sessionsAndreas Straub2015-07-201-1/+1
* Refactor axolotl send processing/caching flowAndreas Straub2015-07-203-17/+16
* 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 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