aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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/rebaselookshe2015-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