aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.11.3' into trz/rebaselookshe2016-04-0517-53/+196
|\
| * don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-023-6/+8
| |
| * check max http file size when attaching filesDaniel Gultsch2016-04-016-12/+83
| |
| * add methods to check max file size for http uploadDaniel Gultsch2016-03-315-12/+41
| |
| * save otr fingerprint in messageDaniel Gultsch2016-03-316-12/+15
| |
| * include form fields into caps hash calculationDaniel Gultsch2016-03-312-6/+25
| |
| * closed some cursors under error conditionsDaniel Gultsch2016-03-311-3/+13
| |
| * made setting aes keys in DownloadableFile more readableDaniel Gultsch2016-03-311-12/+8
| |
| * Update ShortcutBadger to version 1.1.4Christian S2016-03-271-2/+2
| |
* | fixed installation error "W/PackageManager: Can't install because provider ↵lookshe2016-04-032-1/+21
| | | | | | | | name de.thedevstack.conversationsplus (in package eu.siacs.conversations) is already used by de.thedevstack.conversationsplus"
* | Merge branch 'trz/rename' into trz/rebaselookshe2016-04-011-1/+6
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-301-1/+3
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-303-0/+6
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-20/+9
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-295-70/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-2913-99/+72
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/eu/siacs/conversations/ui/ChangePasswordActivity.java src/main/java/eu/siacs/conversations/ui/TrustKeysActivity.java src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/forms/FormFieldWrapper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-282-2/+8
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-272-3/+24
|\| |
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-2513-38/+80
|\ \ \ | | |/ | |/|
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-236-30/+41
| | |
| * | only add image files to media scannerDaniel Gultsch2016-03-236-13/+26
| | |
| * | Typo `attempt`licaon-kter2016-03-221-1/+1
| | |
| * | 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
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-222-26/+42
|\ \ \ | | |/ | |/|
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-211-4/+19
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+1
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-18/+14
|\| |
* | | Merge branch 'trz/rebase' into trz/merge_1.11.1lookshe2016-03-205-37/+74
|\ \ \
| * | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-205-37/+74
| |\| |
* | | | fixed merge errorslookshe2016-03-204-20/+28
| | | |
* | | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-178-74/+115
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | made it possible to share text filesDaniel Gultsch2016-03-161-7/+8
| | |
| * | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-162-30/+66
| | | | | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked
| * | 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
| * | 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
| | |
| * | log reason for bind failureDaniel Gultsch2016-03-111-2/+2
| | |
| * | close cursor in caps db queryDaniel Gultsch2016-03-111-1/+3
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-152-4/+4
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-123-9/+13
|\| |
* | | fixed possible NPElookshe2016-03-121-0/+6
| | |
* | | small bugfixeslookshe2016-03-122-1/+4
| | |
* | | removed duplicated sourcelookshe2016-03-124-36/+41
| | |
* | | Added method to get body from message if hasMeCommand and harmonized ↵lookshe2016-03-126-44/+67
| | | | | | | | | | | | extraction of fileextension (FS#38)
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-113-77/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/widget/Switch.java src/main/res/layout/account_row.xml src/main/res/layout/contact_key.xml
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-116-147/+25
|\| | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/entities/Message.java