| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | wrap wakelock release with try catch | iNPUTmice | 2014-06-25 | 3 | -7/+7 |
| | | |||||
| * | some fixes for otr with multiple parties | iNPUTmice | 2014-06-25 | 2 | -1/+10 |
| | | |||||
| * | changed diesys' link | iNPUTmice | 2014-06-24 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-06-24 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge pull request #226 from kruks23/development | Daniel Gultsch | 2014-06-24 | 1 | -2/+2 |
| | |\ | | | | | | | Update spanish mins ago | ||||
| | | * | Update spanish mins ago | kruks23 | 2014-06-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | more otr fixes | iNPUTmice | 2014-06-24 | 2 | -14/+24 |
| |/ / | |||||
| * | | added Diego Turtulici to list of contributors | iNPUTmice | 2014-06-24 | 1 | -0/+3 |
| | | | |||||
| * | | fixes for offline otr | iNPUTmice | 2014-06-24 | 2 | -1/+17 |
| |/ | |||||
| * | added rendering script for artwork | iNPUTmice | 2014-06-24 | 11 | -0/+12 |
| | | |||||
| * | changed opacity | iNPUTmice | 2014-06-24 | 5 | -1240/+119 |
| | | |||||
| * | added license file. plus renaming | iNPUTmice | 2014-06-24 | 4 | -0/+1587 |
| | | |||||
| * | Merge pull request #225 from diesys/development | Daniel Gultsch | 2014-06-24 | 3 | -0/+1162 |
| |\ | | | | | new icons | ||||
| | * | Create conversation_mono.svg | diesys | 2014-06-23 | 1 | -0/+400 |
| | | | |||||
| | * | conversation_baloon.svg | diesys | 2014-06-23 | 1 | -0/+381 |
| | | | |||||
| | * | conversation.svg | diesys | 2014-06-23 | 1 | -0/+381 |
| | | | |||||
| * | | fixed regression with chat markers not working | iNPUTmice | 2014-06-23 | 3 | -8/+2 |
| |/ | |||||
| * | new logo | iNPUTmice | 2014-06-23 | 12 | -7/+13 |
| | | |||||
| * | fix for not being able to send otr encrypted images to offline contacts. ↵ | iNPUTmice | 2014-06-23 | 1 | -18/+18 |
| | | | | | unconfirmed | ||||
| * | possible better distribution of contact picture colors | iNPUTmice | 2014-06-23 | 1 | -2/+2 |
| | | |||||
| * | enabled otr encryption for ibb filetransfer as well | iNPUTmice | 2014-06-23 | 2 | -16/+20 |
| | | |||||
| * | removed warnings | iNPUTmice | 2014-06-22 | 5 | -11/+7 |
| | | |||||
| * | changelog and version bump to 0.4-beta | iNPUTmice | 2014-06-22 | 2 | -2/+11 |
| | | |||||
| * | fixed #220 | iNPUTmice | 2014-06-22 | 5 | -14/+63 |
| | | |||||
| * | moved message packet creation into sperate class | iNPUTmice | 2014-06-22 | 3 | -69/+84 |
| | | |||||
| * | establish otr connection before sending image | iNPUTmice | 2014-06-22 | 1 | -13/+34 |
| | | |||||
| * | removed duplicate entries | iNPUTmice | 2014-06-21 | 1 | -4/+0 |
| | | |||||
| * | Merge branch 'beriain-development' into development | iNPUTmice | 2014-06-20 | 1 | -240/+249 |
| |\ | |||||
| | * | Merge branch 'development' of https://github.com/beriain/Conversations into ↵ | iNPUTmice | 2014-06-20 | 1 | -240/+249 |
| |/| | | | | | | | | | | | | | beriain-development Conflicts: res/values-eu/strings.xml | ||||
| | * | Update strings.xml | Aitor Beriain | 2014-06-18 | 1 | -3/+6 |
| | | | |||||
| | * | Update strings.xml | Aitor Beriain | 2014-06-09 | 1 | -3/+30 |
| | | | |||||
| * | | fixes for otr file transfer | iNPUTmice | 2014-06-20 | 4 | -23/+49 |
| | | | |||||
| * | | not working version of otr file transfer | iNPUTmice | 2014-06-20 | 15 | -52/+548 |
| | | | |||||
| * | | clear input field after conference pgp message | iNPUTmice | 2014-06-16 | 1 | -0/+1 |
| | | | |||||
| * | | streamlined onpresenceselected listener | iNPUTmice | 2014-06-16 | 5 | -124/+106 |
| | | | |||||
| * | | fixed bug in intent filter. cleaned share with activity | iNPUTmice | 2014-06-16 | 2 | -15/+44 |
| | | | |||||
| * | | added share image intent to android manifest for testing purposes | iNPUTmice | 2014-06-16 | 2 | -43/+66 |
| | | | |||||
| * | | code cleanup / unification | iNPUTmice | 2014-06-16 | 2 | -40/+22 |
| | | | |||||
| * | | cleanup; removed unnecessary imports and log outputs | iNPUTmice | 2014-06-16 | 13 | -41/+5 |
| | | | |||||
| * | | Merge pull request #211 from kruks23/development | Daniel Gultsch | 2014-06-15 | 3 | -15/+30 |
| |\ \ | | | | | | | Rounded minutes ago and last seen moe exactly | ||||
| | * | | Rounded minutes ago and last seen + Update Spanish Translations | kruks23 | 2014-06-15 | 3 | -15/+30 |
| |/ / | |||||
| * | | Merge pull request #209 from mrdomino/development | Daniel Gultsch | 2014-06-15 | 1 | -2/+1 |
| |\ \ | | | | | | | Send from our full jid (fixes #60) | ||||
| | * | | Send from our full jid (fixes #60) | Steven Dee | 2014-06-15 | 1 | -2/+1 |
| |/ / | | | | | | | | | | | | | The problem wasn't with sending to bare jids, but rather sending *from* bare jids, which we did unless we were OTR encrypted for some reason. Google Talk supports the former, but (probably correctly) rejects the latter. | ||||
| * | | infite scrolling | iNPUTmice | 2014-06-14 | 3 | -15/+69 |
| | | | |||||
| * | | fixed #197 | iNPUTmice | 2014-06-14 | 1 | -2/+3 |
| | | | |||||
| * | | fixed #204 | iNPUTmice | 2014-06-14 | 1 | -4/+8 |
| | | | |||||
| * | | offline sending of images | iNPUTmice | 2014-06-13 | 2 | -7/+16 |
| | | | |||||
| * | | status waiting for images sent offline | iNPUTmice | 2014-06-13 | 2 | -24/+41 |
| | | | |||||
| * | | moved last seen to contact details | iNPUTmice | 2014-06-13 | 6 | -51/+14 |
| | | | |||||
| * | | further bullet proofing | iNPUTmice | 2014-06-13 | 1 | -32/+33 |
| | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |