aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-163-1/+18
|\|
| * C+ changelog updatedsteckbrief2015-10-161-1/+2
| * Fixes FS#82: Background color of conversation list item set to primary backgr...steckbrief2015-10-162-1/+4
| * Conversations Plus ChangeLog addedsteckbrief2015-10-161-0/+13
* | 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
|\|
| * Merge branch 'master' of ssh://git.fucktheforce.de/conversations-plussteckbrief2015-10-051-2/+2
| |\
| * | 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-0526-19/+1151
|\ \ \ | | |/ | |/|
| * | version bump to 0.0.5lookshe2015-10-051-2/+2
| |/
| * 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-047-1/+449
| * 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
| * version bump to 0.0.4lookshe2015-08-211-2/+2
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-212-4/+28
| |\
* | | Merge branch 'trz/rename' (early part) into trz/rebaselookshe2015-10-050-0/+0
|\| | | |/ |/|
| * modified readmelookshe2015-08-171-328/+15
| * Merge branch 'trz/rebase' into trz/renamelookshe2015-08-161-2/+1
| |\
| * | moved merged files to correct locationlookshe2015-08-163-15/+16
| * | version bump to 0.0.3lookshe2015-08-161-2/+2
| * | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1638-413/+519
| |\ \
| * | | resolve of some compiler errorslookshe2015-08-133-1/+3
| * | | adjust version code to match fdroid regexlookshe2015-08-131-1/+1
| * | | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-11446-2761/+8554
| |\ \ \
| * | | | App-Name changed to "Conversations+" in strings.xmlsteckbrief2015-06-192-4/+4
| * | | | 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
| * | | | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-19137-780/+743
* | | | | fixes FS#42 - Smilie replacement in urllookshe2015-08-211-1/+25
* | | | | fixes FS#44 - IOException if content-length is not presentlookshe2015-08-211-3/+3
| |_|_|/ |/| | |
* | | | fix wrong class type usagelookshe2015-08-161-2/+1
| |_|/ |/| |
* | | fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conferencelookshe2015-08-163-3/+15
* | | fixes FS#13 - Change smiley replacement patterns to be case insensitivelookshe2015-08-161-34/+18
* | | Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon modulelookshe2015-08-1624-137/+123
* | | 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
* | | Merged https://github.com/ankushsachdeva/emojicon/pull/16lookshe2015-08-151-4/+24
* | | - Introduction of SwipeRefreshLayout for conversation viewsteckbrief2015-08-125-169/+271