aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* pulled translations from transifexDaniel Gultsch2016-03-135-106/+443
* 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
* mention mod_smacks_offline and ejabberds settings in readmeDaniel Gultsch2016-03-101-0/+6
* version bump to 1.11.01.11.0Daniel Gultsch2016-03-071-2/+2
* pulled translations from transifexDaniel Gultsch2016-03-0628-82/+272
* 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-062-1/+15
* version bump to 1.11.0-beta.3Daniel Gultsch2016-03-051-2/+2
* 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
* | version bump to 1.11.0-beta.2Daniel Gultsch2016-03-031-2/+2
* | 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
* | version bump to 1.11.0-beta, changelog and updated readmeDaniel Gultsch2016-03-013-9/+30
* | 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
* | removed unneeded proguard filesDaniel Gultsch2016-02-272-47/+0
* | 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
|/ / /
* | | version bump to 1.10.1 and changelog1.10.1Daniel Gultsch2016-02-262-2/+6
* | | 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
| |/
* | 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