aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* resend failed filetransfers automaticallyChristian S2016-03-051-2/+6
* show always buttons instead of links for filesChristian S2016-03-051-1/+2
* updated stringsChristian S2016-03-052-0/+4
* reformated codeChristian S2016-03-051-64/+64
* Merge branch 'siacs/master' into developmentChristian S2016-03-0517-96/+175
|\
| * 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-042-1/+15
| * | mark oob messages and always display download buttonDaniel Gultsch2016-03-044-6/+30
| * | don't automatically crop avatarDaniel Gultsch2016-03-048-22/+49
| * | 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
* | | allow users to edit settings and accountsChristian S2016-03-041-2/+2
* | | updated stringsChristian S2016-03-041-2/+6
* | | Merge branch 'siacs/master' into developmentChristian S2016-03-0426-241/+541
|\| |
| * | 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-014-7/+26
| * | 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-016-52/+137
| * | use correct jid when leaving a conference. fixes #1732Daniel Gultsch2016-02-292-6/+6
| * | refactored omemo to take multiple recipientsDaniel Gultsch2016-02-2912-173/+320
| * | 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
| |/ / /
* | | | bug fixesChristian S2016-02-271-2/+1
* | | | Merge branch 'siacs/master' into developmentChristian S2016-02-2719-56/+169
|\ \ \ \
| * | | | Revert "disallow message correction by default. fixes #1720"Christian S2016-02-272-2/+2
| |/ / /
| * | | disallow message correction by default. fixes #1720Daniel Gultsch2016-02-262-2/+2
| * | | 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
| * | | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-2410-22/+76
| * | | made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-246-26/+66
| | |/ | |/|
| * | Merge pull request #1715 from fiaxh/gpg_decryption_failedDaniel Gultsch2016-02-245-2/+21
| |\ \
| | * | Retry decryption from message menufiaxh2016-02-235-2/+21
| | |/
* | | updated German translationChristian S2016-02-231-1/+2
* | | Merge branch 'siacs/master' into developmentChristian S2016-02-2310-62/+92
|\| |
| * | set noMessagesLeftOnServer before conference configuration fetchDaniel Gultsch2016-02-232-2/+2
| * | update notification after message correctionDaniel Gultsch2016-02-231-0/+1
| * | reset pending subscription request when receiving roster updateDaniel Gultsch2016-02-231-0/+2
| * | made presences object final in contactDaniel Gultsch2016-02-231-5/+1
| |/
| * properly trigger show load more messages in mucsDaniel Gultsch2016-02-221-2/+10
| * turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-226-39/+54