prosody
22942eda53f8
plugins/mod_privacy.lua

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Annotate

plugins/mod_privacy.lua @ 7497:22942eda53f8

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Wed, 13 Jul 2016 18:43:33 +0200
parent 7460:726b088f9408
child 8774:cac4bd0d3335
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1522
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
1 -- Prosody IM
2925
692b3c6c5bd2 Merge 0.6->0.7
Matthew Wild <mwild1@gmail.com>
parents: 2616 2923
diff changeset
2 -- Copyright (C) 2009-2010 Matthew Wild
692b3c6c5bd2 Merge 0.6->0.7
Matthew Wild <mwild1@gmail.com>
parents: 2616 2923
diff changeset
3 -- Copyright (C) 2009-2010 Waqas Hussain
2496
f18b882af1d1 mod_privacy: Imported from prosody-modules.
Waqas Hussain <waqas20@gmail.com>
parents: 1522
diff changeset
4 -- Copyright (C) 2009 Thilo Cestonaro
5776
bd0ff8ae98a8 Remove all trailing whitespace
Florian Zeitz <florob@babelmonkeys.de>
parents: 5500
diff changeset
5 --
1522
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
6 -- This project is MIT/X11 licensed. Please see the
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
7 -- COPYING file in the source package for more information.
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
8 --
569d58d21612 Add copyright header to those files missing one
Matthew Wild <mwild1@gmail.com>
parents: 1293
diff changeset
9
3317
82b17b199d68 mod_privacy: Add service discovery feature.
Waqas Hussain <waqas20@gmail.com>
parents: 3313
diff changeset
10
6346
ba7c86406d31 mod_privacy: Remove, leave a log message about being replaced by mod_blocklist and load that instead
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
11 -- COMPAT w/ pre 0.10
ba7c86406d31 mod_privacy: Remove, leave a log message about being replaced by mod_blocklist and load that instead
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
12 module:log("error", "The mod_privacy plugin has been replaced by mod_blocklist. Please update your config. For more information see https://prosody.im/doc/modules/mod_privacy");
ba7c86406d31 mod_privacy: Remove, leave a log message about being replaced by mod_blocklist and load that instead
Kim Alvefur <zash@zash.se>
parents: 5776
diff changeset
13 module:depends("blocklist");