aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/entities (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-1111-219/+327
|\
| * account for downloaded http files in dup checkerDaniel Gultsch2015-07-181-8/+18
| * renamed downloadable to transferableDaniel Gultsch2015-07-103-15/+15
| * refactored sendMessage and merged with resendMessageDaniel Gultsch2015-07-051-0/+20
| * avoid very rare npeDaniel Gultsch2015-07-031-0/+3
| * also offer http download for some 'well known extensions'Daniel Gultsch2015-07-022-1/+4
| * refactored message context menuDaniel Gultsch2015-07-021-1/+1
| * changed mime type handlingDaniel Gultsch2015-07-012-39/+63
| * made httpconnection (download) ready all kind of filesfeature/http_uploadDaniel Gultsch2015-06-301-53/+55
| * refactored bodyContainsDownloadable to be more flexibleDaniel Gultsch2015-06-301-33/+35
| * show attach button in conferences when http upload is availableDaniel Gultsch2015-06-291-0/+4
| * initial http upload supportDaniel Gultsch2015-06-293-22/+23
| * changed paragraph dividerDaniel Gultsch2015-06-101-1/+1
| * reworked handeling of system contactsDaniel Gultsch2015-06-032-7/+19
| * avoid unnessary muc mam queries when message count is 0 after subjectDaniel Gultsch2015-06-021-0/+6
| * renamed OtrEngine to OtrServiceDaniel Gultsch2015-05-262-10/+10
| * added mam stuff to new message parserDaniel Gultsch2015-05-201-1/+1
| * provide helper function for getting the content of a child directlyDaniel Gultsch2015-05-201-12/+2
| * made white space check in bodyContainsDownloadable less aggresiveDaniel Gultsch2015-05-161-1/+1
| * use zero width white space as message seperatorDaniel Gultsch2015-05-131-1/+1
| * don't set unknown error in mucDaniel Gultsch2015-05-121-2/+0
| * avoid using paragraph style breaks by accidentDaniel Gultsch2015-05-111-1/+3
| * add a little bit of space between merged messages.Daniel Gultsch2015-05-111-1/+1
| * rewrote parts of message adapter to avoid using NULL viewsDaniel Gultsch2015-05-111-0/+6
| * optimized heart render code a bitDaniel Gultsch2015-05-101-4/+1
| * added white heart to new rendering as wellDaniel Gultsch2015-05-101-1/+3
| * changed conversation red to material redDaniel Gultsch2015-05-101-2/+2
| * paint single unicode hearts as red and slightly largerDaniel Gultsch2015-05-101-32/+40
| * r/o support for vcard avatars. pep avatars will be preferedDaniel Gultsch2015-05-051-7/+19
| * fixed typosiNPUTmice2015-04-131-1/+1
| * Bugfix for issue #1121lookshe2015-04-131-10/+18
| * don't resume old session when changing resourceiNPUTmice2015-04-091-4/+10
* | Merge branch 'trz/rename' (early part) into trz/masterlookshe2015-06-193-0/+15
|\ \
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-1914-3447/+0
|/ /
* | check with lowercase to also match JPEG, JPeg ...lookshe2015-04-131-1/+1
* | better and perhaps faster way for checking if a message is downloadablelookshe2015-04-121-10/+18
* | no trim of messages or passwordlookshe2015-04-111-2/+2
|/
* respond to unreadable OTR messages with error message. fixed #1021iNPUTmice2015-03-211-0/+9
* Do not Strigprep JIDs from databaseMateusz "maxmati" Nowoty?ski2015-03-113-6/+4
* display geo uris as location. show 'send loction' in share menu if request lo...iNPUTmice2015-03-071-0/+4
* added methods to count number of unread messagesDaniel Gultsch2015-03-021-0/+13
* merge messages with related status (unsend, send, send_received)iNPUTmice2015-03-011-1/+17
* don't add users with null nicks to muc user listiNPUTmice2015-02-271-1/+1
* initilize keys with jsonobject value on parse erroriNPUTmice2015-02-261-1/+1
* clear muc tiles cache only when necessaryiNPUTmice2015-02-211-0/+15
* added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-212-1/+33
* use time instead of uptime for unmuteiNPUTmice2015-02-121-2/+1
* trim message bodys on displayDaniel Gultsch2015-02-071-2/+2
* fix mergable() for /me command.Michael2015-01-251-2/+4
* changed message duplicate finderiNPUTmice2015-01-201-5/+10