aboutsummaryrefslogtreecommitdiffstats
path: root/core
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkMatthew Wild2015-05-193-51/+64
|\
| * loggingmanager: Rename function arguments to avoid name conflict [luacheck] (...Matthew Wild2015-05-181-8/+8
| * configmanager: Refactor function to avoid re-declaring local variable [luacheck]Matthew Wild2015-05-181-9/+11
| * configmanager: Rename unused function arguments [luacheck]Matthew Wild2015-05-181-3/+3
| * configmanager: Rename variable to avoid name conflicts [luacheck]Matthew Wild2015-05-181-10/+10
| * configmanager: Rename unused function argument [luacheck]Matthew Wild2015-05-181-1/+1
| * configmanager: Remove unnecessary function localizations [luacheck]Matthew Wild2015-05-181-2/+1
| * configmanager: Rename variable to avoid name conflict [luacheck]Matthew Wild2015-05-181-15/+12
| * configmanager: Rename variable to avoid name conflict [luacheck]Matthew Wild2015-05-181-3/+3
| * hostmanager: Metatable with __tostring on hostsKim Alvefur2015-05-181-0/+15
* | Merge 0.10->trunkKim Alvefur2015-05-141-0/+1
|\|
| * Merge 0.9->0.10Kim Alvefur2015-05-141-0/+1
| |\
| | * s2smanager: Make sure destroyed sessions have a sends2s methodKim Alvefur2015-05-141-0/+1
* | | Merge 0.10->trunkKim Alvefur2015-05-131-4/+4
|\| |
| * | portmanager: Remove unused argument from function [luacheck]Matthew Wild2015-05-131-1/+1
| * | portmanager: Rename variable to avoid name conflict [luacheck]Matthew Wild2015-05-131-2/+2
| * | portmanager: Add luacheck annotationsMatthew Wild2015-05-131-1/+1
* | | Merge 0.10->trunkMatthew Wild2015-05-131-4/+4
|\| |
| * | sessionmanager: Rename argument to avoid name clash with local variable [luac...Matthew Wild2015-05-061-2/+2
| * | sessionmanager: Rename unused loop variables to '_' [luacheck]Matthew Wild2015-05-061-2/+2
* | | Merge 0.10->trunkMatthew Wild2015-05-069-35/+49
|\| |
| * | portmanager, s2smanager, sessionmanager, stanza_router, storagemanager, userm...Matthew Wild2015-05-066-8/+10
| * | rostermanager: Variable rename for clarity and to avoid name clash [luacheck]Matthew Wild2015-05-061-4/+4
| * | modulemanager: Add luacheck annotationsMatthew Wild2015-05-061-3/+4
| * | modulemanager: Remove unused import of pcall #luacheckMatthew Wild2015-05-061-2/+2
| * | moduleapi: Import util.stanza required for module:broadcast()Matthew Wild2015-05-061-0/+1
| * | moduleapi: Add luacheck annotationMatthew Wild2015-05-061-1/+1
| * | moduleapi: Minor variable renaming to avoid clashes with the 'type' functionMatthew Wild2015-05-061-14/+14
| * | moduleapi: Clear self.event_handlers when unhooking an event, to prevent leaksMatthew Wild2015-05-061-0/+1
| * | moduleapi: module:measure_event(), module:measure_global_event(): Fix copy/pa...Matthew Wild2015-05-061-2/+2
| * | moduleapi: Remove accidental use of undefined and unnecessary 'priority' vari...Matthew Wild2015-05-061-1/+1
| * | moduleapi: Add module:broadcast() to send a stanza to a list of JIDsMatthew Wild2015-05-061-0/+9
* | | Merge 0.10->trunkKim Alvefur2015-05-031-0/+31
|\| |
| * | moduleapi: New methods for modules to conveniently wrap eventsMatthew Wild2015-04-281-0/+12
| * | moduleapi: Experimental API for modules to measure the rate+duration of eventsMatthew Wild2015-04-281-0/+19
* | | Merge 0.10->trunkKim Alvefur2015-04-261-1/+1
|\| |
| * | usermanager: Capitalize log messageKim Alvefur2015-04-251-1/+1
* | | 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-033-12/+12
|\| |
| * | 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
* | | Merge 0.10->trunkKim Alvefur2015-04-031-15/+25
|\| |
| * | rostermanager, mod_roster, mod_presence: Move pending roster items to roster ...Kim Alvefur2015-04-031-15/+25
| * | Merge 0.9->0.10 (third time lucky)Matthew Wild2015-03-271-1/+1
| |\|
* | | Merge 0.10->trunkMatthew Wild2015-03-261-1/+1
|\ \ \