aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * proper avatar cachingiNPUTmice2014-10-2115-164/+223
| * refactored avatar generation. first stepiNPUTmice2014-10-2025-368/+405
| * keep reference to previous and next message in messageiNPUTmice2014-10-203-13/+28
| * Merge pull request #569 from kriztan/patch-1Daniel Gultsch2014-10-201-0/+1
| |\
| | * Set default preference ...kriztan2014-10-191-1/+2
| * | Merge pull request #570 from SamWhited/typo-fixesDaniel Gultsch2014-10-202-140/+187
| |\ \
| | * | Went a bit wild on the README...Sam Whited2014-10-191-137/+184
| | * | A few typo fixes in the READMESam Whited2014-10-191-10/+10
| | * | Fixed some strange wording in a stringSam Whited2014-10-191-1/+1
| |/ /
| * | Merge pull request #554 from SamWhited/tlsDaniel Gultsch2014-10-203-10/+48
| |\ \
| | * | Make legacy SSL option default to falseSam Whited2014-10-192-2/+2
| | * | Add "Enable legacy SSL" preferenceSam Whited2014-10-193-14/+43
| | * | Remove support for legacy SSLSam Whited2014-10-181-1/+9
| | * | Enable all supported protocols including TLSv1.1 and 1.2Sam Whited2014-10-161-0/+1
| * | | mtm support for image downloaderiNPUTmice2014-10-197-16/+59
| * | | use new 'api' to add messages to a conversationiNPUTmice2014-10-191-3/+3
| * | | force tls for registrations as welliNPUTmice2014-10-191-2/+5
| * | | got rid of copyonwrite array list for messagesiNPUTmice2014-10-194-20/+26
| * | | force tlsiNPUTmice2014-10-191-3/+5
| * | | Merge branch 'lactide-srv_fix' into developmentiNPUTmice2014-10-191-4/+17
| |\ \ \
| | * | | Merge branch 'srv_fix' of https://github.com/lactide/Conversations into lacti...iNPUTmice2014-10-191-4/+17
| |/| | |
| | * | | try all srv responses if necessaryFrank Zschockelt2014-10-161-4/+17
| * | | | fixed typo in french translationiNPUTmice2014-10-191-1/+1
| * | | | Merge pull request #555 from SamWhited/build-fixesDaniel Gultsch2014-10-191-0/+2
| |\ \ \ \
| | * | | | Fix problem when merging manifestsSam Whited2014-10-161-0/+2
| | | |/ / | | |/| |
| * | | | Merge pull request #566 from BenoitBouvarel/patch-1Daniel Gultsch2014-10-191-2/+63
| |\ \ \ \
| | * | | | Update strings.xmlBenoit Bouvarel2014-10-181-2/+63
| | | |_|/ | | |/| |
| * | | | Merge pull request #565 from the-solipsist/patch-2Daniel Gultsch2014-10-191-7/+7
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Update README.mdthe-solipsist2014-10-181-5/+5
| | * | | Update README.mdthe-solipsist2014-10-171-2/+2
| |/ / /
| * | | do not attempt to download images when not connectediNPUTmice2014-10-178-45/+60
| * | | made grace period on a per account basisiNPUTmice2014-10-176-37/+30
| | |/ | |/|
| * | additonal safty net for disabling notificationsiNPUTmice2014-10-161-0/+1
| * | simplified determination whether otr needs starting in a sessioniNPUTmice2014-10-161-7/+2
| * | log ending otr sessions on disconnectiNPUTmice2014-10-162-3/+10
| * | forground/background logging without csiiNPUTmice2014-10-161-4/+2
| * | make image download message to type=image only after completioniNPUTmice2014-10-161-3/+2
| |/
| * added file observer to get notified when files are deleted: fixes #396iNPUTmice2014-10-162-3/+32
| * detect deleted files on start up. got rid of lagecy image provider for perfor...iNPUTmice2014-10-1512-197/+67
| * Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-10-151-2/+12
| |\
| | * Merge pull request #551 from emdete/p4Daniel Gultsch2014-10-151-2/+12
| | |\
| | | * beautify render script to be easier to diff/patchM. Dietrich2014-10-151-2/+12
| * | | refactored file download status. make image http download available for carbo...iNPUTmice2014-10-1524-210/+273
| |/ /
| * | Merge pull request #547 from emdete/p0Daniel Gultsch2014-10-151-4/+4
| |\ \
| | * | remove warning about <> castM. Dietrich2014-10-151-4/+4
| | |/
| * | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-10-151-2/+2
| |\|
| | * Merge pull request #506 from SamWhited/string_fixesDaniel Gultsch2014-10-151-2/+2
| | |\
| | | * Remove full stop in description for consistencySam Whited2014-09-291-1/+1
| | | * Fix typos in string resourceSam Whited2014-09-291-2/+2
| * | | synchronization for listenersiNPUTmice2014-10-151-43/+60