aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-05-211-2/+8
|\
| * Merge pull request #1212 from emdete/add_jid_to_show_locationDaniel Gultsch2015-05-201-3/+8
| |\
| | * fix to detect the sender jid correctlyM. Dietrich2015-05-201-3/+8
| * | Merge pull request #1211 from emdete/add_jid_to_show_locationDaniel Gultsch2015-05-201-0/+1
| |\|
| | * add extra jid to intend "show location"M. Dietrich2015-05-201-0/+1
* | | Merge branch 'master' into developmentDaniel Gultsch2015-05-211-1/+1
|\ \ \ | |/ / |/| |
| * | fixed with attaching wrong files when returning to activity and background se...Daniel Gultsch2015-05-211-1/+1
* | | added ShortcutBadger as a dependency to create unread counts on launcher iconDaniel Gultsch2015-05-202-6/+19
* | | pulled translations from transifexDaniel Gultsch2015-05-207-0/+35
* | | Merge branch 'master' into developmentDaniel Gultsch2015-05-201-4/+3
|\| |
| * | don't allow user to accidentally send empty messagesDaniel Gultsch2015-05-201-4/+3
* | | proper error parsing. some clean upDaniel Gultsch2015-05-201-41/+49
* | | fixed npe in new message parserDaniel Gultsch2015-05-201-1/+3
* | | fixed muc mam. added a few security checksDaniel Gultsch2015-05-202-25/+35
* | | fixed read/unread markersDaniel Gultsch2015-05-201-10/+9
* | | added mam stuff to new message parserDaniel Gultsch2015-05-203-9/+28
* | | rewrote parser code. mam id and possible other stuff still missing. also mass...Daniel Gultsch2015-05-204-504/+230
* | | provide helper function for getting the content of a child directlyDaniel Gultsch2015-05-206-21/+38
|/ /
* | added fall back package id for voice recorder pluginDaniel Gultsch2015-05-201-0/+1
* | hide block contact from context menu when server feature is not available fix...Daniel Gultsch2015-05-191-2/+5
* | use same socket time out for jingle and xmpp connectionsDaniel Gultsch2015-05-182-2/+2
* | use a 20s timeout on socks5 connectionsDaniel Gultsch2015-05-182-2/+6
* | don't offer initiator his own candidatesDaniel Gultsch2015-05-181-2/+4
|/
* fixed crash on failed account registryDaniel Gultsch2015-05-171-1/+1
* made white space check in bodyContainsDownloadable less aggresiveDaniel Gultsch2015-05-161-1/+1
* 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
* 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
|\
| * only forward incoming chat messages to Pebble App and GadgetbridgeAndreas Shimokawa2015-05-081-1/+5
* | changed conversation red to material redDaniel Gultsch2015-05-1027-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 15:10:53 +0000