aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-10-221-2/+18
|\
| * Merge pull request #577 from beriain/developmentDaniel Gultsch2014-10-221-2/+18
| |\ | | | | | | Update strings.xml for 0.8
| | * Update strings.xmlAitor Beriain2014-10-221-2/+18
| | |
* | | ability to download pgp encrypted files over http as welliNPUTmice2014-10-222-5/+9
|/ /
* / small bug fixes for the conversation activityiNPUTmice2014-10-221-2/+9
|/
* made httpconnection accept aes encrypted filesiNPUTmice2014-10-225-16/+33
|
* better aproach on thread safteyiNPUTmice2014-10-221-13/+7
|
* changed version to 0.8 alphaiNPUTmice2014-10-221-3/+3
|
* added hostname verifier to httpconnectioniNPUTmice2014-10-222-11/+32
|
* made iterating over hashmap in notification service thread safeiNPUTmice2014-10-211-1/+8
|
* throw exception when no servers are left to tryiNPUTmice2014-10-211-0/+6
|
* fixed #564iNPUTmice2014-10-213-6/+6
|
* update ui when new avatar was foundiNPUTmice2014-10-212-0/+8
|
* 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 ...
| * Set default preference ...kriztan2014-10-191-1/+2
| | | | | | ... for MUC notifications to true
* | Merge pull request #570 from SamWhited/typo-fixesDaniel Gultsch2014-10-202-140/+187
|\ \ | | | | | | Minor typo fixes, and big changes to README
| * | 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
|/ / | | | | | | Still doesn't sound right to me though...
* | Merge pull request #554 from SamWhited/tlsDaniel Gultsch2014-10-203-10/+48
|\ \ | | | | | | Enable TLSv1.1 and 1.2 and add option to enable/disable SSLv3
| * | 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 ↵iNPUTmice2014-10-191-4/+17
|/| | | | | | | | | | | | | | | lactide-srv_fix
| * | | 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 manifests during a Gradle build
| * | | | Fix problem when merging manifestsSam Whited2014-10-161-0/+2
| | |/ / | |/| |
* | | | Merge pull request #566 from BenoitBouvarel/patch-1Daniel Gultsch2014-10-191-2/+63
|\ \ \ \ | | | | | | | | | | Update french strings.xml
| * | | | Update strings.xmlBenoit Bouvarel2014-10-181-2/+63
| | |_|/ | |/| | | | | | French translation update
* | | | Merge pull request #565 from the-solipsist/patch-2Daniel Gultsch2014-10-191-7/+7
|\ \ \ \ | |/ / / |/| | | Update README.md
| * | | Update README.mdthe-solipsist2014-10-181-5/+5
| | | |
| * | | Update README.mdthe-solipsist2014-10-171-2/+2
|/ / / | | | | | | Changed "little" to the grammatically correct "few", and corrected the spelling of "permissions".
* | | 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
|/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 21:30:22 +0000