aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java (unfollow)
Commit message (Expand)AuthorFilesLines
2015-08-11Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe1-16/+115
2015-04-14changed received and read confirmation setting to one list and put it to sett...lookshe1-2/+3
2015-03-05avoid unnecessary thread creationiNPUTmice1-1/+1
2015-01-26adapt caps on whether or not message confirmation is oniNPUTmice1-0/+8
2015-01-20- Avoiding accessing shared preferences to know if emoticons should be parsed...steckbrief1-14/+19
2014-11-21remove unused imports.Michael1-1/+0
2014-11-15turn on foreground service in expert settingsiNPUTmice1-0/+2
2014-11-09It builds again!Sam Whited1-2/+4
2014-10-22Make conversations the root projectSam Whited1-0/+0