| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #131 from beriain/development | Daniel Gultsch | 2014-05-20 | 1 | -80/+121 |
| |\ | | | | | Update and fix basque translation | ||||
| | * | Update and fix basque translation | Beriain | 2014-05-20 | 1 | -80/+121 |
| | | | |||||
| * | | Update Spanish Translations + harcoded just_now | kruks23 | 2014-05-20 | 2 | -6/+10 |
| | | | |||||
| * | | Merge pull request #128 from kruks23/development | Daniel Gultsch | 2014-05-20 | 1 | -3/+8 |
| |\ \ | | | | | | | Update Spanish Translations | ||||
| | * | | Update Spanish Translations | kruks23 | 2014-05-18 | 1 | -3/+8 |
| | | | | |||||
| * | | | added search icon | Daniel Gultsch | 2014-05-20 | 4 | -0/+0 |
| | | | | |||||
| * | | | reworked roster/contact handling. might break some stuff. not sycing to disk yet | Daniel Gultsch | 2014-05-19 | 1 | -6/+0 |
| |/ / | |||||
| * | | bind and session request more compatible | Daniel Gultsch | 2014-05-18 | 1 | -1/+2 |
| | | | |||||
| * | | cleaned up edit account dialog a little | Daniel Gultsch | 2014-05-18 | 2 | -0/+8 |
| | | | |||||
| * | | added record audio button | Daniel Gultsch | 2014-05-17 | 3 | -1/+5 |
| | | | |||||
| * | | fixed #66 | Daniel Gultsch | 2014-05-17 | 2 | -4/+1 |
| | | | |||||
| * | | spelling | Daniel Gultsch | 2014-05-17 | 1 | -1/+1 |
| | | | |||||
| * | | Update Spanish Translations + harcoded pref_advanced_settings | kruks23 | 2014-05-16 | 2 | -1/+33 |
| | | | |||||
| * | | updated german translation | Daniel Gultsch | 2014-05-16 | 2 | -34/+71 |
| | | | |||||
| * | | formating | Daniel Gultsch | 2014-05-16 | 2 | -2/+2 |
| | | | |||||
| * | | French translation + hard-coded string > @string | Benoit Bouvarel | 2014-05-16 | 7 | -21/+128 |
| | | | |||||
| * | | Merge pull request #109 from kruks23/development | Daniel Gultsch | 2014-05-15 | 1 | -3/+14 |
| |\ \ | | | | | | | Update Spanish Translations | ||||
| | * | | Update Spanish Translations | kruks23 | 2014-05-14 | 1 | -3/+14 |
| | | | | |||||
| * | | | fixed #105 | Daniel Gultsch | 2014-05-14 | 1 | -0/+5 |
| |/ / | |||||
| * | | Merge branch 'development' into feature/take_picture | Daniel Gultsch | 2014-05-14 | 2 | -1/+2 |
| |\ \ | |||||
| | * | | one more entry to strings file | Daniel Gultsch | 2014-05-13 | 2 | -1/+2 |
| | |/ | |||||
| * | | 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 |
| | | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |