aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/xml (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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/rebasetrz/1.5.2.1lookshe2015-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
* | | Color choose dialogsteckbrief2015-04-111-3/+5
|/ /
* | Configurable LED color (Attention: Expert setting because currently only text...steckbrief2015-03-311-0/+5
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-0/+6
|\|
| * added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-0/+7
* | Merge master-originsteckbrief2015-02-201-5/+12
|\|
| * Remove legacy SSL supportSam Whited2015-01-191-5/+0
| * Add option to swap enter/emoticon keySam Whited2015-01-141-0/+5
| * Introduced expert options to control enter-is-sendDaniel Gultsch2015-01-091-0/+7
* | Setting added for parsing emoticons or notTristan Zur2015-01-111-0/+5
|/
* Add quiet hours featureSam Whited2014-12-141-2/+23
* happy hanukkahiNPUTmice2014-11-161-0/+5
* turn on foreground service in expert settingsiNPUTmice2014-11-151-0/+5
* Convert about dialog to activitySam Whited2014-11-041-6/+2
* Add about dialog with license infoSam Whited2014-11-041-0/+7
* Make conversations the root projectSam Whited2014-10-221-0/+114