aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge 0.9->trunkMatthew Wild2013-07-110-0/+0
|\|
| * mod_storage_sql2: Remove from 0.9Matthew Wild2013-07-111-237/+0
* | mod_storage_sql2: Support XML serialization for stanzas.Kim Alvefur2013-07-101-0/+9
* | mod_storage_sql2: Keep available store types in a tableKim Alvefur2013-07-101-2/+7
* | mod_storage_sql2: Fix iteration over users and storesKim Alvefur2013-07-101-2/+16
* | mod_storage_sql2: Make sure the user field is not NULLKim Alvefur2013-07-101-4/+4
* | Merge 0.9->trunkKim Alvefur2013-07-102-3/+3
|\|
| * net.dns, net.adns: Make sure errors from net.server are propagated (thanks as...Kim Alvefur2013-07-102-3/+3
* | Merge 0.9->trunkMatthew Wild2013-07-092-1/+7
|\|
| * mod_component: Local imports for some functions, including xpcallMatthew Wild2013-07-081-0/+1
| * mod_bosh: pcall() core_process_stanza per stanza, to bring in line with other...Matthew Wild2013-07-081-1/+4
| * mod_bosh: Only pass stanza to core_process_stanza if it wasn't dropped by fil...Matthew Wild2013-07-081-1/+3
* | Merge 0.9->trunkMatthew Wild2013-07-081-1/+6
|\|
| * mod_component: xpcall() stanza processing, as per other listeners, preventing...Matthew Wild2013-07-081-1/+6
* | prosodyctl: Import local_addresses from the new util.net intead of luasocketKim Alvefur2013-07-011-1/+1
* | Merge 0.9->trunkKim Alvefur2013-06-291-1/+1
|\|
| * mod_admin_adhoc: Fix node of the "Get List of Online Users" commandFlorian Zeitz2013-06-291-1/+1
* | MergeMatthew Wild2013-06-2938-1093/+1666
|\ \
| * | Merge 0.9->trunkMatthew Wild2013-06-292-1/+2
| |\|
| | * util.pposix: setrlimit(): Add missing return on error when an incorrect numbe...Matthew Wild2013-06-281-0/+1
| * | Merge 0.9->trunkMatthew Wild2013-06-261-4/+13
| |\ \
| * | | mod_s2s: Add missing global hook for read-timeoutKim Alvefur2013-06-261-0/+2
| * | | Merge 0.9->trunkMatthew Wild2013-06-241-1/+1
| |\ \ \
| * | | | mod_admin_telnet: Refactor s2s:show()Kim Alvefur2013-06-201-55/+55
| * | | | mod_admin_telnet: Generate session names the same way as in s2smanagerKim Alvefur2013-06-201-1/+1
| * | | | mod_admin_telnet: Refactor s2s:close and s2s:closeallKim Alvefur2013-06-201-53/+15
| * | | | mod_register: Fix indentationKim Alvefur2013-06-191-1/+1
| * | | | mod_admin_telnet: Refactor s2s:showcert()Kim Alvefur2013-06-191-8/+3
| * | | | net.dns: Support IPv6 addresses in resolv.confFlorian Zeitz2013-06-181-6/+13
| * | | | Merge 0.9->trunkMatthew Wild2013-06-183-23/+121
| |\ \ \ \
| * | | | | mod_tls: Remove debug statementKim Alvefur2013-06-161-1/+0
| * | | | | additional fix for erlparse loading in ejabberd2prosody.luaVadim Misbakh-Soloviov2013-06-141-0/+1
| * | | | | package{,c}path fixes for migration toolsVadim Misbakh-Soloviov2013-06-145-5/+34
| * | | | | Merge the mergeMatthew Wild2013-06-139-223/+296
| |\ \ \ \ \
| | * | | | | mod_muc: Add Ad-Hoc command to destroy MUC roomsFlorian Zeitz2013-06-051-0/+36
| | * | | | | mod_muc: Utilize mod_disco, instead of reimplementing disco handlingFlorian Zeitz2013-06-051-14/+9
| | * | | | | mod_pubsub: Utilize mod_disco, instead of reimplementing disco handlingFlorian Zeitz2013-06-051-130/+108
| | * | | | | mod_disco: Allow ansering disco requests including nodes, and adding custom i...Florian Zeitz2013-06-041-8/+35
| | * | | | | mod_http_files: Put the MIME type map in a global shared tableKim Alvefur2013-06-131-1/+1
| | * | | | | util.sasl.external: Add SASL EXTERNAL mechanismKim Alvefur2013-06-132-0/+26
| | * | | | | prosody: Remove global ssl context, no longer usedKim Alvefur2013-06-131-6/+0
| | * | | | | mod_tls: Refactor to allow separate SSL configuration for c2s and s2s connect...Kim Alvefur2013-06-131-26/+36
| | * | | | | certmanager: Overhaul of how ssl configs are built.Kim Alvefur2013-06-131-38/+45
| * | | | | | Merge 0.9->trunkMatthew Wild2013-06-131-1/+5
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge 0.9->trunkMatthew Wild2013-06-131-2/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-06-130-0/+0
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-06-131-0/+5
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-06-132-1/+4
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge 0.9->trunkMatthew Wild2013-06-111-0/+2
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | mod_c2s, mod_s2s: Fire an event on read timeoutsKim Alvefur2013-06-112-3/+16