aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-161-2/+1
|\|
| * fix wrong class type usagelookshe2015-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
|\|
| * 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
| * 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
* | 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
|\|
| * Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-11446-2763/+8541
| * 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-196-2/+42
* | 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
|/
* moved color picker to libslookshe2015-04-1537-31/+219
* changed received and read confirmation setting to one list and put it to sett...lookshe2015-04-1410-83/+110
* adjusted todolookshe2015-04-141-0/+1
* check with lowercase to also match JPEG, JPeg ...lookshe2015-04-131-1/+1
* adjusted todolookshe2015-04-131-0/+1
* changed last message in overview also to EmojiconTextView for displaying smil...lookshe2015-04-122-4/+9
* adjusted todolookshe2015-04-121-2/+0
* better and perhaps faster way for checking if a message is downloadablelookshe2015-04-121-10/+18
* new settings to initialisation of Settingslookshe2015-04-121-1/+1
* implementation for downloading only when enabled wlanlookshe2015-04-124-3/+30
* added settings for accepting and downloading fileslookshe2015-04-1224-29/+77
* add missing resource fileslookshe2015-04-128-0/+0
* Merge remote-tracking branch 'origin/trz/master' into trz/masterlookshe2015-04-121-3/+1
|\
| * adjusted todolookshe2015-04-121-3/+1
* | whatsapp-like smiley implementationlookshe2015-04-121026-27/+4231
* | whatsapp-like smiley implemantationlookshe2015-04-121-1/+2
|/
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...steckbrief2015-04-117-22/+38
|\
| * show online status under avatar in same way for muc as the send button doeslookshe2015-04-111-13/+18
| * differ between received and read messagelookshe2015-04-116-9/+20
* | Color choose dialogsteckbrief2015-04-1126-15/+688
|/
* no trim of messages or passwordlookshe2015-04-117-9/+15
* correct parsing of led colorlookshe2015-04-111-1/+1
* todo addedlookshe2015-04-111-0/+1
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...lookshe2015-04-1188-635/+3322
|\
| * timestamp parsing revertedsteckbrief2015-03-312-16/+31