| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Merge remote-tracking branch 'origin/development' into development | kruks23 | 2014-05-10 | 1 | -0/+19 | |
| | |\ \ \ | ||||||
| | | * | | | #79 First translation into spanish. | kruks23 | 2014-05-06 | 3 | -0/+127 | |
| | * | | | | Translation into spanish. | kruks23 | 2014-05-10 | 2 | -52/+42 | |
| | * | | | | #79 First translation into spanish. | kruks23 | 2014-05-10 | 1 | -0/+19 | |
| * | | | | | fixed possible npe and possible exception | iNPUTmice | 2014-05-10 | 1 | -2/+9 | |
| |/ / / / | ||||||
| * | | | | added dialog for otr file transfer | Daniel Gultsch | 2014-05-09 | 3 | -3/+30 | |
| * | | | | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2014-05-09 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge pull request #91 from the-solipsist/patch-1 | Daniel Gultsch | 2014-05-09 | 1 | -1/+1 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Corrected spelling of "formerly" in README.me | the-solipsist | 2014-05-09 | 1 | -1/+1 | |
| * | | | | | | version 0.2 alpha and changelog | Daniel Gultsch | 2014-05-09 | 2 | -2/+8 | |
| |/ / / / / | ||||||
| * | | | | | link to openkeychain from contact details | Daniel Gultsch | 2014-05-09 | 2 | -9/+33 | |
| * | | | | | nicer descriptions in notificaton for images and encrypted messages | Daniel Gultsch | 2014-05-09 | 5 | -7/+37 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #89 from dschuermann/fix-otr-message | Daniel Gultsch | 2014-05-08 | 3 | -2/+13 | |
| |\ \ \ \ | ||||||
| | * | | | | Improve OTR fingerprint dialog and fix german sentence | Dominik Schürmann | 2014-05-08 | 3 | -2/+13 | |
| | * | | | | Merge pull request #2 from siacs/development | Dominik Schürmann | 2014-05-08 | 5 | -111/+137 | |
| | |\ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | | sending text message after returing from pending intent | Daniel Gultsch | 2014-05-08 | 3 | -80/+90 | |
| * | | | | | better flow after returning from openkeychain for various actions | Daniel Gultsch | 2014-05-08 | 3 | -31/+47 | |
| | |_|_|/ |/| | | | ||||||
| | * | | | Merge pull request #1 from siacs/development | Dominik Schürmann | 2014-05-08 | 8 | -231/+282 | |
| | |\ \ \ | |/ / / |/| | | | ||||||
| * | | | | offer to announce pgp key if pgp encryption is selected from menu | Daniel Gultsch | 2014-05-08 | 3 | -42/+50 | |
| * | | | | more informative dialog if contact doesn't announce public key | Daniel Gultsch | 2014-05-08 | 3 | -36/+57 | |
| * | | | | code cleanup | Daniel Gultsch | 2014-05-08 | 6 | -164/+171 | |
| * | | | | fixed download button on pgp images | Daniel Gultsch | 2014-05-08 | 1 | -4/+19 | |
| * | | | | Merge pull request #87 from dschuermann/development | Daniel Gultsch | 2014-05-07 | 4 | -4/+10 | |
| |\| | | | ||||||
| | * | | | Use git submodule with openpgp-api-lib only | Dominik Schürmann | 2014-05-07 | 4 | -4/+10 | |
| |/ / / | ||||||
| * | / | updated readme | Daniel Gultsch | 2014-05-07 | 1 | -1/+13 | |
| | |/ |/| | ||||||
| * | | fixed #70 #65 | Daniel Gultsch | 2014-05-07 | 1 | -1/+1 | |
| * | | improved next encryption selection | Daniel Gultsch | 2014-05-07 | 2 | -3/+4 | |
| * | | remembering text. awesome | Daniel Gultsch | 2014-05-07 | 2 | -214/+227 | |
| * | | correct status after error iq | Daniel Gultsch | 2014-05-07 | 1 | -1/+3 | |
| * | | wee bit of code cleanup | Daniel Gultsch | 2014-05-07 | 5 | -77/+104 | |
| * | | basic german translation | Daniel Gultsch | 2014-05-06 | 2 | -0/+108 | |
| * | | Merge pull request #80 from beriain/development | Daniel Gultsch | 2014-05-06 | 4 | -0/+216 | |
| |\ \ | ||||||
| | * | | Merge https://github.com/siacs/Conversations into development | Beriain | 2014-05-06 | 11 | -90/+55 | |
| | |\| | ||||||
| | * | | Update basque and spanish translations | Beriain | 2014-05-06 | 6 | -90/+2 | |
| | * | | Add Basque and Spanish translations | Mikel | 2014-05-02 | 8 | -0/+304 | |
| * | | | basic pgp encrypted file transfer | Daniel Gultsch | 2014-05-06 | 7 | -92/+253 | |
| | |/ |/| | ||||||
| * | | content name and creator are properly set | Daniel Gultsch | 2014-05-03 | 2 | -9/+13 | |
| * | | properly reply to iq requests. reply to disco | Daniel Gultsch | 2014-05-03 | 2 | -1/+19 | |
| * | | allow roster pushes only from bare jid or null | Daniel Gultsch | 2014-05-03 | 1 | -4/+6 | |
| * | | more cleanup in res files | Daniel Gultsch | 2014-05-03 | 2 | -34/+9 | |
| * | | removed unnecessary files | Daniel Gultsch | 2014-05-03 | 4 | -40/+0 | |
| * | | added restart button to openkeychain dialog | Daniel Gultsch | 2014-05-03 | 3 | -3/+9 | |
| |/ | ||||||
| * | nicer dialog screen if openkeychain is not installed | Daniel Gultsch | 2014-05-02 | 3 | -3/+28 | |
| * | reworked openpgp integration part #1 | Daniel Gultsch | 2014-05-01 | 11 | -268/+444 | |
| * | bug fix for jingle | Daniel Gultsch | 2014-04-26 | 1 | -1/+1 | |
| * | unified presence selection for otr and file transfer | Daniel Gultsch | 2014-04-26 | 4 | -74/+100 | |
| * | fixed #75 | Daniel Gultsch | 2014-04-25 | 2 | -2/+3 | |
| * | setting backround color if image comes directly from cache | Daniel Gultsch | 2014-04-25 | 1 | -0/+1 | |
| * | couple of more optimazations on image loading | Daniel Gultsch | 2014-04-25 | 7 | -64/+43 | |
| * | smoother scrolling (first step) | Daniel Gultsch | 2014-04-25 | 9 | -62/+243 | |
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |