Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | deny files with unknown file types | Daniel Gultsch | 2014-04-23 | 4 | -21/+76 |
* | added download button for images not accepted automatically | Daniel Gultsch | 2014-04-22 | 5 | -16/+78 |
* | added support for ibb | Daniel Gultsch | 2014-04-22 | 7 | -23/+313 |
* | code cleanup | Daniel Gultsch | 2014-04-21 | 2 | -28/+16 |
* | allow images to be opened with gallary app | Daniel Gultsch | 2014-04-21 | 7 | -5/+161 |
* | added missing transport id | Daniel Gultsch | 2014-04-21 | 1 | -0/+1 |
* | added proxy activate and a lot of code clean up. totatly untested | Daniel Gultsch | 2014-04-20 | 5 | -145/+161 |
* | made our spanish friends happy. fixed #68 | Daniel Gultsch | 2014-04-20 | 1 | -21/+22 |
* | fixed #50 | Daniel Gultsch | 2014-04-20 | 3 | -14/+32 |
* | more jingle bug fixes | Daniel Gultsch | 2014-04-19 | 3 | -12/+10 |
* | fixed replace contact in conversation | Daniel Gultsch | 2014-04-19 | 1 | -15/+15 |
* | made debugging verbose again on specific parts | Daniel Gultsch | 2014-04-19 | 2 | -4/+10 |
* | fixed default autoaccept file size and wrongly marked message | Daniel Gultsch | 2014-04-19 | 2 | -3/+3 |
* | cleaned up debug log a little bit | Daniel Gultsch | 2014-04-19 | 7 | -91/+118 |
* | fixed concurrent modification of contacts which led to missing presences | Daniel Gultsch | 2014-04-18 | 2 | -10/+15 |
* | tried to avoid some more race conditions in jingle | Daniel Gultsch | 2014-04-18 | 3 | -38/+80 |
* | updated minidns | Daniel Gultsch | 2014-04-18 | 1 | -5/+5 |
* | Merge branch 'master' into development | Daniel Gultsch | 2014-04-18 | 1 | -21/+25 |
|\ | |||||
| * | work around for bug in xmlpullparser | Daniel Gultsch | 2014-04-18 | 1 | -21/+25 |
* | | lot of cleanup in jingle part | Daniel Gultsch | 2014-04-18 | 6 | -120/+326 |
* | | put more string into strings.xml | Daniel Gultsch | 2014-04-18 | 4 | -11/+17 |
* | | fixed destination bug | Daniel Gultsch | 2014-04-18 | 3 | -5/+15 |