aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'siacs/master' into developmentChristian S2016-03-2613-44/+78
|\
| * version bump to 1.11.2 and changelogDaniel Gultsch2016-03-232-2/+7
| |
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-238-31/+46
| |
| * only add image files to media scannerDaniel Gultsch2016-03-236-13/+26
| |
| * update build depsDaniel Gultsch2016-03-231-2/+2
| |
| * Merge pull request #1780 from licaon-kter/patch-1Daniel Gultsch2016-03-221-1/+1
| |\ | | | | | | Typo `attempt`
| | * Typo `attempt`licaon-kter2016-03-221-1/+1
| |/
* | version bumpChristian S2016-03-232-2/+6
| |
* | added missing/new stringsChristian S2016-03-232-0/+7
| |
* | added VoiceRecorder to pluginsChristian S2016-03-231-0/+6
| |
* | Merge pull request #80 from siacs/masterChristian S2016-03-206-12/+19
|\| | | | | copy commits
| * 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
| | | | | | | | closing the activity prematuraly caused uri permissions to be revoked
| * Merge pull request #1767 from fiaxh/path_file_accessibleDaniel Gultsch2016-03-161-1/+10
| |\ | | | | | | Check if path for URI is accessible
| | * Check if path for URI is accessiblefiaxh2016-03-151-1/+10
| |/ | | | | | | | | The path extracted from the Cursor might not be accessible for Conversations. FileUtils accesses URI information through the ContentProvider, so this wouldn't be noticed. Fixes sharing from open-keychain's TemporaryContentProvider
| * 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 ↵Daniel Gultsch2016-03-041-0/+10
| |\ | | | | | | | | | tarun018-Mess
| | * Fix Issue #1634 : Shows XMPP URI as links.Tarun2016-02-291-0/+10
| | | | | | | | | | | | Shows XMPP URI as links, other than Web URL's and Email Addresses. Also performs respective actions on clicking XMPP URI.
| * | show host in file size checkerDaniel Gultsch2016-03-042-1/+15
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 05:43:36 +0000