aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-7/+2
|\
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-043-16/+9
| * Fixed compile error in inner classsteckbrief2015-12-021-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-042-2/+4
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-0210-10/+423
|\|
| * Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-201-1/+1
| * Implements FS#67: Introduce central logging class to use log prefix, new acti...steckbrief2015-11-2036-226/+639
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-065-0/+560
|\|
| * FileBackend splitted into several util classes for separate concerns: AvatarU...steckbrief2015-11-0622-580/+771
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-038-1/+296
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a pictur...steckbrief2015-11-0314-173/+521
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-303-0/+24
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-233-14/+19
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...steckbrief2015-10-239-27/+36
* | Merge trz/rename into trz/rebasesteckbrief2015-10-223-7/+300
|\|
| * Access to preferences moved to global utility class ConversationsPlusPreferen...steckbrief2015-10-2124-350/+532
| * added comment for clarification, why the timestamp of the first msg of msg li...steckbrief2015-10-171-1/+1
| * Removed unused importssteckbrief2015-10-151-4/+0
| * Fixes FS#81 - avoid jumps after loading messagessteckbrief2015-10-152-32/+64
* | fix imports and namespacessteckbrief2015-10-051-0/+2
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-051-0/+62
|\|
| * Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...steckbrief2015-10-056-35/+74
* | fixed importstrz/1.5.2.2lookshe2015-10-054-10/+10
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-054-0/+418
|\|
| * Publishing additional information in message details dialog such as message t...steckbrief2015-10-041-18/+142
| * Note added where to change sth. for FS#70steckbrief2015-10-041-1/+2
| * Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, Op...steckbrief2015-10-048-3/+321
| * Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-022-6/+9
| * 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