aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-043-16/+9
|\
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-043-16/+9
* | 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-021-1/+1
|\|
| * Fixed compile error in inner classsteckbrief2015-12-021-1/+1
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-0236-227/+640
|\|
| * 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-0622-579/+786
|\|
| * 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-0315-171/+545
|\|
| * 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-239-27/+38
|\|
| * 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-2225-351/+536
|\|
| * 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
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-153-36/+64
|\|
| * 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-056-35/+74
|\|
| * Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...steckbrief2015-10-056-35/+74
* | fixed importstrz/1.5.2.2lookshe2015-10-055-11/+11
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-0510-9/+458
|\|
| * 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-15/+16
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1616-409/+388
| |\
| * | 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-19132-739/+702
* | | | fixes FS#44 - IOException if content-length is not presentlookshe2015-08-211-3/+3
| |_|/ |/| |
* | | fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conferencelookshe2015-08-163-3/+15
* | | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-164-137/+8
* | | Fixes FS#15 - Adding smiley only possible at the endlookshe2015-08-161-21/+13
* | | Fixes FS#37 - Remove special treatment of unicode heartslookshe2015-08-167-29/+21
* | | - Introduction of SwipeRefreshLayout for conversation viewsteckbrief2015-08-124-169/+263
* | | Fixes FS#38 - Issues with URLs with multiple dots in file namelookshe2015-08-121-7/+18
* | | Fixes FS#33 - Get back the commentlookshe2015-08-121-0/+5
* | | Fixes FS#20: Limitation of end conversation swipe to left sidesteckbrief2015-08-111-58/+59
| |/ |/|
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-1161-2117/+3770
* | Show Online status in contact list with respect to SHOW_ONLINE_STATUS preferencesteckbrief2015-06-191-2/+4
* | Status color added to "create conversation" (refers to ticket #22 in flyspray)steckbrief2015-06-195-0/+33
|/