aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* util.vcard: Add support for uri types in vcard4Kim Alvefur2014-07-091-0/+2
* Merge 0.10->trunkKim Alvefur2014-07-091-1/+1
|\
| * mod_dialback: Respect dwd config optionKim Alvefur2014-07-091-1/+1
* | mod_pep_plus: Only broadcast newly added subscriptionsKim Alvefur2014-07-081-9/+26
* | Merge 0.10->trunkKim Alvefur2014-07-0412-133/+170
|\|
| * mod_dialback.lua: Only check certificates on secure connectionsKim Alvefur2014-07-041-6/+8
| * mod_lastactivity, mod_legacyauth, mod_presence, mod_saslauth, mod_tls: Use th...Kim Alvefur2014-07-046-12/+13
| * mod_dialback: Short-circuit dialback auth if certificate is considered validKim Alvefur2014-07-042-1/+11
| * mod_dialback: Keep the same dialback secret across module reloadsKim Alvefur2014-07-031-1/+9
| * hostmanager, mod_dialback: Move generation of dialback secret out of coreKim Alvefur2014-05-222-2/+4
| * Merge 0.9->0.10Kim Alvefur2014-07-040-0/+0
| |\
| | * mod_register: get_child_text! (thanks Lloyd)Kim Alvefur2014-07-031-2/+2
| * | mod_tls: Simplify and use new ssl config merging in certmanagerKim Alvefur2014-07-031-15/+17
| * | core.portmanager: Simplify and take advantage of new ssl config merging in ce...Kim Alvefur2014-07-031-28/+9
| * | core.certmanager: Make create_context() support an arbitrary number of option...Kim Alvefur2014-07-031-3/+6
| * | core.certmanager: Use util.sslconfigKim Alvefur2014-07-031-71/+14
| * | util.sslconfig: Add lib to deal with LuaSec SSL context configsKim Alvefur2014-07-031-0/+87
| * | mod_presence: Move presence/initial event to correct place so it actually firesKim Alvefur2014-07-031-3/+1
* | | Merge 0.10->trunkKim Alvefur2014-06-302-1/+9
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-06-302-1/+9
| |\|
| | * net.dns: Fix duplicated cache insertions by limiting outstanding queries per ...Kim Alvefur2014-06-301-1/+8
| | * net.adns: Add missing local declarationKim Alvefur2014-06-251-0/+1
* | | net/server_*: Fix addclient: LuaSocket 3.0-rc1 sometimes returns EALREADY ins...daurnimator2014-06-252-2/+2
* | | Merge 0.10->trunkKim Alvefur2014-06-216-20/+30
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-06-211-14/+13
| |\|
| | * tools/ejabberd2prosody.lua: Fix JID building, node-less jids became @hostname...Kim Alvefur2014-06-171-14/+13
| | * mod_c2s: Fix traceback if c2s stream sent to componentKim Alvefur2014-05-101-1/+1
| * | mod_storage_{none,internal,sql}: Return error for unsupported (everything but...Kim Alvefur2014-06-203-5/+11
| * | mod_storage_sql2: Don't ignore failure in keyval_store:get() (thanks daurnima...Kim Alvefur2014-06-201-1/+3
| * | mod_presence: Fire a presence/initial event on initial presenceKim Alvefur2014-06-201-0/+3
* | | plugins/muc/muc: Fire broadcast presences event before creating full/anon pre...daurnimator2014-06-171-11/+13
* | | plugins/muc: Fix use of incorrect event on occupant joindaurnimator2014-06-173-4/+7
* | | plugins/muc/mod_muc: fix wrong event for persistencedaurnimator2014-06-111-1/+1
* | | plugins/muc/muc.lib: Deliver declines to in-room jids correctlydaurnimator2014-06-111-1/+5
* | | plugins/muc/muc.lib: Don't add invite/decline bodies if they already have onedaurnimator2014-06-061-10/+14
* | | plugins/muc/muc.lib: Use original decline as template for medated declinedaurnimator2014-06-061-2/+4
* | | plugins/muc/muc: When forwarding mediated invites; use filtered version of or...daurnimator2014-06-051-2/+4
* | | plugins/muc: Move 'x' filtering from occupant to utildaurnimator2014-06-052-14/+17
* | | mod_admin_telnet: Update muc:room(jid) and muc:list(host) to use the new MUC APIWaqas Hussain2014-06-051-3/+3
* | | plugins/muc/muc.lib: Fix incorrect whois logic (thanks mva)daurnimator2014-06-011-3/+3
* | | plugins/muc/muc.lib: Fix whois check when broadcasting occupant presenceWaqas Hussain2014-06-011-1/+1
* | | Merge with daurnimatorWaqas Hussain2014-05-301-0/+3
|\ \ \
| * | | plugins/muc/muc.lib: Fire event for presence broadcastdaurnimator2014-05-291-0/+3
* | | | util.vcard: Add missing local declarationKim Alvefur2014-05-281-0/+1
* | | | mod_pep_plus: Expose get_pep_service()Kim Alvefur2014-05-281-1/+1
* | | | util.vcard: Add support for converting to vcard4Kim Alvefur2014-05-281-0/+121
* | | | util.vcard: Library for parsing vCardsKim Alvefur2014-05-281-0/+454
* | | | Merge 0.10->trunkMatthew Wild2014-05-282-0/+15
|\ \ \ \ | | |/ / | |/| |
| * | | mod_admin_telnet: Add command to list MUC roomsMatthew Wild2014-05-281-0/+13
| * | | mod_s2s: Fire a 's2s-created' event when new s2s connections are initializedKim Alvefur2014-05-241-0/+2