aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/services (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-02-091-1/+1
|\
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-02-091-6/+7
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-151-6/+7
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-152-61/+58
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-133-190/+191
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-161-102/+24
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-102-3/+4
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-061-1/+1
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-1/+1
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-022-49/+49
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-063-166/+139
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-11-031-30/+88
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-232-6/+3
|\|
* | Merge trz/rename into trz/rebasesteckbrief2015-10-223-156/+112
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-151-22/+32
|\|
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-10-051-1/+2
|\|
| * renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-196-3706/+0
* | fixes FS#35 - Shortcut Badger compatible to setting always_notify_in_conferencelookshe2015-08-161-1/+1
* | - Introduction of SwipeRefreshLayout for conversation viewsteckbrief2015-08-121-31/+44
* | Merge tag '1.5.2' into trz/rebaselookshe2015-08-113-240/+411
|/
* changed received and read confirmation setting to one list and put it to sett...lookshe2015-04-141-9/+1
* implementation for downloading only when enabled wlanlookshe2015-04-121-0/+20
* Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz...steckbrief2015-04-111-1/+5
|\
| * differ between received and read messagelookshe2015-04-111-1/+5
* | Color choose dialogsteckbrief2015-04-111-10/+2
|/
* correct parsing of led colorlookshe2015-04-111-1/+1
* Configurable LED color (Attention: Expert setting because currently only text...steckbrief2015-03-311-1/+10
* Merge pull request #1042 from BrianBlade/FIXES_muc-dlrs_muc-lastseenDaniel Gultsch2015-03-191-1/+1
|\
| * # add delivery receipts for private muc msgsBrianBlade2015-03-181-1/+1
* | 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
* | | open location directly from notificationiNPUTmice2015-03-101-0/+25
| |/ |/|
* | display geo uris as location. show 'send loction' in share menu if request lo...iNPUTmice2015-03-071-0/+18
* | avoid unnecessary thread creationiNPUTmice2015-03-051-16/+21
|/
* added methods to count number of unread messagesDaniel Gultsch2015-03-021-0/+8
* mark all sent messages up to a marker as displayedDaniel Gultsch2015-03-011-9/+10
* use conversations green in notification lediNPUTmice2015-02-271-1/+1
* Update NotificationService.javaQuentinC2015-02-271-1/+1
* - Update mBuilder in NotificationService.java to ensure that the led is displ...Quentin2015-02-271-1/+2
* reset incoming chat state when going into backgroundiNPUTmice2015-02-231-0/+3
* get rid of some useless debuggingiNPUTmice2015-02-231-3/+0
* added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-211-0/+22
* always go through reconnect method instead of just starting XmppConnection th...iNPUTmice2015-02-181-4/+1
* moved roster loading to async task as welliNPUTmice2015-02-171-10/+22
* loading avatars in seperate tasksiNPUTmice2015-02-151-14/+26
* load messages asynchronouslyiNPUTmice2015-02-121-2/+18
* added actions to error notificationiNPUTmice2015-02-102-1/+47
* Use Material Design Icons on API 21+Sam Whited2015-01-291-6/+17
* adapt caps on whether or not message confirmation is oniNPUTmice2015-01-261-1/+5
* made connect time out more failsaveiNPUTmice2015-01-251-5/+8