Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #34 from siacs/master | Christian S. | 2015-09-05 | 1 | -11/+60 |
|\ | |||||
| * | add null pointer check to db migration | Daniel Gultsch | 2015-09-05 | 1 | -1/+5 |
| * | Never build a session with oneself | Andreas Straub | 2015-09-05 | 1 | -11/+56 |
* | | Merge pull request #32 from siacs/master | Christian S. | 2015-09-01 | 1 | -1/+6 |
|\| | |||||
| * | made useImageAsIs determination a bit more foolproof (samsung) | Daniel Gultsch | 2015-08-31 | 1 | -1/+6 |
* | | Version 1.6.5 | Christian S | 2015-08-26 | 1 | -2/+3 |
|\| | |||||
| * | remove unused imports. | Michael | 2015-08-25 | 1 | -2/+0 |
| * | additonal null checks in file backend | Daniel Gultsch | 2015-08-25 | 1 | -0/+3 |
* | | Merge pull request #27 from siacs/development | Christian S. | 2015-08-24 | 1 | -1/+0 |
|\| | |||||
| * | bugfix: next encryption is now being properly detected | Daniel Gultsch | 2015-08-23 | 1 | -1/+0 |
* | | copy commits | Christian S | 2015-08-19 | 1 | -5/+7 |
|\| | |||||
| * | check if inputstream is null before cropping avatar images | Daniel Gultsch | 2015-08-19 | 1 | -0/+6 |
| * | catch broken base64 in avatars | Daniel Gultsch | 2015-08-16 | 1 | -5/+1 |
* | | version 1.6.0 | Christian S | 2015-08-15 | 1 | -0/+10 |
|\| | |||||
| * | provide extra interface to close sockets. fixes #1330 | Daniel Gultsch | 2015-08-15 | 1 | -0/+10 |
* | | version 1.6.0 beta 3 | Christian S | 2015-08-12 | 1 | -18/+19 |
|\| | |||||
| * | do not touch pictures that are already in the right format | Daniel Gultsch | 2015-08-11 | 1 | -18/+19 |
* | | copy commits | Christian S | 2015-08-02 | 1 | -131/+138 |
|\| | |||||
| * | Let UNTRUSTED/UNDECIDED keys become INACTIVE | Andreas Straub | 2015-08-01 | 1 | -9/+10 |
| * | added missing carbon column message table create statement | Daniel Gultsch | 2015-07-31 | 1 | -0/+1 |
| * | Tag carbon messages in parser, adapt session logic | Andreas Straub | 2015-07-29 | 1 | -1/+5 |
| * | Refactor out inner classes, cache trust store | Andreas Straub | 2015-07-29 | 1 | -130/+131 |
* | | copy commits | Christian S | 2015-07-23 | 2 | -9/+19 |
|\| | |||||
| * | made image file format configurable by Config.java | Daniel Gultsch | 2015-07-21 | 1 | -4/+14 |
| * | Use properly fixed numeral values in Trust enum | Andreas Straub | 2015-07-21 | 1 | -5/+5 |
* | | copy commits | Christian S | 2015-07-20 | 2 | -31/+511 |
|\| | |||||
| * | Fix getNumTrustedKeys | Andreas Straub | 2015-07-20 | 1 | -2/+4 |
| * | Lock TrustKeys if no trusted keys are available | Andreas Straub | 2015-07-20 | 1 | -0/+14 |
| * | Optimize imports | Andreas Straub | 2015-07-20 | 1 | -15/+15 |
| * | Fix axolotl database migration | Andreas Straub | 2015-07-20 | 1 | -2/+5 |
| * | Ask for key trust when sending messages | Andreas Straub | 2015-07-19 | 1 | -0/+9 |
| * | Fix trust status for outgoing messages | Andreas Straub | 2015-07-19 | 1 | -13/+24 |
| * | Fix setIdentityKeyTrust update statement | Andreas Straub | 2015-07-19 | 1 | -2/+2 |
| * | Fix IdentityKey storage model | Andreas Straub | 2015-07-19 | 1 | -2/+6 |
| * | Overhauled Message tagging | Andreas Straub | 2015-07-19 | 1 | -35/+58 |
| * | Fix getSubDeviceSessions SQL query | Andreas Straub | 2015-07-19 | 1 | -1/+1 |
| * | Clean up logging | Andreas Straub | 2015-07-19 | 1 | -4/+4 |
| * | Add basic PEP managemend UI to EditAccountActivity | Andreas Straub | 2015-07-19 | 1 | -0/+21 |
| * | Refactor axolotl database recreation | Andreas Straub | 2015-07-19 | 1 | -8/+14 |
| * | Save IdentityKeys in database | Andreas Straub | 2015-07-19 | 1 | -0/+85 |
| * | DatabaseBackend bugfixes | Andreas Straub | 2015-07-19 | 1 | -0/+5 |
| * | Reformat code to use tabs | Andreas Straub | 2015-07-19 | 1 | -17/+17 |
| * | Reworked axolotl protocol layer | Andreas Straub | 2015-07-19 | 1 | -27/+63 |
| * | CryptoNext persistance layer mockup | Andreas Straub | 2015-07-19 | 1 | -1/+262 |
* | | Merge branch 'development' of https://github.com/siacs/Conversations into sia... | Christian S | 2015-07-14 | 1 | -2/+4 |
|\| | |||||
| * | try to catch weird npe in android sdk | Daniel Gultsch | 2015-07-11 | 1 | -0/+2 |
| * | renamed downloadable to transferable | Daniel Gultsch | 2015-07-10 | 1 | -2/+2 |
* | | Merge pull request #1 from siacs/development | Christian S. | 2015-07-03 | 1 | -2/+1 |
|\| | |||||
| * | avoid very rare npe | Daniel Gultsch | 2015-07-03 | 1 | -2/+1 |
* | | changed WEBP to JPEG for images | Christian S | 2015-07-03 | 1 | -2/+2 |
|/ |