aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #80 from siacs/masterChristian S2016-03-206-12/+19
|\
| * show room nick for /me command in sent muc messages. fixes #1773Daniel Gultsch2016-03-201-4/+5
| * be less strict when sharing EXTRA_TEXT intentsDaniel Gultsch2016-03-201-1/+1
| * be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-202-3/+8
| * don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-202-4/+5
* | add border to roundedimageviewChristian S2016-03-202-3/+4
* | add border to roundedimageviewChristian S2016-03-193-4/+6
* | Merge branch 'siacs/master' into developmentChristian S2016-03-1710-60/+104
|\|
| * version bump to 1.11.1 and changelogDaniel Gultsch2016-03-162-2/+5
| * made it possible to share text filesDaniel Gultsch2016-03-161-7/+8
| * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-163-30/+69
| * Merge pull request #1767 from fiaxh/path_file_accessibleDaniel Gultsch2016-03-161-1/+10
| |\
| | * Check if path for URI is accessiblefiaxh2016-03-151-1/+10
| |/
| * removed requirement of external component for http uploadDaniel Gultsch2016-03-141-3/+2
| * pulled translations from transifexDaniel Gultsch2016-03-135-106/+443
| * simplified getUsers(max) codeDaniel Gultsch2016-03-131-11/+2
| * added logging in case fragment wasn't attachedDaniel Gultsch2016-03-131-0/+5
| * fixed recursive call instead of call to super in PublishProfileActivityDaniel Gultsch2016-03-131-5/+1
* | Update CHANGELOG.mdChristian S2016-03-131-0/+2
* | remove old codeChristian S2016-03-131-10/+0
* | Merge branch 'siacs/master' into developmentChristian S2016-03-139-20/+51
|\|
| * log reason for bind failureDaniel Gultsch2016-03-111-2/+2
| * close cursor in caps db queryDaniel Gultsch2016-03-111-1/+3
| * mention mod_smacks_offline and ejabberds settings in readmeDaniel Gultsch2016-03-101-0/+6
| * version bump to 1.11.0Daniel Gultsch2016-03-071-2/+2
| * pulled translations from transifexDaniel Gultsch2016-03-0628-82/+272
| * don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-063-4/+17
| * warn in conversations when account is disabledDaniel Gultsch2016-03-062-1/+15
* | version bumpChristian S2016-03-051-1/+1
* | only resend files smaller than 1 MiB automaticallyChristian S2016-03-052-2/+4
* | updated changelogChristian S2016-03-051-0/+1
* | resend failed filetransfers automaticallyChristian S2016-03-051-2/+6
* | show always buttons instead of links for filesChristian S2016-03-051-1/+2
* | updated stringsChristian S2016-03-052-0/+4
* | reformated codeChristian S2016-03-051-64/+64
* | Merge branch 'siacs/master' into developmentChristian S2016-03-0518-98/+177
|\|
| * version bump to 1.11.0-beta.3Daniel Gultsch2016-03-051-2/+2
| * Merge branch 'Mess' of https://github.com/tarun018/Conversations into tarun01...Daniel Gultsch2016-03-041-0/+10
| |\
| | * Fix Issue #1634 : Shows XMPP URI as links.Tarun2016-02-291-0/+10
| * | show host in file size checkerDaniel Gultsch2016-03-042-1/+15
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-044-6/+30
| * | don't automatically crop avatarDaniel Gultsch2016-03-048-22/+49
| * | add a few more know file extensionsDaniel Gultsch2016-03-044-10/+13
| * | allow to copy original url even while downloading. fixes #1743Daniel Gultsch2016-03-041-6/+9
* | | allow users to edit settings and accountsChristian S2016-03-041-2/+2
* | | updated stringsChristian S2016-03-041-2/+6
* | | Merge branch 'development' of https://github.com/kriztan/Pix-Art-Messenger in...Christian S2016-03-041-1/+1
|\ \ \
| * | | Update CHANGELOG.mdChristian S2016-02-281-1/+1
* | | | Merge branch 'siacs/master' into developmentChristian S2016-03-0430-292/+546
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | version bump to 1.11.0-beta.2Daniel Gultsch2016-03-031-2/+2