aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| |/ / /
* | | | bug fixesChristian S2016-02-271-2/+1
* | | | Merge branch 'siacs/master' into developmentChristian S2016-02-2721-58/+175
|\ \ \ \
| * | | | Revert "disallow message correction by default. fixes #1720"Christian S2016-02-272-2/+2
| |/ / /
| * | | version bump to 1.10.1 and changelogDaniel 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
| | |/
* | | updated German translationChristian S2016-02-231-1/+2
* | | removed push from changlogChristian S2016-02-231-2/+0
* | | Merge branch 'siacs/master' into developmentChristian S2016-02-2312-64/+97
|\| |
| * | 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
| * | Revert "disable predexing on travis"Daniel Gultsch2016-02-232-103/+95
| * | disable predexing on travisDaniel Gultsch2016-02-232-95/+103
| * | made presences object final in contactDaniel Gultsch2016-02-231-5/+1
| * | fixed typo in travis.ymlDaniel Gultsch2016-02-231-1/+1
| * | fixed formating in travis configDaniel Gultsch2016-02-231-1/+1
| * | added remark that users don't need their own app serverDaniel Gultsch2016-02-231-1/+3
| * | tell travis to build free versionDaniel Gultsch2016-02-231-0/+2
| * | update build instructions in readmeDaniel Gultsch2016-02-231-2/+4
| |/
| * 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
| * version bump to 1.10.0Daniel Gultsch2016-02-211-2/+3
| * show load more messages when auto loading is disabled and messages are still ...Daniel Gultsch2016-02-212-6/+14
| * check for uuid change when decrypting pgp messagesDaniel Gultsch2016-02-211-7/+6
| * some mucs may grant voice to visitors in unmoderated roomsDaniel Gultsch2016-02-211-1/+3
| * pulled translations from transifexDaniel Gultsch2016-02-202-0/+49
* | removed duplicate stringsChristian S2016-02-202-7/+0
* | Merge branch 'siacs/master' into developmentChristian S2016-02-2058-127/+426
|\|
| * change uuid when replacing messagesDaniel Gultsch2016-02-202-1/+9
| * decrypt pgp message correctionsDaniel Gultsch2016-02-191-8/+9
| * skip avatar ui when pep is not available. fixes #1706Daniel Gultsch2016-02-191-5/+5