aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2015-03-271-16/+6
|\
| * Merge with mergeKim Alvefur2015-03-271-18/+11
| |\
| * \ Merge 0.9->0.10 againKim Alvefur2015-03-277-4/+181
| |\ \
* | \ \ Merge 0.10->trunkMatthew Wild2015-03-268-27/+207
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge 0.9->0.10Matthew Wild2015-03-268-27/+207
| |\ \ \ | | |/ / | |/| / | | |/
| | * Tagging 0.9.8Matthew Wild2015-03-240-0/+0
| | * mod_s2s: to/from attributes are required on s2s stream headers. Set them to '...0.9.8Matthew Wild2015-03-241-1/+1
| | * sessionmanager: Return 'not-allowed' error instead of the non-existent 'alrea...Matthew Wild2015-03-241-1/+1
| | * mod_http: Return a static string from module:http_url() when no ports are ena...Kim Alvefur2015-03-231-0/+2
| | * mod_http: Log a debug message when adding new http apps and warn if no http p...Kim Alvefur2015-03-231-0/+6
| | * Backout 7726b627c3eaKim Alvefur2015-03-231-1/+0
| | * utf8_sequences.txt: OopsMatthew Wild2015-03-231-1/+1
| | * tests: Add UTF-8 validity testsMatthew Wild2015-03-233-0/+72
| | * Merge with ZashMatthew Wild2015-03-232-1/+2
| | |\
| | | * mod_http: Log event name when adding a HTTP app's hooksMatthew Wild2015-03-141-0/+1
| | | * net.http.server: Log event name when firing a request eventMatthew Wild2015-03-141-1/+1
| | * | util.encodings: Expose UTF-8 validation and length checking functionsKim Alvefur2015-03-231-0/+28
| | * | util.encodings: Perform validation of UTF-8 strings before passing to libidn ...Kim Alvefur2015-03-231-3/+67
| | |/
* | | Merge 0.10->trunkMatthew Wild2015-03-244-6/+58
|\| |
| * | prosodyctl: Expand plugin paths and attempt to identify prosody-modules check...Kim Alvefur2015-01-211-1/+14
| * | prosodyctl: Use util.mercurial to identify hg repository and revisionKim Alvefur2015-01-211-1/+4
| * | util.mercurial: Utility functions for Mercurial repositoriesKim Alvefur2015-01-211-0/+34
| * | prosodyctl: Show relative paths in aboutKim Alvefur2014-07-041-4/+6
| * | Backed out 35ebcb733c4cKim Alvefur2015-03-231-1/+0
| * | statsmanager: Fire event at the start of collection to allow for pollingKim Alvefur2015-03-101-0/+1
* | | Merge 0.10->trunkMatthew Wild2015-02-245-8/+22
|\| |
| * | Merge 0.9->0.10Matthew Wild2015-02-241-0/+6
| |\|
| | * configure: Fix for commit cd0088c73daf - update LIBDIR if --prefix is set and...Matthew Wild2015-02-241-0/+6
| | * mod_admin_telnet: Require util.pposix (fixes #471)Matthew Wild2015-02-201-0/+1
| * | statsmanager: Perform an initial collection right after startup is completedKim Alvefur2015-02-221-0/+1
| * | Merge 0.9->0.10Kim Alvefur2015-02-214-8/+15
| |\|
| | * util.datamanager: Check that the global 'prosody' exists before using it (fix...Kim Alvefur2015-02-201-1/+1
| | * configure, Makefile: Add --libdir option to ./configure, allowing you to over...Matthew Wild2015-02-203-7/+14
* | | MergeMatthew Wild2015-02-231-21/+34
|\ \ \
| * | | Merge 0.10->trunkKim Alvefur2015-02-093-22/+45
| |\| |
| | * | certmanager: Fix compat for MattJs old LuaSec forkKim Alvefur2015-02-051-1/+1
| | * | certmanager: Fix previous commitKim Alvefur2015-02-051-1/+1
| | * | certmanager: Limit certificate chain depth to 9Kim Alvefur2015-02-051-0/+1
| | * | certmanager: Options that appear to be available since LuaSec 0.2Kim Alvefur2015-02-051-3/+3
| | * | certmanager: Improve "detection" of features that depend on LuaSec versionKim Alvefur2015-02-051-11/+15
| | * | certmanager: Add locals for ssl.context and ssl.x509Kim Alvefur2015-02-051-3/+5
| | * | certmanager: Early return from the entire module if LuaSec is unavailableKim Alvefur2015-02-051-12/+18
* | | | Merge 0.10->trunkMatthew Wild2015-01-312-1/+11
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge with 0.10Matthew Wild2015-01-311-0/+10
| |\ \
| | * | sessionmanager: Add pre-resource-bind event that would let plugins have a say...Kim Alvefur2015-01-301-0/+10
| * | | util.statistics: Return 0 as percentile if data out of rangeMatthew Wild2015-01-301-1/+1
| |/ /
* | | Merge 0.10->trunkKim Alvefur2015-01-261-1/+1
|\| |
| * | Merge 0.9->0.10Kim Alvefur2015-01-261-1/+1
| |\|
| | * stanza_router: Fix routing of 'error' IQs with multiple childs (thanks Pawel)Kim Alvefur2015-01-061-1/+1
* | | Merge 0.10->trunkMatthew Wild2015-01-2113-17/+370
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 10:19:07 +0000