aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2272 from mimi89999/patch-3HEADmasterDaniel Gultsch2017-01-311-1/+1
|\
| * Correct a typo in the READMEMichel Le Bihan2017-01-311-1/+1
|/
* Merge pull request #2260 from alexara/patch-1Daniel Gultsch2017-01-261-6/+6
|\
| * Update README.mdDaniel Gultsch2017-01-261-1/+1
| * Merge branch 'master' into patch-1Daniel Gultsch2017-01-269-11/+70
| |\ | |/ |/|
* | Merge pull request #2259 from mabkenar/patch-2Daniel Gultsch2017-01-261-1/+1
|\ \
| * | small typo fixMasoud Abkenar2017-01-261-1/+1
* | | add explicit encryption hints to outgoing messagesDaniel Gultsch2017-01-262-1/+9
* | | use base64 encoding for file names uploaded with httpDaniel Gultsch2017-01-262-2/+22
* | | pulled translation from transifexDaniel Gultsch2017-01-264-7/+38
|/ /
| * Fixed typos in the readmealexara2017-01-261-6/+6
|/
* reset messagesLoaded when changing retention settingsDaniel Gultsch2017-01-257-18/+15
* add database and file migrations for 1.16.0Daniel Gultsch2017-01-253-5/+53
* share uri for bookmark direclty from Start ConversationDaniel Gultsch2017-01-252-1/+24
* transcode videos before sharing. change storage locationDaniel Gultsch2017-01-249-28/+131
* configurable local message retention period. (untested)Daniel Gultsch2017-01-2311-19/+108
* cleaning up crypto targets when conference member is getting removedDaniel Gultsch2017-01-222-0/+29
* change behaviour of back button to close finish activity. fixes #704Daniel Gultsch2017-01-221-1/+2
* Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2017-01-221-0/+1
|\
| * Merge pull request #2230 from AnBuKu/patch-1Daniel Gultsch2017-01-221-0/+1
| |\
| | * Added XEP-0384AnBuKu2017-01-101-0/+1
* | | make sure to set open conversations after connection with background serviceDaniel Gultsch2017-01-221-0/+2
* | | make sure to properly stop tagwriterDaniel Gultsch2017-01-223-2/+11
* | | upgrade dependency to ShortcutBadgerDaniel Gultsch2017-01-221-1/+1
* | | don't quote text when '>' is followed by numeberDaniel Gultsch2017-01-212-2/+17
* | | fixed some issues around ibbDaniel Gultsch2017-01-204-15/+58
* | | version bump to 1.15.5 + changelog1.15.5Daniel Gultsch2017-01-202-2/+6
* | | pulled translations from transifexDaniel Gultsch2017-01-204-17/+77
|/ /
* | write text in bold when highlighted in received muc messageDaniel Gultsch2017-01-202-1/+9
* | disable automatic foreground enabler. fixes #2239Daniel Gultsch2017-01-201-1/+1
* | modified highlight nick behaviour to better work with quotesDaniel Gultsch2017-01-201-7/+14
* | fixed regression introduced in previous commit.Daniel Gultsch2017-01-201-3/+6
* | don't prematurly mark conversation as read during activity start. fixes #2245Daniel Gultsch2017-01-201-2/+5
* | fixed pgp encrypted text quick sharing. fixes #2237Daniel Gultsch2017-01-172-5/+52
* | Merge pull request #2233 from SamWhited/scram-sha-2Daniel Gultsch2017-01-164-212/+263
|\ \
| * | Add SCRAM-SHA-2 supportSam Whited2017-01-154-212/+263
* | | fixed behaviour with non-default encryption masksDaniel Gultsch2017-01-161-14/+30
* | | version bump to 1.15.4 + changelog1.15.4Daniel Gultsch2017-01-162-2/+5
* | | pulled translations from transifexDaniel Gultsch2017-01-152-0/+95
|/ /
* | Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2017-01-151-1/+1
|\ \
| * | fixed subheading of domain hosting faq entryDaniel Gultsch2017-01-131-1/+1
* | | refactored whispermessage processingDaniel Gultsch2017-01-152-24/+27
* | | fixed linkifierDaniel Gultsch2017-01-151-1/+7
* | | pulled translations from transifexDaniel Gultsch2017-01-148-9/+99
* | | partially improved logging for receiving omemo messagesDaniel Gultsch2017-01-144-16/+25
|/ /
* | update readme to refer to domain hostingDaniel Gultsch2017-01-131-1/+6
* | pulled translations from transifexDaniel Gultsch2017-01-1224-75/+222
* | show doze warning when push is running on prosodyDaniel Gultsch2017-01-124-2/+10
* | refactor getServerIdentity() to parse disco result directlyDaniel Gultsch2017-01-121-34/+21
* | don't include 'before' reference in mam queries bound by timestampDaniel Gultsch2017-01-121-0/+2