aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-063-2/+15
|\
| * Fix flagging no more messages on server for conversationsteckbrief2015-12-063-2/+15
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-044-20/+50
|\|
| * Implements FS#83: Reload from last received messagesteckbrief2015-12-044-20/+50
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-3/+6
|\|
| * Implements FS#89 - Change about informationsteckbrief2015-12-041-3/+6
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-0423-124/+124
|\|
| * Fixes FS#75 - Change color names to reasonable namessteckbrief2015-12-0423-124/+124
* | 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-0242-227/+688
|\|
| * Partially implements FS#6: Conference ID changed to c+bugs@conferesteckbrief2015-11-202-1/+2
| * Implements FS#67: Introduce central logging class to use log prefix, new acti...steckbrief2015-11-2042-226/+686
* | 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-0320-172/+601
|\|
| * Implements FS#26: Introduction of dialog to choose whether to resize a pictur...steckbrief2015-11-0317-173/+549
| * Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-307-1/+52
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-2311-30/+41
|\|
| * Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in values...steckbrief2015-10-2311-30/+39
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-221-1/+2
|\|
| * Implements FS#78: Allow installation on SD cardsteckbrief2015-10-221-1/+2
* | 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-162-1/+4
|\|
| * Fixes FS#82: Background color of conversation list item set to primary backgr...steckbrief2015-10-162-1/+4
* | 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-052-1/+3
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-057-36/+76
|\|
| * Fixes FS#70 - Introduction of a ConversationsPlusApplication to get global ac...steckbrief2015-10-057-36/+76
* | fixed importstrz/1.5.2.2lookshe2015-10-055-11/+11
* | Merge branch 'trz/rename' into trz/rebaselookshe2015-10-0523-16/+700
|\|
| * Publishing additional information in message details dialog such as message t...steckbrief2015-10-044-28/+235
| * 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-0413-4/+473
| * New logo added, fixes FS#56steckbrief2015-10-045-0/+0
| * Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-023-10/+14
| * Fixes FS#50: Replace phone numbers and email addresses in messages with linkssteckbrief2015-09-022-2/+2
| * 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-1635-409/+396
| |\
| * | resolve of some compiler errorslookshe2015-08-133-1/+3
| * | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-11413-2699/+7139
| |\ \
| * | | App-Name changed to "Conversations+" in strings.xmlsteckbrief2015-06-191-1/+1
| * | | 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-196-2/+43