| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-05-31 | 14 | -69/+113 | |
| |\ \ | ||||||
| | * \ | Merge pull request #164 from alethea/development | Daniel Gultsch | 2014-05-31 | 3 | -0/+11 | |
| | |\ \ | ||||||
| | | * | | Up button goes to contacts after initial setup | Alethea Butler | 2014-05-30 | 1 | -0/+6 | |
| | | * | | Disabled the Home button when it's not the Up button | Alethea Butler | 2014-05-30 | 3 | -0/+5 | |
| | * | | | Merge pull request #165 from alethea/openpgp-capitalization | Daniel Gultsch | 2014-05-31 | 7 | -39/+39 | |
| | |\ \ \ | | |/ / | |/| | | ||||||
| | | * | | Capitalized openPGP -> OpenPGP | Alethea Butler | 2014-05-31 | 7 | -39/+39 | |
| | |/ / | ||||||
| | * | | Merge pull request #153 from 9034725985/patch-1 | Daniel Gultsch | 2014-05-30 | 1 | -1/+1 | |
| | |\ \ | ||||||
| | | * | | Update README.md | Kushal | 2014-05-26 | 1 | -1/+1 | |
| | * | | | Merge pull request #160 from alethea/development | Daniel Gultsch | 2014-05-30 | 1 | -2/+2 | |
| | |\ \ \ | ||||||
| | | * | | | 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 | |
| | * | | | | Merge pull request #157 from kruks23/development | Daniel Gultsch | 2014-05-30 | 6 | -27/+60 | |
| | |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | | * | | | More harcoded translations + updated Spanish | kruks23 | 2014-05-29 | 6 | -27/+60 | |
| | |/ / / | ||||||
| * / / / | fixed regression that led to the wakelock not being released again | iNPUTmice | 2014-05-31 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | display pgp key id in muc details and use keys to encrypt groupchat | Daniel Gultsch | 2014-05-28 | 3 | -4/+29 | |
| * | | | encrypted group messages are now properly decrypted | Daniel Gultsch | 2014-05-28 | 2 | -7/+11 | |
| * | | | first tries on crypto muc | Daniel Gultsch | 2014-05-28 | 6 | -41/+80 | |
| * | | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-05-28 | 2 | -4/+50 | |
| |\| | | ||||||
| | * | | Merge pull request #147 from kruks23/development | Daniel Gultsch | 2014-05-26 | 1 | -2/+2 | |
| | |\ \ | ||||||
| | | * | | 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 strings.xml | Aitor Beriain | 2014-05-26 | 1 | -13/+13 | |
| | | * | | Update strings.xml | Aitor Beriain | 2014-05-26 | 1 | -2/+48 | |
| * | | | | possible fix for #149 and #142 | iNPUTmice | 2014-05-28 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | / | fixed #151 | iNPUTmice | 2014-05-26 | 5 | -2/+126 | |
| | |/ |/| | ||||||
| * | | error msg on offline subscription changes | Daniel Gultsch | 2014-05-24 | 2 | -12/+30 | |
| * | | Merge pull request #146 from kruks23/development | Daniel Gultsch | 2014-05-24 | 7 | -24/+54 | |
| |\ \ | ||||||
| | * | | More harcoded translations + Spanish | kruks23 | 2014-05-24 | 7 | -24/+54 | |
| * | | | Merge pull request #140 from strb/mucicons | Daniel Gultsch | 2014-05-24 | 1 | -108/+41 | |
| |\ \ \ | ||||||
| | * | | | Refactored unknown contact picture generation | Andreas Straub | 2014-05-21 | 1 | -108/+41 | |
| * | | | | Merge pull request #145 from kruks23/development | Daniel Gultsch | 2014-05-23 | 5 | -19/+47 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | Title activities translations + contacts translations + update Spanish Transl... | kruks23 | 2014-05-23 | 5 | -19/+47 | |
| |/ / / | ||||||
| * | | | end otr sessions earlier / more often. can lead to unesessary handshakes but ... | Daniel Gultsch | 2014-05-23 | 3 | -17/+32 | |
| * | | | fixed possible npe | Daniel Gultsch | 2014-05-23 | 1 | -0/+6 | |
| * | | | code cleanup | Daniel Gultsch | 2014-05-23 | 2 | -10/+0 | |
| * | | | updated readme | Daniel Gultsch | 2014-05-23 | 1 | -1/+1 | |
| * | | | Merge pull request #143 from nachovfranco/mycommits | Daniel Gultsch | 2014-05-23 | 2 | -0/+195 | |
| |\ \ \ | ||||||
| | * | | | Galician translation | nachovfranco | 2014-05-22 | 2 | -0/+195 | |
| * | | | | Merge pull request #144 from kruks23/development | Daniel Gultsch | 2014-05-23 | 3 | -19/+46 | |
| |\ \ \ \ | ||||||
| | * | | | | Contact details translations + update spanish translations | kruks23 | 2014-05-22 | 3 | -19/+46 | |
| |/ / / / | ||||||
| * | | | | offline crud of contacts | Daniel Gultsch | 2014-05-22 | 5 | -17/+48 | |
| * | | | | implementet missing methods on the new roster mgmt | Daniel Gultsch | 2014-05-22 | 2 | -3/+17 | |
| |/ / / | ||||||
| * | | | fixed #136 | Daniel Gultsch | 2014-05-22 | 2 | -24/+36 | |
| * | | | write contacts on system shutdown | Daniel Gultsch | 2014-05-21 | 5 | -132/+198 | |
| * | | | added missing strings | Daniel Gultsch | 2014-05-21 | 1 | -1/+1 | |
| * | | | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2014-05-21 | 1 | -2/+17 | |
| |\| | | ||||||
| | * | | Merge pull request #138 from strb/highlight | Daniel Gultsch | 2014-05-21 | 1 | -2/+17 | |
| | |\ \ | ||||||
| | | * | | Fix highlight detection in MUC channels | Andreas Straub | 2014-05-21 | 1 | -2/+17 | |
| | |/ / | ||||||
| * / / | further improvment trying to deal with large images | Daniel Gultsch | 2014-05-21 | 1 | -1/+6 | |
| |/ / | ||||||
| * | | cleaned up shared text | Daniel Gultsch | 2014-05-21 | 6 | -26/+41 | |
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |