aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 code1.1.0iNPUTmice2015-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-beta1.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
|
* clear muc tiles cache only when necessaryiNPUTmice2015-02-212-1/+22
|
* added typing notifications through XEP-0085. fixed #210iNPUTmice2015-02-2114-53/+267
|
* version bump to 1.0.5iNPUTmice2015-02-191-2/+2
|
* fixed #993iNPUTmice2015-02-191-1/+2
|
* launch edit account activity when starting Conversations for the first time ↵iNPUTmice2015-02-191-5/+9
| | | | (fixed regression)
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2015-02-181-0/+1
|\
| * Merge pull request #992 from kriztan/patch-4Daniel Gultsch2015-02-181-0/+1
| |\ | | | | | | added XEP-0092: Software Version to XEPs.md
| | * added XEP-0092: Software Version to XEPs.mdChristian S.2015-02-181-0/+1
| |/
* | made xmpp uris case insensitiveiNPUTmice2015-02-181-3/+3
| |
* | always call to cancel before loading new avatarsiNPUTmice2015-02-182-24/+28
| |
* | always go through reconnect method instead of just starting XmppConnection ↵iNPUTmice2015-02-181-4/+1
| | | | | | | | threads
* | avoid weird npe. fixed #991iNPUTmice2015-02-181-1/+3
|/