aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #593 from weiss/improve-german-translationsDaniel Gultsch2014-10-291-7/+7
|\
| * Improve some of the German translationsHolger Weiß2014-10-281-7/+7
|/
* end otr session if plain text message from another instance is being receivediNPUTmice2014-10-281-1/+8
* improvements on findConversationiNPUTmice2014-10-281-2/+2
* always show verify fingerprint if there is an active otr sessioniNPUTmice2014-10-281-5/+4
* reworked dns retryiNPUTmice2014-10-272-66/+51
* removed unnecessary logging from avatar serviceiNPUTmice2014-10-271-5/+0
* proper cleanup after pgp image decryptioniNPUTmice2014-10-271-16/+9
* fixed url parsingiNPUTmice2014-10-271-1/+6
* check for links in pgp encrypted messages as welliNPUTmice2014-10-274-7/+12
* Merge pull request #590 from weiss/update-german-translationsDaniel Gultsch2014-10-272-1/+17
|\
| * Update German translationsHolger Weiß2014-10-262-1/+17
|/
* set divider for image meta information to '|' to not conflict with URL. break...iNPUTmice2014-10-264-8/+53
* Merge pull request #588 from betheg/remove_unused_castDaniel Gultsch2014-10-2610-32/+25
|\
| * remove some unused castMichael2014-10-2610-32/+25
* | Merge pull request #587 from betheg/fix_possible_fallthroughDaniel Gultsch2014-10-262-0/+2
|\ \ | |/ |/|
| * fix possible fallthrough.Michael2014-10-262-0/+2
|/
* Merge pull request #586 from SamWhited/issue585Daniel Gultsch2014-10-261-2/+2
|\
| * Use consistent numberingSam Whited2014-10-261-2/+2
|/
* don't merge downloadable messagesiNPUTmice2014-10-241-1/+3
* added message option to download imagesiNPUTmice2014-10-243-3/+18
* Merge pull request #582 from kruks23/translation7Daniel Gultsch2014-10-241-2/+11
|\
| * Update Spanish Translationskruks232014-10-241-2/+11
* | also show some text in new image notificationiNPUTmice2014-10-241-73/+122
|/
* picture notification and some drive by bug fixesiNPUTmice2014-10-244-33/+40
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-10-241-0/+7
|\
| * Merge pull request #581 from kruks23/translation7Daniel Gultsch2014-10-231-0/+7
| |\
| | * Update Spanish Translationskruks232014-10-231-0/+7
* | | notify only after image has been received over http. introduced mini grace fo...iNPUTmice2014-10-246-33/+64
|/ /
* / context menu for messages. allow to resend single messagesiNPUTmice2014-10-2311-39/+189
|/
* 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.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 ...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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 03:33:14 +0000