aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* update travis configDaniel Gultsch2015-05-041-1/+2
* update build tools and target apiDaniel Gultsch2015-05-041-2/+2
* updated contributor list in README.mdDaniel Gultsch2015-05-041-6/+7
* open market if share location plugin isn't installedDaniel Gultsch2015-05-041-0/+15
* Merge pull request #1167 from sattellite/patch-1Daniel Gultsch2015-05-041-2/+2
|\
| * Fix typos in URL to the projectAlexander Groshev2015-05-031-2/+2
|/
* turn send button in cancel button while in whisper modeDaniel Gultsch2015-05-0326-12/+250
* mark account with incompatible server when no sasl mechansim could be foundDaniel Gultsch2015-05-021-19/+24
* version bump to 1.4.0-alpha (in development)Daniel Gultsch2015-05-021-2/+2
* shut up linter. fixed buildDaniel Gultsch2015-05-021-1/+1
* replace send button with quick action button as long as no text has been enteredDaniel Gultsch2015-05-02135-530/+1539
* version bump to 1.3.01.3.0Daniel Gultsch2015-05-011-2/+2
* 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
|/