aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
* Fixes FS#157: Trigger loading messages from MAM in MUC does not endsteckbrief2016-03-103-37/+45
* Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-102-4/+6
* reset link and highlight colors to system defaultsteckbrief2016-03-081-17/+20
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0831-477/+874
|\
| * 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 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
| | |/ / /
* | | | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-1/+2
|\| | | |
| * | | | use Build.VERSION_CODES.KITKAT instead of hard coded 19lookshe2016-03-081-1/+2
* | | | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-077-13/+49
|\| | | |
| * | | | Fixes FS#151 - Missing button on image-linkslookshe2016-03-074-5/+6
| * | | | corrected getRealPathFromUrilookshe2016-03-072-4/+43
| * | | | Finally fixes FS#142lookshe2016-03-071-4/+0
* | | | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06134-3510/+13072
|\| | | |
| * | | | Implements: FS#142 - Fix Conference notificationslookshe2016-03-062-7/+5
| * | | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-0215-978/+1315
| * | | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-0210-70/+11
| * | | | Fixes FS#148: Remove 'store' hint from chat-markerssteckbrief2016-03-021-2/+1
| * | | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-2820-94/+221
| |\| | |
| | * | | disallow message correction by default. fixes #1720Daniel Gultsch2016-02-261-1/+1
| | * | | execute pending mam queries every time we come onlineDaniel Gultsch2016-02-261-1/+1
| | * | | hide add account icons when single_account is set to trueDaniel Gultsch2016-02-242-1/+5
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 04:09:37 +0000