aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Enable end-conversation by swipe gestureBrianBlade2015-04-082-9/+95
* Merge pull request #1099 from BrianBlade/fix_otr_error_msgsDaniel Gultsch2015-04-022-18/+24
|\
| * Fix OTR-Error messagesBrianBlade2015-04-012-18/+24
* | Add toggle account-state switchBrianBlade2015-04-012-16/+37
|/
* 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
* | | | Set file size also for cached avatarsHolger Weiß2015-03-171-29/+31
| |/ / |/| |
* | | Do not Strigprep JIDs from databaseMateusz "maxmati" Nowoty?ski2015-03-114-11/+13
* | | add context menu entries for geo urisiNPUTmice2015-03-111-17/+33
* | | open location directly from notificationiNPUTmice2015-03-101-0/+25
* | | show geo uris as 'location' in overviewiNPUTmice2015-03-101-1/+7
| |/ |/|
* | Merge pull request #1022 from Boris-de/cipher_blacklistDaniel Gultsch2015-03-082-0/+25
|\ \
| * | disable all really weak cipher suitesBoris Wachtmeister2015-03-072-0/+25
* | | display geo uris as location. show 'send loction' in share menu if request lo...iNPUTmice2015-03-075-48/+215
|/ /
* | fixed enter is send optioniNPUTmice2015-03-062-6/+10
* | fixed npe in message parseriNPUTmice2015-03-061-4/+4
* | avoid unnecessary thread creationiNPUTmice2015-03-053-17/+29
* | added config option to disable string prep in jidsiNPUTmice2015-03-052-3/+5
* | experimantal in memory jid cachingiNPUTmice2015-03-041-0/+15
|/
* added methods to count number of unread messagesDaniel Gultsch2015-03-022-0/+21
* mark all sent messages up to a marker as displayedDaniel Gultsch2015-03-012-13/+19
* merge messages with related status (unsend, send, send_received)iNPUTmice2015-03-011-1/+17
* catching out of memory run time exception in hasEnabledAccounts()iNPUTmice2015-02-281-0/+2
* use conversations green in notification lediNPUTmice2015-02-271-1/+1
* Merge pull request #1006 from QuentinC/developmentDaniel Gultsch2015-02-271-0/+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
* | don't add users with null nicks to muc user listiNPUTmice2015-02-271-1/+1
* | hide change password menu item if server feature is unavailableiNPUTmice2015-02-271-7/+8
|/
* reset error status in edit account when reconnectingiNPUTmice2015-02-261-0/+4
* check for null in jid parseriNPUTmice2015-02-262-0/+3
* initilize keys with jsonobject value on parse erroriNPUTmice2015-02-261-1/+1
* prevent next button from showing up too early on account setupiNPUTmice2015-02-251-1/+1
* reset incoming chat state when going into backgroundiNPUTmice2015-02-231-0/+3
* get rid of some useless debuggingiNPUTmice2015-02-231-3/+0
* init mode (first start) for StartConversationActivity (no up button) and avoi...iNPUTmice2015-02-224-14/+44
* look at 5 muc users instead of 4 for tile cache clearingiNPUTmice2015-02-221-2/+2
* properly remove invalid avatariNPUTmice2015-02-222-0/+2
* clear muc tiles cache only when necessaryiNPUTmice2015-02-212-1/+22
* added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-2112-53/+256
* fixed #993iNPUTmice2015-02-191-1/+2
* launch edit account activity when starting Conversations for the first time (...iNPUTmice2015-02-191-5/+9