aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* optimize code abitM. Dietrich2014-11-041-29/+23
* implement "correct" ndef parsingM. Dietrich2014-11-041-13/+25
* made qr code available from muc and contact details as welliNPUTmice2014-11-047-105/+175
* added missing return statement. fixed api bugiNPUTmice2014-11-041-3/+2
* be more OOM. Dietrich2014-11-041-51/+44
* support pre JELLY_BEAN ndefM. Dietrich2014-11-041-16/+24
* fixed nfc. react to ?join uris. some refactoring. code cleanup. thanks to @em...iNPUTmice2014-11-034-187/+291
|\
| * fixed merge erroriNPUTmice2014-11-031-1/+0
| * Merge branch 'nfc' of https://github.com/siacs/Conversations into nfciNPUTmice2014-11-031-0/+1
| |\
| | * basic beam code / untestediNPUTmice2014-11-034-149/+207
| * | use different filter for nfc intentsiNPUTmice2014-11-031-1/+1
| * | basic beam code / untestediNPUTmice2014-11-034-149/+207
* | | unfinishd qr code implemenation. thanks to @emdeteiNPUTmice2014-11-035-18/+130
|/ /
* | create file explicitly before downloading imageiNPUTmice2014-11-031-0/+2
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-031-2/+1
|\ \ | |/ |/|
| * Wrap "last seen" time.Sam Whited2014-11-031-2/+1
* | more error handling for http connectioniNPUTmice2014-11-031-9/+12
|/
* version bump to 0.8.1iNPUTmice2014-11-031-5/+6
* always use exif helperiNPUTmice2014-11-031-23/+6
* more error handling in xmppconnectioniNPUTmice2014-11-031-66/+78
* fixed arrayoutofbounds + spellingiNPUTmice2014-11-012-7/+7
* Merge branch 'gradle' into developmentSam Whited2014-10-30315-0/+6342
|\
| * Make conversations the root projectSam Whited2014-10-22313-0/+25560
* only end otr session if there is more than one contact presence. reset otherwiseiNPUTmice2014-10-301-1/+5
* cleanup for clear conversation history. small otr fixesiNPUTmice2014-10-304-26/+22
* replace the exif interface with a small static class from 3d galleryiNPUTmice2014-10-292-17/+167
* proper error state for imagesiNPUTmice2014-10-295-20/+16
* fixed 'share image' context menuiNPUTmice2014-10-291-2/+1
* fixed intent managmentiNPUTmice2014-10-291-8/+8
* end otr session if plain text message from another instance is being receivediNPUTmice2014-10-281-1/+8
* improvements on findConversationiNPUTmice2014-10-281-2/+2
* always show verify fingerprint if there is an active otr sessioniNPUTmice2014-10-281-5/+4
* reworked dns retryiNPUTmice2014-10-272-66/+51
* removed unnecessary logging from avatar serviceiNPUTmice2014-10-271-5/+0
* proper cleanup after pgp image decryptioniNPUTmice2014-10-271-16/+9
* fixed url parsingiNPUTmice2014-10-271-1/+6
* check for links in pgp encrypted messages as welliNPUTmice2014-10-274-7/+12
* set divider for image meta information to '|' to not conflict with URL. break...iNPUTmice2014-10-264-8/+53
* Merge pull request #588 from betheg/remove_unused_castDaniel Gultsch2014-10-2610-32/+25
|\
| * remove some unused castMichael2014-10-2610-32/+25
* | fix possible fallthrough.Michael2014-10-262-0/+2
|/
* don't merge downloadable messagesiNPUTmice2014-10-241-1/+3
* added message option to download imagesiNPUTmice2014-10-242-2/+14
* also show some text in new image notificationiNPUTmice2014-10-241-73/+122
* picture notification and some drive by bug fixesiNPUTmice2014-10-244-33/+40
* notify only after image has been received over http. introduced mini grace fo...iNPUTmice2014-10-246-33/+64
* context menu for messages. allow to resend single messagesiNPUTmice2014-10-237-30/+154
* ability to download pgp encrypted files over http as welliNPUTmice2014-10-222-5/+9
* small bug fixes for the conversation activityiNPUTmice2014-10-221-2/+9
* made httpconnection accept aes encrypted filesiNPUTmice2014-10-225-16/+33