aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-211-3/+3
|\
| * fixes FS#44 - IOException if content-length is not presentlookshe2015-08-211-3/+3
* | moved merged files to correct locationlookshe2015-08-163-15/+16
* | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1616-409/+388
|\|
| * 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-164-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-124-169/+263
| * 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
* | Merge branch 'trz/rebase' into trz/renamelookshe2015-08-1161-2115/+3783
|\|
| * Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-1161-2117/+3770
| * 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-195-0/+33
* | 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-195-0/+34
* | renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-19132-739/+702
|/
* moved color picker to libslookshe2015-04-154-514/+0
* changed received and read confirmation setting to one list and put it to sett...lookshe2015-04-145-14/+26
* 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-121-1/+3
* 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-122-3/+18
* whatsapp-like smiley implementationlookshe2015-04-123-19/+143
* whatsapp-like smiley implemantationlookshe2015-04-121-1/+2
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...steckbrief2015-04-114-19/+25
|\
| * 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-113-6/+7
* | Color choose dialogsteckbrief2015-04-116-11/+524
|/
* no trim of messages or passwordlookshe2015-04-115-9/+11
* 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-311-1/+10
* Changes for emoticon parser reactivatedsteckbrief2015-03-312-6/+8
* Merge tag '1.2.0' into trz/mastersteckbrief2015-03-3048-517/+1609
|\
| * 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
| * 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-182-6/+121
| |\ \
| | * | Added multiple select to Choose Contact ActivityAndreas Straub2015-03-182-6/+121
| * | | Merge pull request #1036 from QuentinC/developmentDaniel Gultsch2015-03-181-1/+1
| |\ \ \
| | * | | Green led color is better with "full-green"Quentin2015-03-041-1/+1