Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-05-31 | 4 | -13/+24 |
|\ | |||||
| * | 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 |
| | | |||||
| * | More harcoded translations + updated Spanish | kruks23 | 2014-05-29 | 2 | -13/+13 |
| | | |||||
* | | 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 |
| | |||||
* | possible fix for #149 and #142 | iNPUTmice | 2014-05-28 | 1 | -1/+1 |
| | |||||
* | error msg on offline subscription changes | Daniel Gultsch | 2014-05-24 | 1 | -12/+29 |
| | |||||
* | Merge pull request #146 from kruks23/development | Daniel Gultsch | 2014-05-24 | 2 | -7/+7 |
|\ | | | | | More harcoded translations + Spanish | ||||
| * | More harcoded translations + Spanish | kruks23 | 2014-05-24 | 2 | -7/+7 |
| | | |||||
* | | Merge pull request #140 from strb/mucicons | Daniel Gultsch | 2014-05-24 | 1 | -108/+41 |
|\ \ | |/ |/| | Refactored unknown contact picture generation | ||||
| * | Refactored unknown contact picture generation | Andreas Straub | 2014-05-21 | 1 | -108/+41 |
| | | | | | | | | Introduce drawTile method in order to remove code duplication | ||||
* | | Title activities translations + contacts translations + update Spanish ↵ | kruks23 | 2014-05-23 | 2 | -11/+11 |
| | | | | | | | | Translations | ||||
* | | end otr sessions earlier / more often. can lead to unesessary handshakes but ↵ | Daniel Gultsch | 2014-05-23 | 3 | -17/+32 |
| | | | | | | | | can improve reliabilty | ||||
* | | fixed possible npe | Daniel Gultsch | 2014-05-23 | 1 | -0/+6 |
| | | |||||
* | | code cleanup | Daniel Gultsch | 2014-05-23 | 2 | -10/+0 |
| | | |||||
* | | Contact details translations + update spanish translations | kruks23 | 2014-05-22 | 1 | -18/+18 |
| | | |||||
* | | 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 | 4 | -132/+197 |
| | | |||||
* | | Merge branch 'development' of github.com:siacs/Conversations into development | Daniel Gultsch | 2014-05-21 | 1 | -2/+17 |
|\| | |||||
| * | Fix highlight detection in MUC channels | Andreas Straub | 2014-05-21 | 1 | -2/+17 |
| | | | | | | | | | | | | We only detect highlights if a word starts with the nick (matched in case insensitive manner), followed by optional punctuation, followed by another word boundary. | ||||
* | | 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 |
| | |||||
* | auto retry image compression with decreasing sample size | Daniel Gultsch | 2014-05-21 | 1 | -17/+15 |
| | |||||
* | close input stream | Daniel Gultsch | 2014-05-20 | 1 | -0/+1 |
| | |||||
* | trying to deal with larger images | Daniel Gultsch | 2014-05-20 | 1 | -4/+17 |
| | |||||
* | Update Spanish Translations + harcoded just_now | kruks23 | 2014-05-20 | 3 | -8/+8 |
| | |||||
* | highlight people in conferences by clicken on their picture | Daniel Gultsch | 2014-05-20 | 1 | -14/+27 |
| | |||||
* | fixed ping time out after session resume | Daniel Gultsch | 2014-05-20 | 1 | -0/+1 |
| | |||||
* | ported pending subscription support to new roster mgmt | Daniel Gultsch | 2014-05-20 | 3 | -28/+5 |
| | |||||
* | made roster persistant aka enabled versioning again | Daniel Gultsch | 2014-05-19 | 3 | -41/+30 |
| | |||||
* | some code cleanup to deal with the roster mgmt changes from earlier | Daniel Gultsch | 2014-05-19 | 3 | -77/+54 |
| | |||||
* | reworked roster/contact handling. might break some stuff. not sycing to disk yet | Daniel Gultsch | 2014-05-19 | 15 | -560/+332 |
| | |||||
* | bind and session request more compatible | Daniel Gultsch | 2014-05-18 | 3 | -4/+19 |
| | |||||
* | fixed #123 fixed122 | Daniel Gultsch | 2014-05-18 | 3 | -31/+11 |
| | |||||
* | cleaned up edit account dialog a little | Daniel Gultsch | 2014-05-18 | 1 | -20/+13 |
| | |||||
* | fixed #53 aka server not found bug | Daniel Gultsch | 2014-05-18 | 3 | -27/+39 |
| | |||||
* | sending session after unsucesfull session resume. fixed #116 | Daniel Gultsch | 2014-05-17 | 1 | -7/+8 |
| | |||||
* | added record audio button | Daniel Gultsch | 2014-05-17 | 1 | -0/+8 |
| | |||||
* | made sending session more compliant | Daniel Gultsch | 2014-05-17 | 1 | -2/+2 |
| | |||||
* | receiving pgp images important bug fix | Daniel Gultsch | 2014-05-17 | 1 | -1/+1 |
| | |||||
* | Update Validator.java | the-username | 2014-05-17 | 1 | -1/+1 |
| | |||||
* | fixed #108 | Daniel Gultsch | 2014-05-17 | 1 | -3/+4 |
| | |||||
* | permanent notification disapears now when account is being deleted + code ↵ | Daniel Gultsch | 2014-05-17 | 3 | -16/+9 |
| | | | | clean up | ||||
* | fixed #113 | Daniel Gultsch | 2014-05-17 | 1 | -2/+1 |
| | |||||
* | reworked message to conferences | Daniel Gultsch | 2014-05-16 | 2 | -16/+19 |
| |