| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 |
| | | | |||||
| * | | 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 |
| |/ / | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |