aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2015-04-267-27/+27
|\
| * Merge 0.9->0.10Kim Alvefur2015-04-262-15/+8
| |\
| | * net.dns, mod_s2s: Add chasing of CNAMEs to net.dns and remove it from mod_s2sKim Alvefur2015-04-242-15/+8
| * | mod_c2s, mod_s2s: Collect statistics on number of connectionsKim Alvefur2015-04-262-0/+8
| * | mod_blocklist: Some cleanup [luacheck]Kim Alvefur2015-04-251-9/+8
| * | usermanager: Capitalize log messageKim Alvefur2015-04-251-1/+1
| * | mod_admin_adhoc: Remove special treatment of the "pending" roster entryKim Alvefur2015-04-251-2/+2
* | | mod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a to...Kim Alvefur2015-04-051-0/+3
* | | Merge 0.10->trunkKim Alvefur2015-04-051-6/+5
|\| |
| * | rostermanager: Fix roster upgrade code (thanks mva)Kim Alvefur2015-04-051-6/+5
* | | Merge 0.10->trunkKim Alvefur2015-04-051-0/+1
|\| |
| * | rostermanager: Add missing import of `type()`Florian Zeitz2015-04-031-0/+1
* | | Merge 0.10->trunkMatthew Wild2015-04-0310-730/+861
|\| |
| * | util-src/*.c: Per convention call luaL_error() as argument to returnFlorian Zeitz2015-04-033-5/+6
| * | sessionmanager: Rename parameter to avoid varible name conflictMatthew Wild2015-04-031-2/+2
| * | hostmanager: Rename variable to avoid shadowing 'type()' functionMatthew Wild2015-04-031-2/+2
| * | loggingmanager: Improve code structure (removes empty if branch)Matthew Wild2015-04-031-9/+9
| * | rostermanager: Remove unused parameterMatthew Wild2015-04-031-1/+1
| * | util-src/*.c: astyle --indent=tab --brackets=attach --indent-switches --break...Kim Alvefur2015-04-037-716/+846
* | | Merge 0.10->trunkKim Alvefur2015-04-036-29/+50
|\| |
| * | rostermanager, mod_roster, mod_presence: Move pending roster items to roster ...Kim Alvefur2015-04-033-26/+32
| * | prosodyctl: Use ssl.loadcertificate instead of ssl.x509.load, as the ssl.x509...Kim Alvefur2015-04-021-1/+1
| * | prosodyctl: Document magic commit IDPaul Aurich2015-04-011-0/+1
| * | util.table, Makefile: New C module that allows pre-allocation of tables to im...Matthew Wild2015-03-312-2/+16
* | | Merge 0.10->trunkMatthew Wild2015-03-2732-1367/+3867
|\ \ \ | |/ / |/| |
| * | Merge 0.10->trunkKim Alvefur2015-03-271-16/+6
| |\ \
| * \ \ Merge 0.10->trunkMatthew Wild2015-03-268-27/+207
| |\ \ \
| * \ \ \ Merge 0.10->trunkMatthew Wild2015-03-244-6/+58
| |\ \ \ \
| * \ \ \ \ Merge 0.10->trunkMatthew Wild2015-02-245-8/+22
| |\ \ \ \ \
| * \ \ \ \ \ MergeMatthew Wild2015-02-231-21/+34
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge 0.10->trunkKim Alvefur2015-02-093-22/+45
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2015-01-312-1/+11
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge 0.10->trunkKim Alvefur2015-01-261-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2015-01-2113-17/+370
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | net.server_select: Remove unused codedaurnimator2015-01-191-6/+0
| * | | | | | | | | | net.server_select: Remove socket.sleep call from main loopdaurnimator2015-01-191-8/+0
| * | | | | | | | | | net.server_select: Remove do-nothing os_difftime callsdaurnimator2015-01-191-5/+3
| * | | | | | | | | | net.server_select: In add_task timer callback, use passed in time rather than...daurnimator2015-01-151-2/+1
| * | | | | | | | | | net.server_select: Fix timers not being fired until another timer fixes (or 1...daurnimator2015-01-151-16/+8
| * | | | | | | | | | net.cqueues: Fix incorrect version checkdaurnimator2015-01-161-1/+1
| * | | | | | | | | | net.cqueues: Fixes hardcoded timeout for first iterationdaurnimator2015-01-131-11/+16
| * | | | | | | | | | net.cqueues: Add workaround for luaevent callback getting collecteddaurnimator2015-01-061-1/+5
| * | | | | | | | | | mod_muc: Add muc-add-history event to allow modules to override default histo...Matthew Wild2015-01-061-1/+8
| * | | | | | | | | | Merge 0.10 -> trunkWaqas Hussain2014-12-167-7/+18
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-11-222-10/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkKim Alvefur2014-11-204-20/+36
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.10->trunkMatthew Wild2014-11-202-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | net.cqueues: Add module that allows use of cqueues while still using net.serv...daurnimator2014-11-181-0/+65
| * | | | | | | | | | | | | | plugins/muc/muc.lib: Allow muc-broadcast-presence event listeners to modify n...daurnimator2014-11-141-2/+9
| * | | | | | | | | | | | | | plugins/muc/muc.lib: Don't expose actor jids to users when anonymousdaurnimator2014-11-111-27/+39
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 14:44:09 +0000