aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fixes FS#48 and FS#136trz/merge_1.10.0lookshe2016-02-281-1/+1
* Removed stupid message correctionsteckbrief2016-02-231-2/+1
* Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-1/+2
|\
| * added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-161-1/+2
* | Fixed settings synchronizationsteckbrief2016-02-121-60/+66
* | Imports organizedsteckbrief2016-02-121-16/+0
* | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-30/+53
|\|
| * splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+1
| * introduced build-time paranoia mode that disables unencrypted chats and force...Daniel Gultsch2015-12-011-0/+12
| * initial tor supportDaniel Gultsch2015-12-011-0/+2
| * introduced expert options to set status to away and xa if screen is off or if...Daniel Gultsch2015-10-081-5/+6
| * rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-0/+4
| * Optimize importsAndreas Straub2015-07-201-13/+11
| * Add option to remove manually approved certificatesBrianBlade2015-04-191-0/+91
| * maintain state when rotating settings activityiNPUTmice2015-04-141-14/+16
| * Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Con...iNPUTmice2015-04-141-1/+2
| |\
| | * Add option to use MTM without default TrustManagerBrianBlade2015-04-111-1/+2
| * | don't resume old session when changing resourceiNPUTmice2015-04-091-3/+9
| |/
* | Merge trz/rename into trz/rebasesteckbrief2015-10-221-4/+3
|\ \
| * | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-92/+0
* | | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-161-2/+6
* | | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-16/+115
|/ /
* | changed received and read confirmation setting to one list and put it to sett...lookshe2015-04-141-2/+3
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-1/+1
|\|
| * avoid unnecessary thread creationiNPUTmice2015-03-051-1/+1
* | Merge master-originsteckbrief2015-02-201-0/+9
|\|
| * adapt caps on whether or not message confirmation is oniNPUTmice2015-01-261-0/+8
* | - Avoiding accessing shared preferences to know if emoticons should be parsed...steckbrief2015-01-201-14/+19
|/
* remove unused imports.Michael2014-11-211-1/+0
* turn on foreground service in expert settingsiNPUTmice2014-11-151-0/+2
* It builds again!Sam Whited2014-11-091-2/+4
* Make conversations the root projectSam Whited2014-10-221-0/+74
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 05:56:23 +0000