aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
| * Configurable LED color (Attention: Expert setting because currently only text...steckbrief2015-03-314-3/+19
| * Changes for emoticon parser reactivatedsteckbrief2015-03-315-8/+290
| * Merge tag '1.2.0' into trz/mastersteckbrief2015-03-3086-617/+2991
| |\
| | * bump version code1.2.0iNPUTmice2015-03-221-2/+2
| | * 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
| | * Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2015-03-201-1/+1
| | |\
| | | * Update CHANGELOG.mdDaniel Gultsch2015-03-191-1/+1
| | * | wait for session iq to return sucessfully before sending other stanzas. fixed...iNPUTmice2015-03-201-26/+42
| | |/
| | * version bump to 1.2.0-beta1.2.0-betaiNPUTmice2015-03-192-3/+5
| | * 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