aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res (follow)
Commit message (Expand)AuthorAgeFilesLines
* DatabaseBackend updated to serve Conversatiosn Database version and Conversat...steckbrief2016-04-172-0/+23
* Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+1
* conversations->conversations+lookshe2016-04-0329-327/+327
* Pulled translations from transifexlookshe2016-04-012-25/+31
* no resize of input field when inserting emojicon (FS#175)lookshe2016-03-301-1/+1
* Implements FS#173: Move access to colors to separate helper classsteckbrief2016-03-291-1/+13
* Fixes FS#166 - Images cannot be opened since storing in private image folderlookshe2016-03-271-0/+4
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-252-1/+5
|\
| * FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-252-1/+5
| |\
| | * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-232-1/+5
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-2332-317/+450
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-207-4/+15
| |\ \
| * \ \ Merge branch 'trz/rebase' into trz/merge_1.11.1trz/merge_1.11.1lookshe2016-03-201-1/+2
| |\ \ \
| | * \ \ Merge branch 'trz/rename' into trz/rebaselookshe2016-03-201-1/+2
| | |\ \ \
* | | | | | pulled from transifexlookshe2016-03-2332-317/+450
| |_|_|/ / |/| | | |
* | | | | Fixes FS#143 - Displaying of emoticons too largelookshe2016-03-207-4/+15
* | | | | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-206-105/+438
|\| | | | | |_|/ / |/| | |
| * | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-176-105/+438
| |\ \ \ | | |/ / | |/| / | | |/
| | * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+3
| | * pulled translations from transifexDaniel Gultsch2016-03-135-106/+443
| * | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-116-62/+3
| |\ \
| * \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-101-8/+0
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-081-1/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'trz/rename' into trz/rebasetrz/1.11.0.1lookshe2016-03-082-4/+0
| |\ \ \ \ \
* | | | | | | Refs FS#140: Rework message displaysteckbrief2016-03-131-1/+2
| |_|_|_|/ / |/| | | | |
* | | | | | Fixes FS#51: Change toggle in Account Management back to standardsteckbrief2016-03-116-61/+3
| |_|_|/ / |/| | | |
* | | | | Fixes FS#158: user decision dialog heading configurable and translateablesteckbrief2016-03-101-8/+0
| |_|/ / |/| | |
* | | | Merge remote branch 'master'steckbrief2016-03-082-4/+0
|\ \ \ \ | | |/ / | |/| |
| * | | reset link and highlight colors to system defaultsteckbrief2016-03-082-4/+0
* | | | Fixes FS#145: Dialog for decision in Android 5steckbrief2016-03-081-1/+2
|/ / /
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-0838-131/+319
|\| |
| * | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-0838-131/+319
| |\|
| | * pulled translations from transifexDaniel Gultsch2016-03-0628-82/+272
| | * warn in conversations when account is disabledDaniel Gultsch2016-03-061-0/+1
| | * show host in file size checkerDaniel Gultsch2016-03-041-0/+1
| | * don't automatically crop avatarDaniel Gultsch2016-03-047-0/+9
| | * expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-012-0/+8
| | * let users confirm each member in a conference even if that contact is already...Daniel Gultsch2016-03-012-26/+35
| | * refactored omemo to take multiple recipientsDaniel Gultsch2016-02-292-26/+34
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-072-9/+0
|\| |
| * | Finally fixes FS#142lookshe2016-03-072-9/+0
* | | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-06167-2197/+7492
|\| |
| * | Fixes FS#147: Disable OMEMOsteckbrief2016-03-025-3/+16
| * | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-0224-72/+2
| * | externalized string 'Retry decryption'trz/merge_1.10.1steckbrief2016-02-283-1/+3
| * | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-283-4/+9
| |\|
| | * disallow message correction by default. fixes #1720Daniel Gultsch2016-02-261-1/+1
| | * optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-0/+2
| | * Retry decryption from message menufiaxh2016-02-232-1/+4
| | * turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-2/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 07:58:10 +0000