aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use a 20s timeout on socks5 connectionsJingleFixesDaniel Gultsch2015-05-182-2/+6
* don't offer initiator his own candidatesDaniel Gultsch2015-05-181-2/+4
* fixed npe in new message parserMessageParserNextDaniel Gultsch2015-05-171-1/+3
* fixed muc mam. added a few security checksDaniel Gultsch2015-05-172-25/+35
* fixed read/unread markersDaniel Gultsch2015-05-171-10/+9
* added mam stuff to new message parserDaniel Gultsch2015-05-173-9/+28
* rewrote parser code. mam id and possible other stuff still missing. also mass...Daniel Gultsch2015-05-174-504/+230
* provide helper function for getting the content of a child directlyDaniel Gultsch2015-05-176-21/+38
* fixed crash on failed account registryDaniel Gultsch2015-05-171-1/+1
* made white space check in bodyContainsDownloadable less aggresiveDaniel Gultsch2015-05-161-1/+1
* version bump to 1.4.0-betaDaniel Gultsch2015-05-161-2/+2
* pulled new translations from transifexDaniel Gultsch2015-05-163-52/+302
* let jingle connection and manager handle message statusDaniel Gultsch2015-05-163-4/+10
* call StartConversationActivity in init mode only after adding the first accountDaniel Gultsch2015-05-152-2/+6
* Force Nameprepping of JID domain partsAndreas Straub2015-05-142-4/+96
* added a few location questionsDaniel Gultsch2015-05-141-3/+8
* always log reason for failed file transferDaniel Gultsch2015-05-142-2/+18
* ignore question marks in location questionDaniel Gultsch2015-05-131-10/+13
* show location quick action after receiving a question about the users locationDaniel Gultsch2015-05-132-1/+28
* clear avatar cache when uploading new avatarDaniel Gultsch2015-05-131-0/+1
* use zero width white space as message seperatorDaniel Gultsch2015-05-131-1/+1
* version bump to 1.4.0-alpha3Daniel Gultsch2015-05-131-2/+2
* removed debug loggingDaniel Gultsch2015-05-121-2/+0
* handle conference invites differently to deal with killed activities. fixes #...Daniel Gultsch2015-05-124-31/+67
* don't set unknown error in mucDaniel Gultsch2015-05-121-2/+0
* don't reinit conversation when coming back to activity. avoids unnecessary sc...Daniel Gultsch2015-05-121-3/+1
* pulled updated translations from transifexDaniel Gultsch2015-05-112-2/+4
* avoid using paragraph style breaks by accidentDaniel Gultsch2015-05-112-4/+7
* increased space between merged messages a bitDaniel Gultsch2015-05-111-1/+1
* add a little bit of space between merged messages.Daniel Gultsch2015-05-112-2/+8
* no font padding on red heartsDaniel Gultsch2015-05-111-2/+4
* rewrote parts of message adapter to avoid using NULL viewsDaniel Gultsch2015-05-114-61/+41
* optimized heart render code a bitDaniel Gultsch2015-05-102-7/+8
* added white heart to new rendering as wellDaniel Gultsch2015-05-102-1/+4
* Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-05-101-1/+5
|\
| * Merge pull request #1180 from ashimokawa/developmentDaniel Gultsch2015-05-091-1/+5
| |\
| | * only forward incoming chat messages to Pebble App and GadgetbridgeAndreas Shimokawa2015-05-081-1/+5
| |/
* | changed conversation red to material redDaniel Gultsch2015-05-1032-9/+9
* | paint single unicode hearts as red and slightly largerDaniel Gultsch2015-05-103-36/+66
|/
* config option to reset attempt counts when changing network (default=true)Daniel Gultsch2015-05-082-8/+19
* throw proper exception before changing account into error stateDaniel Gultsch2015-05-081-11/+31
* version code bumpedDaniel Gultsch2015-05-071-1/+1
* fixed encrypted ibb file transfer which was broken with ART. fixes #1172Daniel Gultsch2015-05-072-26/+33
* fixed npe when binval value of vcard avatar is nullDaniel Gultsch2015-05-071-2/+3
* fixed npe when missing instructions on failed registerDaniel Gultsch2015-05-061-7/+5
* fwiw don't allow stanza count to go over MAX_INTDaniel Gultsch2015-05-061-0/+9
* avoid fetching avatars multiple times in parallelDaniel Gultsch2015-05-051-8/+39
* bumped version codeDaniel Gultsch2015-05-051-1/+1
* r/o support for vcard avatars. pep avatars will be preferedDaniel Gultsch2015-05-056-28/+127
* enabled sm logging by default at least for development branchDaniel Gultsch2015-05-051-1/+1