| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Added columns to fileparams table: url, original file name, key and iv | steckbrief | 2017-01-04 | 1 | -0/+9 |
| | | | | | | auto download of files moved from MessageParser to MessageAdapter download and open file representation cleaned up | ||||
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-10-20 | 1 | -0/+23 |
| | | |||||
| * | Merge tag '1.11.3' into trz/rebase | lookshe | 2016-04-05 | 1 | -0/+36 |
| |\ | |||||
| * | | fixed merge errors | lookshe | 2016-03-20 | 1 | -0/+2 |
| | | | |||||
| * | | Merge tag '1.11.1' into trz/merge_1.11.1 | lookshe | 2016-03-17 | 1 | -1/+8 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml | ||||
| | * | Check if path for URI is accessible | fiaxh | 2016-03-15 | 1 | -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 | ||||
| * | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase | steckbrief | 2016-03-12 | 1 | -5/+10 |
| | | | |||||
| * | | fixed possible NPE | lookshe | 2016-03-12 | 1 | -0/+6 |
| | | | |||||
| * | | small bugfixes | lookshe | 2016-03-12 | 1 | -1/+1 |
| | | | |||||
| * | | removed duplicated source | lookshe | 2016-03-12 | 1 | -0/+23 |
| | | | |||||
| * | | corrected getRealPathFromUri | lookshe | 2016-03-07 | 1 | -2/+3 |
| |/ | |||||
| * | null check in getOriginalPath | Daniel Gultsch | 2016-01-04 | 1 | -0/+3 |
| | | |||||
| * | catch some db query exceptions | Daniel Gultsch | 2015-08-25 | 1 | -3/+5 |
| | | |||||
| * | do not touch pictures that are already in the right format | Daniel Gultsch | 2015-08-11 | 1 | -0/+144 |
| fixed #522 | |||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |