aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs (follow)
Commit message (Expand)AuthorAgeFilesLines
* fixed merge errorslookshe2016-03-204-20/+28
* Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-178-74/+115
|\
| * 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
| * Check if path for URI is accessiblefiaxh2016-03-151-1/+10
| * 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 extracti...lookshe2016-03-126-44/+67
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-113-77/+11
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-116-147/+25
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-103-37/+45
|\| |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-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 cropCenterSquaresteckbrief2016-03-081-1/+1
* | | Fixed merge issue with AxolotlService (differentiation between impl and inter...steckbrief2016-03-083-133/+171
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-0828-340/+668
|\ \ \ | | |/ | |/|
| * | 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 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-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
| * | | don't break with srcoll events on empty message listsDaniel Gultsch2016-03-031-2/+7
| * | | expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-012-7/+18
| * | | removed unused config variableDaniel Gultsch2016-03-011-4/+0
| * | | properly persist accepted crypto targetsDaniel Gultsch2016-03-011-5/+1
| * | | let users confirm each member in a conference even if that contact is already...Daniel Gultsch2016-03-014-26/+102
| * | | use correct jid when leaving a conference. fixes #1732Daniel Gultsch2016-02-292-6/+6
| * | | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-2910-147/+286
| * | | rename purge keys positive button to 'purge keys'Daniel Gultsch2016-02-281-1/+1
| * | | made hashtable in roster store jids instead of stringsDaniel Gultsch2016-02-281-9/+7
| * | | always search offline contacts as well. fixes #1653Daniel Gultsch2016-02-271-0/+1
| * | | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-02-273-1/+34
| |\ \ \
| | * \ \ Merge pull request #1721 from fiaxh/export_logs_storage_permissionDaniel Gultsch2016-02-273-1/+34
| | |\ \ \
| | | * | | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= Mfiaxh2016-02-242-0/+33
| | | * | | No possibility of multiple invocation of log exportfiaxh2016-02-241-1/+1
| * | | | | changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-278-8/+29
| |/ / / /
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 10:24:16 +0000