aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | 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
| |/ / / /
| | | | * 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-079-22/+49
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Fixes FS#151 - Missing button on image-linkslookshe2016-03-074-5/+6
* | | | | corrected getRealPathFromUrilookshe2016-03-072-4/+43
* | | | | Finally fixes FS#142lookshe2016-03-073-13/+0
| | | | * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-072-0/+1
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Fixes FS#150 - Swipe out conversation kills applookshe2016-03-072-0/+1
| | | | * Version bump to 0.0.6steckbrief2016-03-061-2/+2
| | | | * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06397-7994/+23249
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Fixes: FS#94 - wrong size on emojicon keyboardlookshe2016-03-062-3/+20
* | | | | Implements: FS#142 - Fix Conference notificationslookshe2016-03-062-7/+5
* | | | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-0220-981/+1331
* | | | | Readme updatedsteckbrief2016-03-021-0/+5
* | | | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-0234-142/+13
* | | | | Fixes FS#148: Remove 'store' hint from chat-markerssteckbrief2016-03-021-2/+1
* | | | | externalized string 'Retry decryption'steckbrief2016-02-283-1/+3
* | | | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-2826-100/+238
|\| | | |
| * | | | 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
| | |/ /
| * | | 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
* | | Fixes FS#48 and FS#136lookshe2016-02-285-24/+3
* | | Unused imports / methods removedsteckbrief2016-02-243-27/+0
* | | Fixes FS#89 after merge conflictsteckbrief2016-02-241-3/+6