aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* moved merged files to correct location0.0.3lookshe2015-08-163-15/+16
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1635-409/+396
|\
| * 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-1622-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-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 errors0.0.2lookshe2015-08-133-1/+3
* | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-11413-2699/+7139
|\|
| * Merge tag '1.5.2' into trz/rebaselookshe2015-08-11413-2701/+7126
| * 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-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
* | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-19136-764/+727
|/
* moved color picker to libslookshe2015-04-1521-665/+0
* changed received and read confirmation setting to one list and put it to sett...lookshe2015-04-149-82/+109
* check with lowercase to also match JPEG, JPeg ...lookshe2015-04-131-1/+1
* changed last message in overview also to EmojiconTextView for displaying smil...lookshe2015-04-122-4/+9
* 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-1223-29/+75
* add missing resource fileslookshe2015-04-128-0/+0
* whatsapp-like smiley implementationlookshe2015-04-126-26/+165
* 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
* timestamp parsing revertedsteckbrief2015-03-311-5/+20
* Configurable LED color (Attention: Expert setting because currently only text...steckbrief2015-03-313-1/+17
* Changes for emoticon parser reactivatedsteckbrief2015-03-312-6/+8
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-3082-610/+2937
|\
| * pulled translationsiNPUTmice2015-03-225-0/+21
| * properly set chat states when receiving otr status messagesiNPUTmice2015-03-211-1/+1
| * respond to unreadable OTR messages with error message. fixed #1021iNPUTmice2015-03-215-3/+42
| * wait for session iq to return sucessfully before sending other stanzas. fixed...iNPUTmice2015-03-201-26/+42
| * don't update presence for muc messagesiNPUTmice2015-03-191-5/+2
| * pulled more translationsiNPUTmice2015-03-191-0/+5
| * Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseenDaniel Gultsch2015-03-194-8/+24
| |\
| | * # add delivery receipts for private muc msgsBrianBlade2015-03-184-8/+24
| * | Merge pull request #1043 from strb/choose_contact_multiple_squashedDaniel Gultsch2015-03-184-6/+134
| |\ \
| | * | Added multiple select to Choose Contact ActivityAndreas Straub2015-03-184-6/+134
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-16 09:22:38 +0000