Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | added max history age (default 1w). automatically sort newly added mam messages | iNPUTmice | 2014-12-10 | 9 | -42/+103 |
| | |||||
* | very basic mam support | iNPUTmice | 2014-12-10 | 9 | -8/+277 |
| | |||||
* | store last message received date in conversation | iNPUTmice | 2014-12-10 | 5 | -54/+48 |
| | |||||
* | removed unnecessary otr error response | iNPUTmice | 2014-12-10 | 2 | -12/+0 |
| | |||||
* | recreate activity after theme has changed. fixed #764 | iNPUTmice | 2014-12-09 | 2 | -3/+20 |
| | |||||
* | Merge pull request #767 from kruks23/translation3 | Daniel Gultsch | 2014-12-09 | 1 | -6/+6 |
|\ | | | | | Update spanish translations. | ||||
| * | Update spanish translations. | kruks23 | 2014-12-09 | 1 | -6/+6 |
| | | |||||
* | | Merge pull request #768 from betheg/as | Daniel Gultsch | 2014-12-09 | 1 | -1/+3 |
|\ \ | | | | | | | gradle: fix Cannot set property outputFile on null object. | ||||
| * | | gradle: fix Cannot set property outputFile on null object. | Michael | 2014-12-09 | 1 | -1/+3 |
|/ / | |||||
* | | Merge pull request #710 from betheg/as | Daniel Gultsch | 2014-12-09 | 3 | -17/+15 |
|\ \ | | | | | | | update android gradle plugin to 0.14.4 | ||||
| * | | update gradle to 2.2.1 and android gradle plugin to 1.0.0 | Michael | 2014-12-09 | 2 | -2/+2 |
| | | | |||||
| * | | update android gradle plugin to 1.0.0-rc4 | Michael | 2014-12-05 | 1 | -1/+1 |
| | | | |||||
| * | | update android gradle plugin to 0.14.4 | Michael | 2014-11-22 | 3 | -17/+15 |
| | | | | | | | | | | | | | | | to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2. | ||||
* | | | cleanup: removed unused emoticon parsing | iNPUTmice | 2014-12-09 | 4 | -53/+2 |
| | | | |||||
* | | | cleanup: removed stream compression | iNPUTmice | 2014-12-09 | 3 | -205/+0 |
| | | | |||||
* | | | version bump to 0.9.3 | iNPUTmice | 2014-12-07 | 3 | -3/+5 |
| | | | |||||
* | | | possible work around for some weird - possibly sdk - bugs | iNPUTmice | 2014-12-07 | 1 | -4/+5 |
| |/ |/| | |||||
* | | Merge pull request #752 from SamWhited/update-logo | Daniel Gultsch | 2014-12-04 | 1 | -0/+0 |
|\ \ | | | | | | | Update logo in art folder | ||||
| * | | Update logo in art folder | Sam Whited | 2014-12-04 | 1 | -0/+0 |
|/ / | |||||
* | | fixed digest-md5 | iNPUTmice | 2014-12-04 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-12-03 | 1 | -1/+1 |
|\ \ | | | | | | | | | | development | ||||
| * \ | Merge pull request #746 from SamWhited/development | Daniel Gultsch | 2014-12-03 | 1 | -1/+1 |
| |\ \ | | | | | | | | | Single character README fix waste of time pull request. | ||||
| | * | | Single character README fix waste of time pull request. | Sam Whited | 2014-12-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | close cursors after querying phone db | iNPUTmice | 2014-12-03 | 1 | -0/+2 |
|/ / / | |||||
* / / | fixed #651 | iNPUTmice | 2014-12-03 | 2 | -0/+20 |
|/ / | |||||
* | | more safety checks for listener counts | iNPUTmice | 2014-12-03 | 1 | -88/+29 |
| | | |||||
* | | updated readme | iNPUTmice | 2014-12-03 | 1 | -2/+2 |
| | | |||||
* | | fixed #544 | iNPUTmice | 2014-12-03 | 1 | -1/+51 |
| | | |||||
* | | version bump to 0.9.2 | iNPUTmice | 2014-12-03 | 3 | -3/+6 |
| | | |||||
* | | display proper error in edit account details if jid is invalid | iNPUTmice | 2014-12-03 | 1 | -8/+9 |
| | | |||||
* | | further npe checks | iNPUTmice | 2014-12-03 | 2 | -6/+13 |
| | | |||||
* | | refactored the message adapter a bit | iNPUTmice | 2014-12-03 | 1 | -32/+33 |
| | | |||||
* | | set nick and autojoin=true for new bookmarks | iNPUTmice | 2014-12-03 | 1 | -0/+4 |
| | | |||||
* | | made muc parser more compatible with legacy mucs?! (whatever that is exactly) | iNPUTmice | 2014-12-03 | 1 | -3/+1 |
| | | |||||
* | | Merge pull request #744 from SamWhited/development | Daniel Gultsch | 2014-12-03 | 2 | -1/+5 |
|\ \ | | | | | | | Fix DIGEST-MD5 auth | ||||
| * | | Make sure SASL tokenizer strips strings | Sam Whited | 2014-12-02 | 2 | -1/+5 |
|/ / | | | | | | | Fix DIGEST-MD5 auth (make sure we're not splitting on BASE64 `==') | ||||
* | | worked around concurrent modification exception | iNPUTmice | 2014-12-03 | 1 | -11/+11 |
| | | |||||
* | | fixed another npe in hasBookmark | iNPUTmice | 2014-12-03 | 1 | -2/+3 |
| | | |||||
* | | Merge pull request #740 from SamWhited/jidrpfix | Daniel Gultsch | 2014-12-03 | 1 | -163/+165 |
|\ \ | | | | | | | Fix RFC 6122 implementation | ||||
| * | | Allow JIDs such as "example.net/@" | Sam Whited | 2014-12-02 | 1 | -3/+2 |
| | | | |||||
| * | | "example.net/@/" should be a valid JID. | Sam Whited | 2014-12-02 | 1 | -164/+166 |
| | | | | | | | | | | | | Retab JID file | ||||
| * | | Fix RFC 6122 implementation | Sam Whited | 2014-12-02 | 1 | -4/+5 |
| | | | | | | | | | | | | JID resourceparts should be able to contain "@" and "/" characters | ||||
* | | | Merge pull request #743 from weiss/update-german-translations | Daniel Gultsch | 2014-12-03 | 1 | -2/+4 |
|\ \ \ | | | | | | | | | Update/improve German translations | ||||
| * | | | Update/improve German translations | Holger Weiß | 2014-12-02 | 1 | -2/+4 |
| |/ / | |||||
* | | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-12-03 | 3 | -32/+109 |
|\| | | | | | | | | | | | development | ||||
| * | | Merge pull request #737 from kruks23/translation2 | Daniel Gultsch | 2014-12-02 | 1 | -9/+11 |
| |\ \ | | | | | | | | | Update spanish translations | ||||
| | * | | Update spanish translations | kruks23 | 2014-12-01 | 1 | -9/+11 |
| | | | | |||||
| * | | | Merge pull request #730 from svetlemodry/development | Daniel Gultsch | 2014-12-02 | 2 | -23/+98 |
| |\ \ \ | | |/ / | |/| | | Updated Czech translation file | ||||
| | * | | pref_about_message string deleted | Jaroslav Lichtblau | 2014-12-01 | 1 | -24/+0 |
| | | | | |||||
| | * | | Added Czech translator name | Jaroslav Lichtblau | 2014-12-01 | 1 | -0/+1 |
| | | | |