| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Use full URI for android application Gradle plugin | Sam Whited | 2014-10-26 | 1 | -1/+1 | |
| | | | ||||||
| | * | Remove useless include from Gradle settings | Sam Whited | 2014-10-26 | 1 | -1/+0 | |
| | | | ||||||
| | * | Move submodules back to libs/ | Sam Whited | 2014-10-26 | 6 | -13/+13 | |
| | | | ||||||
| | * | Add some logic for signing releases | Sam Whited | 2014-10-26 | 1 | -0/+29 | |
| | | | ||||||
| | * | Update otr4j to 0.21 | Sam Whited | 2014-10-26 | 1 | -1/+1 | |
| | | | ||||||
| | * | Pull otr4j form Maven repo | Sam Whited | 2014-10-26 | 2 | -0/+4 | |
| | | | ||||||
| | * | Add non-project files back | Sam Whited | 2014-10-22 | 13 | -0/+2865 | |
| | | | ||||||
| | * | Use proguard on release builds | Sam Whited | 2014-10-22 | 2 | -1/+3 | |
| | | | | | | | | | | | We don't need obfuscation (it's an open source project), but proguard wil shrink the apk by stripping out unused code. | |||||
| | * | Suppress lint errors and remove bcprov | Sam Whited | 2014-10-22 | 2 | -13/+25 | |
| | | | ||||||
| | * | Add proguard rules | Sam Whited | 2014-10-22 | 1 | -0/+25 | |
| | | | ||||||
| | * | Make conversations the root project | Sam Whited | 2014-10-22 | 315 | -30/+6 | |
| | | | ||||||
| | * | Add build deps and move build props to build file | Sam Whited | 2014-10-22 | 4 | -16/+51 | |
| | | | ||||||
| | * | Add gradle directory | Sam Whited | 2014-10-22 | 3 | -3/+6 | |
| | | | ||||||
| | * | Use Gradle build system | Sam Whited | 2014-10-22 | 323 | -0/+25930 | |
| | | ||||||
| * | version bump and changelog0.8 | iNPUTmice | 2014-10-30 | 2 | -1/+8 | |
| | | ||||||
| * | Merge branch 'development' | iNPUTmice | 2014-10-30 | 82 | -1950/+3092 | |
| |\ | ||||||
| | * | only end otr session if there is more than one contact presence. reset otherwise | iNPUTmice | 2014-10-30 | 1 | -1/+5 | |
| | | | ||||||
| | * | cleanup for clear conversation history. small otr fixes | iNPUTmice | 2014-10-30 | 4 | -26/+22 | |
| | | | ||||||
| | * | replace the exif interface with a small static class from 3d gallery | iNPUTmice | 2014-10-29 | 2 | -17/+167 | |
| | | | ||||||
| | * | proper error state for images | iNPUTmice | 2014-10-29 | 6 | -20/+17 | |
| | | | ||||||
| | * | fixed 'share image' context menu | iNPUTmice | 2014-10-29 | 1 | -2/+1 | |
| | | | ||||||
| | * | fixed intent managment | iNPUTmice | 2014-10-29 | 1 | -8/+8 | |
| | | | ||||||
| | * | Merge pull request #593 from weiss/improve-german-translations | Daniel Gultsch | 2014-10-29 | 1 | -7/+7 | |
| | |\ | | | | | | | Improve some of the German translations | |||||
| | | * | Improve some of the German translations | Holger Weiß | 2014-10-28 | 1 | -7/+7 | |
| | |/ | ||||||
| | * | end otr session if plain text message from another instance is being received | iNPUTmice | 2014-10-28 | 1 | -1/+8 | |
| | | | ||||||
| | * | improvements on findConversation | iNPUTmice | 2014-10-28 | 1 | -2/+2 | |
| | | | ||||||
| | * | always show verify fingerprint if there is an active otr session | iNPUTmice | 2014-10-28 | 1 | -5/+4 | |
| | | | ||||||
| | * | reworked dns retry | iNPUTmice | 2014-10-27 | 2 | -66/+51 | |
| | | | ||||||
| | * | removed unnecessary logging from avatar service | iNPUTmice | 2014-10-27 | 1 | -5/+0 | |
| | | | ||||||
| | * | proper cleanup after pgp image decryption | iNPUTmice | 2014-10-27 | 1 | -16/+9 | |
| | | | ||||||
| | * | fixed url parsing | iNPUTmice | 2014-10-27 | 1 | -1/+6 | |
| | | | ||||||
| | * | check for links in pgp encrypted messages as well | iNPUTmice | 2014-10-27 | 4 | -7/+12 | |
| | | | ||||||
| | * | Merge pull request #590 from weiss/update-german-translations | Daniel Gultsch | 2014-10-27 | 2 | -1/+17 | |
| | |\ | | | | | | | Update German translations | |||||
| | | * | Update German translations | Holger Weiß | 2014-10-26 | 2 | -1/+17 | |
| | |/ | ||||||
| | * | set divider for image meta information to '|' to not conflict with URL. ↵ | iNPUTmice | 2014-10-26 | 4 | -8/+53 | |
| | | | | | | | | | breaks images downloaded in between 0.7.3 and now | |||||
| | * | Merge pull request #588 from betheg/remove_unused_cast | Daniel Gultsch | 2014-10-26 | 10 | -32/+25 | |
| | |\ | | | | | | | remove some unused cast | |||||
| | | * | remove some unused cast | Michael | 2014-10-26 | 10 | -32/+25 | |
| | | | | ||||||
| | * | | Merge pull request #587 from betheg/fix_possible_fallthrough | Daniel Gultsch | 2014-10-26 | 2 | -0/+2 | |
| | |\ \ | | |/ | |/| | fix possible fallthrough. | |||||
| | | * | fix possible fallthrough. | Michael | 2014-10-26 | 2 | -0/+2 | |
| | |/ | ||||||
| | * | Merge pull request #586 from SamWhited/issue585 | Daniel Gultsch | 2014-10-26 | 1 | -2/+2 | |
| | |\ | | | | | | | Use consistent numbering | |||||
| | | * | Use consistent numbering | Sam Whited | 2014-10-26 | 1 | -2/+2 | |
| | |/ | | | | | | | Fixes #585 | |||||
| | * | don't merge downloadable messages | iNPUTmice | 2014-10-24 | 1 | -1/+3 | |
| | | | ||||||
| | * | added message option to download images | iNPUTmice | 2014-10-24 | 3 | -3/+18 | |
| | | | ||||||
| | * | Merge pull request #582 from kruks23/translation7 | Daniel Gultsch | 2014-10-24 | 1 | -2/+11 | |
| | |\ | | | | | | | Update Spanish Translations | |||||
| | | * | Update Spanish Translations | kruks23 | 2014-10-24 | 1 | -2/+11 | |
| | | | | ||||||
| | * | | also show some text in new image notification | iNPUTmice | 2014-10-24 | 1 | -73/+122 | |
| | |/ | ||||||
| | * | picture notification and some drive by bug fixes | iNPUTmice | 2014-10-24 | 4 | -33/+40 | |
| | | | ||||||
| | * | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-10-24 | 1 | -0/+7 | |
| | |\ | ||||||
| | | * | Merge pull request #581 from kruks23/translation7 | Daniel Gultsch | 2014-10-23 | 1 | -0/+7 | |
| | | |\ | | | | | | | | | Update Spanish Translations | |||||
| | | | * | Update Spanish Translations | kruks23 | 2014-10-23 | 1 | -0/+7 | |
| | | | | | ||||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |