aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1036 from QuentinC/developmentDaniel Gultsch2015-03-181-1/+1
|\ | | | | Green led color is better with "full-green"
| * Green led color is better with "full-green"Quentin2015-03-041-1/+1
| |
* | Merge pull request #1041 from weiss/fix-cached-avatar-sizeDaniel Gultsch2015-03-171-29/+31
|\ \ | | | | | | Set file size also for cached avatars
| * | Set file size also for cached avatarsHolger Weiß2015-03-171-29/+31
|/ /
* | pulled new translations from transifexiNPUTmice2015-03-1610-11/+348
| |
* | updated changelongiNPUTmice2015-03-111-0/+9
| |
* | 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-106-0/+25
| |
* | show geo uris as 'location' in overviewiNPUTmice2015-03-102-1/+9
| |
* | Merge pull request #1022 from Boris-de/cipher_blacklistDaniel Gultsch2015-03-082-0/+25
|\ \ | | | | | | disable all really weak cipher suites
| * | disable all really weak cipher suitesBoris Wachtmeister2015-03-072-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With #959 all ciphers of the platform were enabled, but this also includes several suites that are considered as very weak, even down to NULL- and anon-ciphers which disable completely disable encryption and/or authentication. Especially the anon-ciphers could be easily used for a mitm-attack. To remove all weak ciphers a blacklist with patterns of cipher-names was added to Config.java. The blacklist is based on the "mandatory discards" that Mozilla suggests to not use for TLS-servers because they are weak or known to be broken. https://wiki.mozilla.org/Security/Server_Side_TLS#Mandatory_discards
* | | display geo uris as location. show 'send loction' in share menu if request ↵iNPUTmice2015-03-077-53/+230
|/ / | | | | | | location intent can be resolved
* | fixed enter is send optioniNPUTmice2015-03-062-6/+10
| |
* | fixed npe in message parseriNPUTmice2015-03-061-4/+4
| |
* | another teaser task for gsociNPUTmice2015-03-061-0/+5
| |
* | fixed markdown syntax in todo listiNPUTmice2015-03-061-4/+7
| |
* | added short todo listiNPUTmice2015-03-061-0/+15
| |
* | 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
|
* increment version codeiNPUTmice2015-02-281-1/+1
|
* catching out of memory run time exception in hasEnabledAccounts()iNPUTmice2015-02-281-0/+2
|
* pulled new translations from transifexiNPUTmice2015-02-275-23/+191
|
* use conversations green in notification lediNPUTmice2015-02-271-1/+1
|
* Merge pull request #1006 from QuentinC/developmentDaniel Gultsch2015-02-271-0/+1
|\ | | | | Some changes to the LED color in notifications !
| * Update NotificationService.javaQuentinC2015-02-271-1/+1
| | | | | | Revert led light color
| * - Update mBuilder in NotificationService.java to ensure that the led is ↵Quentin2015-02-271-1/+2
| | | | | | | | | | | | | | displayed at the right color. CF: http://stackoverflow.com/questions/14953793/android-notification-led-doesnt-use-my-color#comment20991762_14953793 - Changed led Color to green to remember the icon color and led times
* | 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
|
* version bump to 1.1.0iNPUTmice2015-02-261-2/+2
|
* 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
|
* version bump to 1.1.0-betaiNPUTmice2015-02-231-2/+2
|
* pulled new translations from transifexiNPUTmice2015-02-236-35/+84
|
* reset incoming chat state when going into backgroundiNPUTmice2015-02-231-0/+3
|
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2015-02-232-4/+2
|\
| * Merge pull request #1000 from kriztan/patch-4Daniel Gultsch2015-02-231-0/+1
| |\ | | | | | | added XEP-0085: Chat State Notifications to docs
| | * Update XEPs.mdChristian S.2015-02-231-0/+1
| |/ | | | | added XEP-0085: Chat State Notifications
| * Merge pull request #997 from betheg/otr4j_repositoryDaniel Gultsch2015-02-221-4/+1
| |\ | | | | | | otr4j has moved to Maven Central
| | * otr4j has moved to Maven CentralMichael2015-02-221-4/+1
| |/
* / get rid of some useless debuggingiNPUTmice2015-02-231-3/+0
|/
* init mode (first start) for StartConversationActivity (no up button) and ↵iNPUTmice2015-02-224-14/+44
| | | | avoid being started multiple times. fixed #995
* look at 5 muc users instead of 4 for tile cache clearingiNPUTmice2015-02-221-2/+2
|
* properly remove invalid avatariNPUTmice2015-02-222-0/+2
|