| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update spanish mins ago | kruks23 | 2014-06-24 | 1 | -2/+2 |
| | | |||||
| * | added rendering script for artwork | iNPUTmice | 2014-06-24 | 10 | -0/+0 |
| | | |||||
| * | new logo | iNPUTmice | 2014-06-23 | 11 | -0/+0 |
| | | |||||
| * | removed duplicate entries | iNPUTmice | 2014-06-21 | 1 | -4/+0 |
| | | |||||
| * | 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 |
| | | | |||||
| * | | Rounded minutes ago and last seen + Update Spanish Translations | kruks23 | 2014-06-15 | 2 | -9/+16 |
| | | | |||||
| * | | moved last seen to contact details | iNPUTmice | 2014-06-13 | 3 | -26/+10 |
| | | | |||||
| * | | finished offline otr | iNPUTmice | 2014-06-12 | 1 | -3/+1 |
| | | | |||||
| * | | fixed scrolling issues | iNPUTmice | 2014-06-10 | 1 | -1/+1 |
| | | | |||||
| * | | don't display 'enter password' message if OpenKeychain is not installed. ↵ | iNPUTmice | 2014-06-09 | 3 | -1/+3 |
| | | | | | | | | | 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 |
| |/ / | |||||
| * | | Update Spanish Translations | kruks23 | 2014-06-09 | 1 | -16/+23 |
| | | | |||||
| * | | localized date. rounded minutes, hours and dates in last seen | iNPUTmice | 2014-06-07 | 3 | -2/+3 |
| | | | |||||
| * | | fixed last_seen_now | iNPUTmice | 2014-06-06 | 1 | -1/+1 |
| | | | |||||
| * | | removed presence from last seen | iNPUTmice | 2014-06-06 | 2 | -2/+5 |
| | | | |||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-06-06 | 1 | -3/+7 |
| |\ \ | |||||
| | * \ | Merge pull request #178 from kruks23/development | Daniel Gultsch | 2014-06-05 | 1 | -3/+7 |
| | |\ \ | | | | | | | | | Update Spanish Translations | ||||
| | | * | | Update Spanish Translations | kruks23 | 2014-06-05 | 1 | -3/+7 |
| | | | | | |||||
| * | | | | basic last seen feature. no peristancy just yet. no polish | iNPUTmice | 2014-06-06 | 3 | -85/+112 |
| |/ / / | |||||
| * / / | read marker is now a little less in your face | iNPUTmice | 2014-06-05 | 1 | -30/+3 |
| |/ / | |||||
| * | | experimental gui to display read status | iNPUTmice | 2014-06-04 | 1 | -0/+49 |
| | | | |||||
| * | | received and displayed messages (xep 333) are now marked properly | iNPUTmice | 2014-06-04 | 3 | -21/+7 |
| | | | |||||
| * | | answer to xep 184 message receipts. fixes #95 | iNPUTmice | 2014-06-03 | 3 | -2/+24 |
| | | | |||||
| * | | Fixed typo in source "sefl" -> "self" | Alethea Rose Butler | 2014-06-01 | 8 | -8/+8 |
| | | | |||||
| * | | unified crypto messages and made lock icon work for conferences | iNPUTmice | 2014-06-01 | 1 | -2/+1 |
| | | | |||||
| * | | added warning when public keys are missing | iNPUTmice | 2014-06-01 | 1 | -0/+1 |
| | | | |||||
| * | | show dialog when no contact in a muc has pgp support | iNPUTmice | 2014-06-01 | 1 | -0/+2 |
| | | | |||||
| * | | OpenPGP key display in muc details is now prettier and linked to openkeychain | iNPUTmice | 2014-06-01 | 1 | -0/+9 |
| | | | |||||
| * | | Capitalized openPGP -> OpenPGP | Alethea Butler | 2014-05-31 | 7 | -39/+39 |
| | | | |||||
| * | | Merge pull request #160 from alethea/development | Daniel Gultsch | 2014-05-30 | 1 | -2/+2 |
| |\ \ | | | | | | | Spelling and changed "unsuccessful delivery" to "delivery failed" | ||||
| | * | | Changed "unsuccessful delivery" to "delivery failed" | Alethea Butler | 2014-05-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | Added question mark to remove_contact_text | Alethea Butler | 2014-05-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | More harcoded translations + updated Spanish | kruks23 | 2014-05-29 | 4 | -14/+47 |
| |/ / | |||||
| * | | Merge pull request #147 from kruks23/development | Daniel Gultsch | 2014-05-26 | 1 | -2/+2 |
| |\ \ | | | | | | | Fix Contact Status width in contact details | ||||
| | * | | Fix Contact Status width in contact details | kruks23 | 2014-05-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #152 from beriain/development | Daniel Gultsch | 2014-05-26 | 1 | -2/+48 |
| |\ \ \ | | |/ | |/| | Update basque translation | ||||
| | * | | Update strings.xml | Aitor Beriain | 2014-05-26 | 1 | -13/+13 |
| | | | | | | | | | | Some strings were untranslated in the previous commit | ||||
| | * | | Update strings.xml | Aitor Beriain | 2014-05-26 | 1 | -2/+48 |
| | | | | |||||
| * | | | fixed #151 | iNPUTmice | 2014-05-26 | 5 | -2/+126 |
| | |/ |/| | |||||
| * | | error msg on offline subscription changes | Daniel Gultsch | 2014-05-24 | 1 | -0/+1 |
| | | | |||||
| * | | More harcoded translations + Spanish | kruks23 | 2014-05-24 | 5 | -17/+47 |
| | | | |||||
| * | | Title activities translations + contacts translations + update Spanish ↵ | kruks23 | 2014-05-23 | 2 | -2/+30 |
| | | | | | | | | | Translations | ||||
| * | | Merge pull request #143 from nachovfranco/mycommits | Daniel Gultsch | 2014-05-23 | 2 | -0/+195 |
| |\ \ | | | | | | | Galician translation | ||||
| | * | | Galician translation | nachovfranco | 2014-05-22 | 2 | -0/+195 |
| | | | | |||||
| * | | | Contact details translations + update spanish translations | kruks23 | 2014-05-22 | 2 | -1/+28 |
| |/ / | |||||
| * | | added missing strings | Daniel Gultsch | 2014-05-21 | 1 | -1/+1 |
| | | | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |