aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml/preferences.xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-181-6/+1
|\
| * Related to FS#199: fixed merge hickups (message correction setting removed, k...steckbrief2016-04-181-6/+1
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-11/+29
| |\ | |/ |/|
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-0/+6
| |\
| * \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-071-7/+0
| |\ \
| * \ \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-55/+83
| |\ \ \
* | \ \ \ Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-11/+29
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | add setting for quick sharingDaniel Gultsch2016-04-141-15/+22
| * | | | introduced setting to turn of notification ledDaniel Gultsch2016-04-091-1/+6
* | | | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-0/+6
|\| | | | | |_|_|/ |/| | |
| * | | expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-011-0/+6
* | | | Finally fixes FS#142lookshe2016-03-071-7/+0
| |_|/ |/| |
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-1/+6
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-6/+1
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-1/+0
|\| |
| * | disallow message correction by default. fixes #1720Daniel Gultsch2016-02-261-1/+1
* | | Removed stupid message correctionsteckbrief2016-02-231-5/+0
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-1/+6
|\| |
| * | added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-161-1/+6
* | | Unused preference 'picture_compression'. This feature is configured in our va...steckbrief2016-02-131-7/+0
* | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-5/+0
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-55/+96
|\| |
| * | opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-011-0/+6
| * | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-0/+5
| * | let the user decide on whether or not to compress picturesDaniel Gultsch2016-01-091-10/+16
| * | show per conference notification settings in details activityDaniel Gultsch2016-01-081-6/+0
| * | introduced build-time paranoia mode that disables unencrypted chats and force...Daniel Gultsch2015-12-011-1/+3
| * | initial tor supportDaniel Gultsch2015-12-011-0/+7
| * | introduced expert options to set status to away and xa if screen is off or if...Daniel Gultsch2015-10-081-0/+12
| * | Export logs to SD card preferencefiaxh2015-09-211-0/+4
| * | added setting to allow for white backgrounds in incoming message bubblesDaniel Gultsch2015-08-241-0/+5
| * | removed expert setting to 'force encryption'. merged certifcate and encryptio...Daniel Gultsch2015-07-311-82/+75
| * | treat private, non-anonymous mucs like 1:1 chats notification wiseDaniel Gultsch2015-07-221-1/+1
| * | replace send button with quick action button as long as no text has been enteredDaniel Gultsch2015-05-021-0/+8
| * | Add option to remove manually approved certificatesBrianBlade2015-04-191-5/+11
| * | maintain state when rotating settings activityiNPUTmice2015-04-141-4/+10
| * | Add option to use MTM without default TrustManagerBrianBlade2015-04-111-0/+5
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-161-19/+30
|\ \ \ | | |/ | |/|
| * | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and dis...steckbrief2015-12-161-19/+30
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-021-0/+3
|\| |
| * | Implements FS#67: Introduce central logging class to use log prefix, new acti...steckbrief2015-11-201-0/+3
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-031-0/+8
|\| |
| * | Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-301-0/+8
| * | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-111-2/+24
| |\ \ | |/ / |/| |
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-3/+3
* | | Merge tag '1.5.2' into trz/rebaselookshe2015-08-111-2/+24
|/ /
* | changed received and read confirmation setting to one list and put it to sett...lookshe2015-04-141-61/+62
* | added settings for accepting and downloading fileslookshe2015-04-121-6/+25
* | Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...steckbrief2015-04-111-0/+6
|\ \
| * | differ between received and read messagelookshe2015-04-111-0/+6
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 08:12:40 +0000