aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* some further otr improvementsDaniel Gultsch2015-01-023-3/+11
* click on dynamic tag to filter for that tagDaniel Gultsch2015-01-022-0/+34
* allow cancellation of waiting filesDaniel Gultsch2015-01-022-19/+23
* put Conversations into background mode earlierDaniel Gultsch2015-01-025-19/+44
* prefer PLAIN over DIGEST-MD5Daniel Gultsch2015-01-022-3/+3
* improved OTR verification part oneDaniel Gultsch2015-01-0210-164/+250
* improved fromServer filterDaniel Gultsch2014-12-301-1/+4
* refactor swithOverToTls stuffDaniel Gultsch2014-12-301-56/+45
* fixed npe in block menu itemDaniel Gultsch2014-12-301-1/+1
* fixed #818Daniel Gultsch2014-12-301-1/+1
* Fix typo in method nameSam Whited2014-12-295-9/+9
* code cleanup for change password stuffDaniel Gultsch2014-12-251-13/+20
* added callback to change account password to notify UI on success / failureDaniel Gultsch2014-12-253-27/+63
* Add ability to change password on serverSam Whited2014-12-257-85/+128
* proper call to invalidateViews()Daniel Gultsch2014-12-251-1/+1
* catch another exception in fingerprint generationDaniel Gultsch2014-12-251-1/+1
* Show server info option when blocking is unavailablepulser2014-12-241-2/+4
* Don't allow user to register domain only jidsSam Whited2014-12-231-0/+5
* Don't show menu on create account screenSam Whited2014-12-231-0/+3
* Remove old JID validatorSam Whited2014-12-233-105/+77
* Add more server compatibility info.Sam Whited2014-12-231-2/+36
* made method private that is no longer required to be publiciNPUTmice2014-12-231-1/+1
* Simplify roster handling codeSam Whited2014-12-223-121/+97
* Fix NPEs in blocking codeSam Whited2014-12-222-2/+4
* Add support for XEP-0191 (Blocking command)Sam Whited2014-12-2237-903/+1444
* get rid of special self presence object and incorporate that into rosteriNPUTmice2014-12-203-75/+46
* more null checks for otr fingerprintsiNPUTmice2014-12-201-1/+1
* don't include empty fingerprints in list of otrfingerprintsiNPUTmice2014-12-201-4/+6
* fixed another break continue bugiNPUTmice2014-12-201-3/+2
* inject ui callback into running mam queryiNPUTmice2014-12-203-4/+6
* fixed #755iNPUTmice2014-12-191-1/+1
* clean up conversation history after swtiching to a different conversationiNPUTmice2014-12-173-4/+12
* show error if jid couldn't be parsed in new contact dialogiNPUTmice2014-12-171-15/+10
* Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-12-173-18/+19
|\
| * Merge pull request #783 from SamWhited/quiet-hoursDaniel Gultsch2014-12-173-18/+19
| |\
| | * Handle time comparisons using longsSam Whited2014-12-162-13/+8
| | * Update summary in TimePreference change listenerSam Whited2014-12-151-5/+11
* | | made scroling smoother + bug fixes for history loadingiNPUTmice2014-12-173-21/+47
* | | smoothed out scrolling a bitiNPUTmice2014-12-172-23/+44
|/ /
* | properly detect images in share withiNPUTmice2014-12-171-6/+6
* | Merge branch 'issue756' of https://github.com/SamWhited/Conversations into Sa...iNPUTmice2014-12-171-24/+36
|\ \
| * | Allow sending of any filetype via intentSam Whited2014-12-151-24/+36
| |/
* / properly count mam messagesiNPUTmice2014-12-172-4/+13
|/
* go through mam history page by page. load mam dynamically on scrolliNPUTmice2014-12-155-43/+108
* Merge pull request #782 from SamWhited/quiet-hoursDaniel Gultsch2014-12-151-3/+3
|\
| * Make some magic number constants finalSam Whited2014-12-151-3/+3
* | fixed crashing on unparsed jidsiNPUTmice2014-12-151-4/+4
* | Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into...iNPUTmice2014-12-151-68/+64
|\|
| * Make silent notification when quiet hours are onSam Whited2014-12-151-68/+64
* | migrated more jid parsing to use getAttributeAsJid. added error loggingiNPUTmice2014-12-154-32/+8