aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* fixed notifications for imagesiNPUTmice2014-11-052-28/+35
* fixed #617iNPUTmice2014-11-051-26/+22
* reformated license a bitiNPUTmice2014-11-042-22/+16
* Merge pull request #626 from SamWhited/issue612Daniel Gultsch2014-11-042-14/+44
|\
| * Add last seen info to the databaseSam Whited2014-11-042-14/+44
* | Merge branch 'development' of https://github.com/siacs/Conversations into dev...iNPUTmice2014-11-048-31/+156
|\ \
| * | Shorten license text and fix height of scrollviewSam Whited2014-11-042-20/+7
| * | Use normal text size and colorSam Whited2014-11-041-1/+4
| * | Make links clickable in about textSam Whited2014-11-042-4/+7
| * | Convert about dialog to activitySam Whited2014-11-048-47/+102
| * | Use real copyright symbol ©Sam Whited2014-11-041-3/+3
| * | Move AboutDialog to correct pathSam Whited2014-11-041-0/+33
| * | Add about dialog with license infoSam Whited2014-11-042-0/+44
| |/
* / link to account details when touching own avatariNPUTmice2014-11-041-118/+124
|/
* clear avatar cache after nick name changeiNPUTmice2014-11-041-4/+8
* Merge pull request #625 from SamWhited/linterfixDaniel Gultsch2014-11-041-1/+3
|\
| * Make linter ignore properly checked API mismatchSam Whited2014-11-041-1/+3
* | show avatar in editaccountiNPUTmice2014-11-043-5/+33
|/
* register nfc callback in every activity that provides a proper sharable uriiNPUTmice2014-11-045-16/+18
* 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 errornfciNPUTmice2014-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-3041-376/+846
* Make conversations the root projectSam Whited2014-10-22313-0/+25560