aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* pulled translations from transifexDaniel Gultsch2015-05-012-0/+70
* added config option to be a bit more verbose about stanza countsDaniel Gultsch2015-04-292-4/+15
* pulled translations from transifexDaniel Gultsch2015-04-298-1/+607
* version bump to 1.3.0-betaDaniel Gultsch2015-04-281-2/+2
* npe check after reading image uriDaniel Gultsch2015-04-281-3/+3
* adjust dimens slightly to work with v21+ (v21 doesn't count the navigation bar)Daniel Gultsch2015-04-283-0/+0
* increased padding on image buttons on v21 to match material guidelinesDaniel Gultsch2015-04-285-7/+9
* made material icons smaller (24dp)Daniel Gultsch2015-04-28135-20/+18
* stop conference details from crashing when rotating the screenDaniel Gultsch2015-04-281-0/+3
* fixed npe when rotating screen in contact details activityDaniel Gultsch2015-04-281-4/+8
* print stack trace on io errorDaniel Gultsch2015-04-281-6/+6
* escape nick in highlight regex patternDaniel Gultsch2015-04-281-1/+1
* revert undo timeout to a more reasonable valueDaniel Gultsch2015-04-281-1/+1
* increased padding around switches in manage accountsDaniel Gultsch2015-04-271-2/+4
* handle returning from camera without pictureDaniel Gultsch2015-04-271-0/+3
* use xmppserviceconnection to send iq packets in jingle connectionDaniel Gultsch2015-04-261-4/+4
* hard code bitmap configsDaniel Gultsch2015-04-261-2/+2
* added changelog. removed deprecated todo listDaniel Gultsch2015-04-262-23/+8
* version bump to 1.3.0-betaDaniel Gultsch2015-04-261-2/+2
* pulled translations from transifexDaniel Gultsch2015-04-269-3/+205
* Merge pull request #1135 from BrianBlade/manage_certificatesDaniel Gultsch2015-04-254-5/+124
|\
| * Add option to remove manually approved certificatesBrianBlade2015-04-194-5/+124
* | fixed service discovery by properly storing and checking identitiesDaniel Gultsch2015-04-253-30/+50
* | fixed #1039Daniel Gultsch2015-04-251-0/+3
* | Merge pull request #1146 from BrianBlade/minor_otr_tweaksDaniel Gultsch2015-04-253-6/+17
|\ \
| * | OTR: Fix onContactStatusChanged & dont archive OTRBrianBlade2015-04-213-6/+17
* | | cleaned up file handlingDaniel Gultsch2015-04-253-71/+87
* | | send invite to other instanzes after creating ad hoc conference. fixes #1136Daniel Gultsch2015-04-231-0/+8
* | | fixed direct invitesDaniel Gultsch2015-04-211-12/+28
|/ /
* | added missing translations from transifexDaniel Gultsch2015-04-2111-8/+24
* | Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-04-201-2/+3
|\ \
| * | added reference to the location plugin to READMEDaniel Gultsch2015-04-201-1/+2
| * | added amazon app store link (us store)Daniel Gultsch2015-04-201-1/+1
* | | pulled latest translations from transifexDaniel Gultsch2015-04-206-3/+727
|/ /
* | always hide pgp snackbar after decrypting a message. fixes #1075Daniel Gultsch2015-04-201-0/+1
* | removed some dead codeDaniel Gultsch2015-04-201-19/+0
* | fixed weird touch on snackbar switched conversation bugDaniel Gultsch2015-04-201-3/+2
* | some code clean up to fix some rare NPE’sDaniel Gultsch2015-04-192-4/+7
|/
* increased undo delayiNPUTmice2015-04-171-1/+1
* fixed a bug in DNS helper code. fixes #1130iNPUTmice2015-04-162-2/+2
* bumped version to 1.3.0-alphaiNPUTmice2015-04-151-2/+2
* some bug fixes concerning 0byte files. fixes #1126iNPUTmice2015-04-152-1/+2
* maintain state when rotating settings activityiNPUTmice2015-04-142-18/+26
* Merge branch 'BrianBlade-dont_trust_cas_preference' into developmentiNPUTmice2015-04-145-5/+28
|\
| * Merge branch 'dont_trust_cas_preference' of https://github.com/BrianBlade/Con...iNPUTmice2015-04-145-5/+28
|/|
| * Add option to use MTM without default TrustManagerBrianBlade2015-04-115-4/+27
* | always show save button when account info was modified. fixes #918iNPUTmice2015-04-141-5/+9
* | fixed disable account when sliding and not clicking the toggleiNPUTmice2015-04-132-8/+9
* | fixed typosiNPUTmice2015-04-132-2/+2
* | Merge pull request #1123 from lookshe/developmentDaniel Gultsch2015-04-131-10/+18
|\ \