aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* handle conference invites differently to deal with killed activities. fixes #...Daniel Gultsch2015-05-124-31/+67
* don't set unknown error in mucDaniel Gultsch2015-05-121-2/+0
* don't reinit conversation when coming back to activity. avoids unnecessary sc...Daniel Gultsch2015-05-121-3/+1
* pulled updated translations from transifexDaniel Gultsch2015-05-112-2/+4
* 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-114-61/+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
|\
| * Merge pull request #1180 from ashimokawa/developmentDaniel Gultsch2015-05-091-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-1032-9/+9
* | 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
* version code bumpedDaniel Gultsch2015-05-071-1/+1
* 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
* bumped version codeDaniel Gultsch2015-05-051-1/+1
* 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
* 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