aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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.1trz/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
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-103-37/+45
|\| | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/listeners/ResizePictureUserDecisionListener.java
* | | Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1lookshe2016-03-081-17/+20
|\| |
* | | Fixes FS#153 - Check if url, phone and email are linkified correctlylookshe2016-03-081-6/+31
| | |
* | | Use ImageUtil instead of old stupid generic FileBackend for cropCenterSquaretrz/merge_1.11.0steckbrief2016-03-081-1/+1
| | |
* | | Fixed merge issue with AxolotlService (differentiation between impl and ↵steckbrief2016-03-083-133/+171
| | | | | | | | | | | | interface)
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-0828-340/+668
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.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/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * | 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-061-1/+14
| | |
| * | 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-041-1/+14
| | | |
| * | | mark oob messages and always display download buttonDaniel Gultsch2016-03-044-6/+30
| | | |
| * | | don't automatically crop avatarDaniel Gultsch2016-03-041-22/+40
| | | |
| * | | 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
| | | |
| * | | moved avatarfetcher reset code to bindDaniel Gultsch2016-03-031-8/+8
| | | |
| * | | avoid unnecessary disconnect. prevent NetworkOnMainThreadExceptionDaniel Gultsch2016-03-031-3/+3
| | | |