aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java (follow)
Commit message (Expand)AuthorAgeFilesLines
* don't reinit conversation when coming back to activity. avoids unnecessary sc...Daniel Gultsch2015-05-121-3/+1
* avoid using paragraph style breaks by accidentDaniel Gultsch2015-05-112-4/+7
* increased space between merged messages a bitDaniel Gultsch2015-05-111-1/+1
* add a little bit of space between merged messages.Daniel Gultsch2015-05-112-2/+8
* no font padding on red heartsDaniel Gultsch2015-05-111-2/+4
* rewrote parts of message adapter to avoid using NULL viewsDaniel Gultsch2015-05-113-54/+41
* optimized heart render code a bitDaniel Gultsch2015-05-102-7/+8
* added white heart to new rendering as wellDaniel Gultsch2015-05-102-1/+4
* Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2015-05-101-1/+5
|\
| * only forward incoming chat messages to Pebble App and GadgetbridgeAndreas Shimokawa2015-05-081-1/+5
* | changed conversation red to material redDaniel Gultsch2015-05-101-2/+2
* | paint single unicode hearts as red and slightly largerDaniel Gultsch2015-05-103-36/+66
|/
* config option to reset attempt counts when changing network (default=true)Daniel Gultsch2015-05-082-8/+19
* throw proper exception before changing account into error stateDaniel Gultsch2015-05-081-11/+31
* fixed encrypted ibb file transfer which was broken with ART. fixes #1172Daniel Gultsch2015-05-072-26/+33
* fixed npe when binval value of vcard avatar is nullDaniel Gultsch2015-05-071-2/+3
* fixed npe when missing instructions on failed registerDaniel Gultsch2015-05-061-7/+5
* fwiw don't allow stanza count to go over MAX_INTDaniel Gultsch2015-05-061-0/+9
* avoid fetching avatars multiple times in parallelDaniel Gultsch2015-05-051-8/+39
* r/o support for vcard avatars. pep avatars will be preferedDaniel Gultsch2015-05-056-28/+127
* enabled sm logging by default at least for development branchDaniel Gultsch2015-05-051-1/+1
* clean up in attachment chooser code. fixed #1168Daniel Gultsch2015-05-041-51/+51
* open market if share location plugin isn't installedDaniel Gultsch2015-05-041-0/+15
* Fix typos in URL to the projectAlexander Groshev2015-05-031-2/+2
* turn send button in cancel button while in whisper modeDaniel Gultsch2015-05-031-12/+30
* mark account with incompatible server when no sasl mechansim could be foundDaniel Gultsch2015-05-021-19/+24
* replace send button with quick action button as long as no text has been enteredDaniel Gultsch2015-05-022-106/+192
* added config option to be a bit more verbose about stanza countsDaniel Gultsch2015-04-292-4/+15
* npe check after reading image uriDaniel Gultsch2015-04-281-3/+3
* made material icons smaller (24dp)Daniel Gultsch2015-04-282-3/+3
* 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
* 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
* Merge pull request #1135 from BrianBlade/manage_certificatesDaniel Gultsch2015-04-251-0/+91
|\
| * Add option to remove manually approved certificatesBrianBlade2015-04-191-0/+91
* | 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
|/ /
* | 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