| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'development' into feature/take_picture | Daniel Gultsch | 2014-05-13 | 1 | -71/+116 |
| |\ | |||||
| | * | Fix | Beriain | 2014-05-13 | 1 | -79/+79 |
| | | | |||||
| | * | Merge https://github.com/siacs/Conversations into development | Beriain | 2014-05-13 | 10 | -18/+364 |
| | |\ | |||||
| | * | | Update basque translation and include preferences | Beriain | 2014-05-13 | 1 | -0/+8 |
| | | | | |||||
| | * | | Update basque translation | Beriain | 2014-05-12 | 1 | -0/+34 |
| | | | | |||||
| | * | | Merge https://github.com/siacs/Conversations into development | Beriain | 2014-05-12 | 6 | -60/+111 |
| | |\ \ | |||||
| | * | | | Update basque translation | Beriain | 2014-05-08 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | submenu for attach file | Daniel Gultsch | 2014-05-13 | 2 | -0/+13 |
| | |_|/ |/| | | |||||
| * | | | german translation | Daniel Gultsch | 2014-05-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | further translations | Daniel Gultsch | 2014-05-13 | 4 | -15/+65 |
| | | | | |||||
| * | | | fixed french language | Daniel Gultsch | 2014-05-13 | 1 | -13/+13 |
| | | | | |||||
| * | | | Merge pull request #88 from BenoitBouvarel/development | Daniel Gultsch | 2014-05-12 | 3 | -0/+127 |
| |\ \ \ | | | | | | | | | Translation into French | ||||
| | * | | | Traduction Francaise | Benoit Bouvarel | 2014-05-07 | 3 | -0/+127 |
| | | | | | |||||
| * | | | | Merge pull request #101 from kruks23/development | Daniel Gultsch | 2014-05-12 | 1 | -0/+28 |
| |\ \ \ \ | | | | | | | | | | | Preferences Spanish Translations | ||||
| | * | | | | Preferences Spanish Translations | kruks23 | 2014-05-12 | 1 | -0/+28 |
| | | |_|/ | |/| | | |||||
| * | | | | Fix a typo in catalan translation | alvar | 2014-05-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Translation into catalan language | alvar | 2014-05-12 | 2 | -0/+141 |
| | | | | | |||||
| * | | | | fixed parsing error on missing %s | Daniel Gultsch | 2014-05-12 | 1 | -2/+2 |
| |/ / / | |||||
| * | | | Better error handling if attach file doesnt work (on permission denied)0.2-beta | Daniel Gultsch | 2014-05-12 | 1 | -0/+5 |
| | | | | | | | | | | and unified encrypted and unencrypted file attachment | ||||
| * | | | transfered preferences descritpions into strings.xml | iNPUTmice | 2014-05-11 | 2 | -22/+45 |
| | | | | |||||
| * | | | Delete styles.xml | kruks23 | 2014-05-10 | 1 | -19/+0 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'origin/development' into development | kruks23 | 2014-05-10 | 1 | -0/+19 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: res/values-es/arrays.xml res/values-es/strings.xml | ||||
| | * | | | #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 |
| | | | | | |||||
| * | | | | added dialog for otr file transfer0.2-alpha | Daniel Gultsch | 2014-05-09 | 2 | -2/+5 |
| | | | | | |||||
| * | | | | nicer descriptions in notificaton for images and encrypted messages | Daniel Gultsch | 2014-05-09 | 1 | -1/+4 |
| | | | | | |||||
| * | | | | Improve OTR fingerprint dialog and fix german sentence | Dominik Schürmann | 2014-05-08 | 2 | -2/+10 |
| | |_|/ |/| | | |||||
| * | | | more informative dialog if contact doesn't announce public key | Daniel Gultsch | 2014-05-08 | 1 | -0/+2 |
| | | | | |||||
| * | | | code cleanup | Daniel Gultsch | 2014-05-08 | 1 | -0/+1 |
| | |/ |/| | |||||
| * | | fixed #70 #65 | Daniel Gultsch | 2014-05-07 | 1 | -1/+1 |
| | | | |||||
| * | | basic german translation | Daniel Gultsch | 2014-05-06 | 2 | -0/+108 |
| | | | |||||
| * | | Merge https://github.com/siacs/Conversations into development | Beriain | 2014-05-06 | 7 | -75/+10 |
| |\| | |||||
| | * | 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 | 1 | -1/+1 |
| | | | |||||
| * | | Update basque and spanish translations | Beriain | 2014-05-06 | 6 | -90/+2 |
| | | | |||||
| * | | Add Basque and Spanish translations | Mikel | 2014-05-02 | 8 | -0/+304 |
| |/ | |||||
| * | nicer dialog screen if openkeychain is not installed | Daniel Gultsch | 2014-05-02 | 1 | -0/+4 |
| | | |||||
| * | reworked openpgp integration part #1 | Daniel Gultsch | 2014-05-01 | 1 | -0/+1 |
| | | |||||
| * | unified presence selection for otr and file transfer | Daniel Gultsch | 2014-04-26 | 1 | -0/+10 |
| | | |||||
| * | couple of more optimazations on image loading | Daniel Gultsch | 2014-04-25 | 3 | -2/+5 |
| | | |||||
| * | smoother scrolling (first step) | Daniel Gultsch | 2014-04-25 | 3 | -5/+20 |
| | | |||||
| * | allow images to be opened with gallary app | Daniel Gultsch | 2014-04-21 | 2 | -2/+11 |
| | | |||||
| * | put more string into strings.xml | Daniel Gultsch | 2014-04-18 | 2 | -2/+8 |
| | | |||||
| * | added clear history dialog (no funcionality) | Daniel Gultsch | 2014-04-18 | 3 | -1/+28 |
| | | |||||
| * | made ui with sending images a little smoother | Daniel Gultsch | 2014-04-15 | 3 | -1/+5 |
| | | |||||
| * | Merge pull request #59 from jelmer/typo-preemptively | Daniel Gultsch | 2014-04-14 | 1 | -1/+1 |
| |\ | | | | | Fix typo: Preemptivly -> Preemptively. | ||||
| | * | Fix typo: Preemptivly -> Preemptively. | Jelmer Vernooij | 2014-04-14 | 1 | -1/+1 |
| | | | |||||
| * | | Fix two typos: assoziated -> associated. | Jelmer Vernooij | 2014-04-14 | 1 | -1/+1 |
| | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |