aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Update otr4j to 0.21Sam Whited2014-10-261-1/+1
| * Pull otr4j form Maven repoSam Whited2014-10-262-0/+4
| * Add non-project files backSam Whited2014-10-2213-0/+2865
| * Use proguard on release buildsSam Whited2014-10-222-1/+3
| * Suppress lint errors and remove bcprovSam Whited2014-10-222-13/+25
| * Add proguard rulesSam Whited2014-10-221-0/+25
| * Make conversations the root projectSam Whited2014-10-22315-30/+6
| * Add build deps and move build props to build fileSam Whited2014-10-224-16/+51
| * Add gradle directorySam Whited2014-10-223-3/+6
| * Use Gradle build systemSam Whited2014-10-22323-0/+25930
* version bump and changelog0.8iNPUTmice2014-10-302-1/+8
* Merge branch 'development'iNPUTmice2014-10-3082-1950/+3092
|\
| * only end otr session if there is more than one contact presence. reset otherwiseiNPUTmice2014-10-301-1/+5
| * cleanup for clear conversation history. small otr fixesiNPUTmice2014-10-304-26/+22
| * replace the exif interface with a small static class from 3d galleryiNPUTmice2014-10-292-17/+167
| * proper error state for imagesiNPUTmice2014-10-296-20/+17
| * fixed 'share image' context menuiNPUTmice2014-10-291-2/+1
| * fixed intent managmentiNPUTmice2014-10-291-8/+8
| * 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
| | |\
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 03:31:29 +0000