aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-211-3/+3
| |\ | |/ |/|
| * moved merged files to correct locationlookshe2015-08-163-0/+167
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1614-409/+222
| |\ | |/ |/|
| * resolve of some compiler errorslookshe2015-08-133-1/+3
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1161-2115/+3783
| |\ | |/ |/|
| * Show Online status in contact list with respect to SHOW_ONLINE_STATUS preferencesteckbrief2015-06-191-2/+5
| * Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-195-0/+34
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-19126-0/+26180
|/
* changed received and read confirmation setting to one list and put it to sett...lookshe2015-04-141-1/+19
* new settings to initialisation of Settingslookshe2015-04-121-1/+1
* added settings for accepting and downloading fileslookshe2015-04-121-2/+16
* Color choose dialogsteckbrief2015-04-111-1/+8
* - Avoiding accessing shared preferences to know if emoticons should be parsed...steckbrief2015-01-201-0/+55