| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | fixed #201 | iNPUTmice | 2014-06-13 | 1 | -1/+0 |
| | | | |||||
| * | | finished offline otr | iNPUTmice | 2014-06-12 | 5 | -23/+47 |
| | | | |||||
| * | | fire onContactStatusChanged only on online/offline changes. not on status ↵ | iNPUTmice | 2014-06-12 | 3 | -13/+4 |
| | | | | | | | | | changes | ||||
| * | | send otr messages when contacts comes online | iNPUTmice | 2014-06-12 | 3 | -4/+7 |
| | | | |||||
| * | | made muc join easier if muc server is known. added room to key words | iNPUTmice | 2014-06-12 | 3 | -2/+17 |
| | | | |||||
| * | | groundwork for offline otr messages | iNPUTmice | 2014-06-11 | 8 | -122/+111 |
| | | | |||||
| * | | select presence dialog now suggests last used presence | iNPUTmice | 2014-06-10 | 1 | -6/+22 |
| | | | |||||
| * | | fixed scrolling issues | iNPUTmice | 2014-06-10 | 2 | -19/+36 |
| | | | |||||
| * | | cleanup | iNPUTmice | 2014-06-10 | 1 | -2/+1 |
| | | | |||||
| * | | Merge pull request #193 from strb/mucicons | Daniel Gultsch | 2014-06-10 | 1 | -1/+1 |
| |\ \ | | | | | | | Muc Icon tile color fix | ||||
| | * | | Muc Icon tile color fix | Andreas Straub | 2014-06-10 | 1 | -1/+1 |
| |/ / | |||||
| * | | don't display 'enter password' message if OpenKeychain is not installed. ↵ | iNPUTmice | 2014-06-09 | 7 | -88/+130 |
| | | | | | | | | | made status messages in chat not selectable | ||||
| * | | Merge pull request #188 from DerHamster/worktest | Daniel Gultsch | 2014-06-09 | 1 | -1/+1 |
| |\ \ | | | | | | | small fix ( zerfifikat -> zertifikat ) | ||||
| | * | | small fix ( zerfifikat -> zertifikat ) | eric | 2014-06-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | updated languages | iNPUTmice | 2014-06-09 | 1 | -5/+30 |
| |/ / | |||||
| * | | Merge pull request #186 from kruks23/development | Daniel Gultsch | 2014-06-09 | 1 | -16/+23 |
| |\ \ | | | | | | | Update Spanish Translations | ||||
| | * | | Update Spanish Translations | kruks23 | 2014-06-09 | 1 | -16/+23 |
| |/ / | |||||
| * | | fixing #184 | iNPUTmice | 2014-06-07 | 1 | -0/+1 |
| | | | |||||
| * | | removed unnecessary variable in message class | iNPUTmice | 2014-06-07 | 3 | -5/+0 |
| | | | |||||
| * | | localized date. rounded minutes, hours and dates in last seen | iNPUTmice | 2014-06-07 | 4 | -14/+24 |
| | | | |||||
| * | | possible fix to be able to images and encrypted messages at a faster rate | iNPUTmice | 2014-06-07 | 7 | -121/+147 |
| | | | |||||
| * | | do not just simply resend images | iNPUTmice | 2014-06-06 | 1 | -20/+24 |
| | | | |||||
| * | | fixed last_seen_now | iNPUTmice | 2014-06-06 | 2 | -2/+2 |
| | | | |||||
| * | | removed presence from last seen | iNPUTmice | 2014-06-06 | 4 | -14/+14 |
| | | | |||||
| * | | put xep333 parsing into parser class | Daniel Gultsch | 2014-06-06 | 4 | -30/+31 |
| | | | |||||
| * | | refactored presence parsing into dedicated class | Daniel Gultsch | 2014-06-06 | 4 | -138/+178 |
| | | | |||||
| * | | Merge branch 'kruks23-development' into development | iNPUTmice | 2014-06-06 | 1 | -2/+3 |
| |\ \ | |||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |