aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge with trunkMatthew Wild2012-01-2230-388/+559
|\
| * mod_admin_telnet: Use module:shared() to expose commands table and default co...Matthew Wild2012-01-221-4/+2
| * moduleapi: Add module:shared(), a way to easily share data between multiple l...Matthew Wild2012-01-221-0/+23
| * moduleapi: Add module:depends(), a way to safely depend upon another module a...Matthew Wild2012-01-221-0/+29
| * modulemanager: load(): Return and use the correct module objectMatthew Wild2012-01-221-2/+2
| * util.helpers: After nearly 'fixing' this code, I conclude it instead only des...Matthew Wild2012-01-221-1/+1
| * modulemanager: Cleanup some unused variables, imports, whitespace and add a c...Matthew Wild2012-01-221-3/+1
| * modulemanager, moduleapi: Replace hooks multitable with an event_handlers map...Matthew Wild2012-01-222-21/+12
| * modulemanager: Drop unnecessary prosody_events localMatthew Wild2012-01-221-3/+1
| * modulemanager: Some reorganisation. Only external change is (should be) that ...Matthew Wild2012-01-221-62/+94
| * modulemanager: Move in-module API functions to core.moduleapi (half the file ...Matthew Wild2012-01-222-212/+240
| * mod_compression: Change default compression level to 7Kim Alvefur2012-01-191-1/+1
| * mod_compression: Use get_option_numberKim Alvefur2012-01-191-5/+1
| * Merge with trunkMatthew Wild2012-01-181-6/+25
| |\
| | * util.json: Added function encode_ordered(object).Waqas Hussain2012-01-181-6/+25
| * | Merge with 0.9Matthew Wild2012-01-181-1/+1
| |\ \
| | * | mod_watchregistrations: Fixed an undefined global access (thanks Medics).Waqas Hussain2011-12-121-1/+1
| | * | prosodyctl: Adjust description of 'reload' command (thanks crocket)Matthew Wild2012-01-171-1/+1
| * | | mod_tls: Fix log statement (thanks Zash)Matthew Wild2012-01-181-1/+1
| | |/ | |/|
| * | xmppserver_listener: Only re-attempt connection on disconnect if it was an un...Matthew Wild2012-01-171-1/+1
| * | Merge with 0.9Matthew Wild2012-01-171-2/+2
| |\|
| | * net.http: Pass response object to callbacks (feels hacky, should this be pass...Matthew Wild2012-01-171-2/+2
| | * util.throttle: Fix 'outstanding' return valueMatthew Wild2012-01-131-1/+1
| | * util.throttle: Import setmetatableMatthew Wild2012-01-131-0/+1
| * | net.server_event: Fix :pause() to actually stop reading from the socket, rath...Matthew Wild2012-01-161-1/+8
| * | util.throttle: Fix 'outstanding' return valueMatthew Wild2012-01-131-1/+1
| * | util.throttle: Import setmetatableMatthew Wild2012-01-131-0/+1
| * | util.debug: Adjust level within get_locals_table() to account for the additio...Matthew Wild2012-01-131-0/+1
| * | mod_component: removed unused variable reference, added "flagging" to assert ...Marco Cirillo2012-01-061-2/+2
| * | net.xmppcomponent_listener: removed unused variable reference.Marco Cirillo2012-01-061-2/+0
| * | util.stanza: Remove unused __add metamethodMatthew Wild2011-12-211-5/+0
| * | s2smanager: Fix missing import of 'type' (thanks darkrain)Matthew Wild2011-12-201-2/+2
| * | hostmanager: Add send() method to hostsMatthew Wild2011-12-161-0/+12
| * | usermanager: Prep admin JIDs (fixes issue#276).Waqas Hussain2011-12-141-2/+4
| * | s2smanager: Don't throw an error when the "interface" config option is a stri...Waqas Hussain2011-12-141-0/+3
| * | mod_bosh: Remove unused reference to lxpWaqas Hussain2011-12-141-1/+0
| * | sessionmanager: Remove unused reference to modulemanagerMatthew Wild2011-12-131-1/+0
| * | s2smanager: Remove unused reference to modulemanagerMatthew Wild2011-12-131-1/+0
| * | modulemanager: Remove 'config' from module environments (no modules use it th...Matthew Wild2011-12-131-1/+1
| * | mod_watchregistrations: Fixed an undefined global access (thanks Medics).Waqas Hussain2011-12-121-1/+1
| * | util/datamanager: Use package.config to figure out directory seperatorJames Callahan2011-12-121-3/+3
| * | configure: Add 'openbsd' preset (thanks xavier)Matthew Wild2011-12-111-1/+10
| * | mod_adhoc: Use module:handle_items()Matthew Wild2011-12-101-11/+5
| * | util.array: Avoid globals.Waqas Hussain2011-12-091-6/+11
| * | util.array: Make array:push() chainable.Waqas Hussain2011-12-091-0/+1
| * | mod_bosh: Fixed use of a private HTTP request property.Waqas Hussain2011-12-091-1/+1
| * | net.httpserver: Removed unused import.Waqas Hussain2011-12-091-1/+0
| * | migrator/jabberd14: Minor refactoring.Waqas Hussain2011-12-091-9/+6
| * | configure: Remove obsolete option '--require-config'Matthew Wild2011-12-081-6/+0
| * | s2smanager: Store port specified by SRV recordsFlorian Zeitz2011-12-071-5/+11