aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-120-0/+0
| |\ \ | |/ / |/| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-1110-140/+14
|\| |
| * | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-1110-139/+13
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-118-149/+28
|\| |
| * | Fixes FS#139: Do not merge messages at allsteckbrief2016-03-118-149/+28
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-106-49/+52
|\| |
| * | 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-103-12/+6
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
|\| |
| * | Merge remote branch 'master'steckbrief2016-03-084-22/+21
| |\ \
| | * | incremented version codelookshe2016-03-081-1/+1
| * | | Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
* | | | Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1lookshe2016-03-083-21/+20
|\ \ \ \ | | |/ / | |/| |
| * | | reset link and highlight colors to system defaultsteckbrief2016-03-083-21/+20
| |/ /
* | | Merge branch 'trz/rename' (early part) into trz/rebaselookshe2016-03-080-0/+0
|\| |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0872-619/+1207
| |\ \ | |/ / |/| |
* | | Fixes FS#153 - Check if url, phone and email are linkified correctlylookshe2016-03-082-6/+41
* | | 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-0868-484/+993
|\ \ \ | | |/ | |/|
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 20:35:24 +0000