aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'feature/mam' into developmentiNPUTmice2014-12-1317-75/+535
|\ \
| * | various mam improvmentsiNPUTmice2014-12-136-39/+130
| * | mark otr messages as no-store for mamiNPUTmice2014-12-101-0/+1
| * | changed lastMessageReceived into lastMessageTransmitted to account for sent m...iNPUTmice2014-12-104-22/+31
| * | save server id from mam messages. check for dups before adding mamiNPUTmice2014-12-103-5/+40
| * | added max history age (default 1w). automatically sort newly added mam messagesiNPUTmice2014-12-109-42/+103
| * | very basic mam supportiNPUTmice2014-12-109-8/+277
| * | store last message received date in conversationiNPUTmice2014-12-105-54/+48
| |/
* / refactored phone contacts mergeriNPUTmice2014-12-131-33/+38
|/
* removed unnecessary otr error responseiNPUTmice2014-12-102-12/+0
* recreate activity after theme has changed. fixed #764iNPUTmice2014-12-092-3/+20
* Merge pull request #767 from kruks23/translation3Daniel Gultsch2014-12-091-6/+6
|\
| * Update spanish translations.kruks232014-12-091-6/+6
* | cleanup: removed unused emoticon parsingiNPUTmice2014-12-094-53/+2
* | cleanup: removed stream compressioniNPUTmice2014-12-093-205/+0
* | version bump to 0.9.30.9.3iNPUTmice2014-12-071-1/+1
* | possible work around for some weird - possibly sdk - bugsiNPUTmice2014-12-071-4/+5
|/
* fixed digest-md5iNPUTmice2014-12-041-0/+4
* close cursors after querying phone dbiNPUTmice2014-12-031-0/+2
* fixed #651iNPUTmice2014-12-032-0/+20
* more safety checks for listener countsiNPUTmice2014-12-031-88/+29
* fixed #544iNPUTmice2014-12-031-1/+51
* version bump to 0.9.20.9.2iNPUTmice2014-12-031-1/+1
* display proper error in edit account details if jid is invalidiNPUTmice2014-12-031-8/+9
* further npe checksiNPUTmice2014-12-032-6/+13
* refactored the message adapter a bitiNPUTmice2014-12-031-32/+33
* set nick and autojoin=true for new bookmarksiNPUTmice2014-12-031-0/+4
* made muc parser more compatible with legacy mucs?! (whatever that is exactly)iNPUTmice2014-12-031-3/+1
* Make sure SASL tokenizer strips stringsSam Whited2014-12-022-1/+5
* worked around concurrent modification exceptioniNPUTmice2014-12-031-11/+11
* fixed another npe in hasBookmarkiNPUTmice2014-12-031-2/+3
* Merge pull request #740 from SamWhited/jidrpfixDaniel Gultsch2014-12-031-163/+165
|\
| * Allow JIDs such as "example.net/@"Sam Whited2014-12-021-3/+2
| * "example.net/@/" should be a valid JID.Sam Whited2014-12-021-164/+166
| * Fix RFC 6122 implementationSam Whited2014-12-021-4/+5
* | Merge pull request #743 from weiss/update-german-translationsDaniel Gultsch2014-12-031-2/+4
|\ \
| * | Update/improve German translationsHolger Weiß2014-12-021-2/+4
| |/
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-032-32/+108
|\|
| * Merge pull request #737 from kruks23/translation2Daniel Gultsch2014-12-021-9/+11
| |\
| | * Update spanish translationskruks232014-12-011-9/+11
| * | Merge pull request #730 from svetlemodry/developmentDaniel Gultsch2014-12-021-23/+97
| |\ \ | | |/ | |/|
| | * pref_about_message string deletedJaroslav Lichtblau2014-12-011-24/+0
| | * Updated Czech translation fileJaroslav Lichtblau2014-12-011-23/+121
* | | safety net in joinMuciNPUTmice2014-12-031-4/+6
* | | clean up getProposedNickiNPUTmice2014-12-031-6/+5
* | | fixed potential npes in message parseriNPUTmice2014-12-031-2/+7
* | | cleaned up avatar / tile creationiNPUTmice2014-12-032-20/+9
|/ /
* | fixed #728iNPUTmice2014-12-011-5/+2
* | bumped cap version as well0.9.1iNPUTmice2014-12-011-1/+1
* | clear encrypted messages on reinitiNPUTmice2014-12-011-2/+13