Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.8->trunk | Waqas Hussain | 2011-01-29 | 4 | -16/+22 |
|\ | |||||
| * | stanza_router: Return a <bad-request/> error on invalid IQ type. | Waqas Hussain | 2011-01-29 | 1 | -2/+3 |
| | | |||||
| * | mod_ping: Use util.datetime to generate timestamp in ad-hoc command response ↵ | Waqas Hussain | 2011-01-29 | 1 | -1/+3 |
| | | | | | | | | (instead of the current use of os.date, which doesn't take timezone into account). | ||||
| * | windows.c: Return nil,err from functions instead of throwing errors. | Waqas Hussain | 2011-01-29 | 1 | -12/+14 |
| | | |||||
| * | s2smanager: Change 'Connection failed' error message text to ↵ | Matthew Wild | 2011-01-26 | 1 | -1/+2 |
| | | | | | | | | 'Server-to-server connection failed' (thanks Paul) | ||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-21 | 2 | -13/+10 |
|\| | |||||
| * | net.dns: Fix tostring() for SRV records | Matthew Wild | 2011-01-21 | 1 | -10/+7 |
| | | |||||
| * | loggingmanager: Fix reading configuration of timestamps for console output. | Waqas Hussain | 2011-01-13 | 1 | -1/+1 |
| | | |||||
| * | loggingmanager: Re-read 'debug' option on reload. | Waqas Hussain | 2011-01-13 | 1 | -2/+2 |
| | | |||||
* | | prosody: Add config option plugin_path to allow overriding plugin directories. | Waqas Hussain | 2011-01-21 | 1 | -0/+1 |
| | | |||||
* | | util.pluginloader: Add support for multiple plugin directories. | Waqas Hussain | 2011-01-21 | 1 | -3/+12 |
| | | |||||
* | | mod_pubsub: Don't force-load mod_iq. | Waqas Hussain | 2011-01-21 | 1 | -2/+0 |
| | | |||||
* | | MUC: Add option to allow participants to change the subject. | Kim Alvefur | 2011-01-14 | 1 | -1/+23 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-11 | 1 | -6/+0 |
|\| | |||||
| * | loggingmanager: Remove event hook that never fired anyway, and held logfiles ↵ | Matthew Wild | 2011-01-11 | 1 | -6/+0 |
| | | | | | | | | open - leave the GC to close them now. | ||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-11 | 1 | -1/+1 |
|\| | |||||
| * | storagemanager: Export load_driver() function so it can be used from e.g. ↵ | Matthew Wild | 2011-01-11 | 1 | -1/+1 |
| | | | | | | | | migrators | ||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-11 | 7 | -10/+10 |
|\| | |||||
| * | util.sasl.*: Add 'sasl.' prefix to module names | Matthew Wild | 2011-01-11 | 4 | -6/+6 |
| | | |||||
| * | util.datamanager: Change from 'Failed to load' to 'Assuming empty' for data ↵ | Matthew Wild | 2011-01-11 | 1 | -2/+2 |
| | | | | | | | | store files that do not seem to exist | ||||
| * | net.server_select, net.server_event: Silence 'error during ssl handshake' ↵ | Matthew Wild | 2011-01-11 | 2 | -2/+2 |
| | | | | | | | | for wantread and wantwrite | ||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-11 | 2 | -14/+33 |
|\| | |||||
| * | mod_storage_sql: Create index when creating a new table | Matthew Wild | 2011-01-11 | 1 | -13/+32 |
| | | |||||
| * | util.datamanager: Handle gracefully the lack of prosody.paths.data | Matthew Wild | 2011-01-11 | 1 | -1/+1 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-10 | 2 | -20/+51 |
|\| | |||||
| * | s2smanager: Don't bounce error replies for error and result stanzas. | Waqas Hussain | 2011-01-10 | 1 | -5/+4 |
| | | |||||
| * | mod_storage_sql: Reconnect in all cases, and rollback on error. | Waqas Hussain | 2011-01-10 | 1 | -15/+47 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-08 | 3 | -20/+24 |
|\| | |||||
| * | net.adns: Fix logging to handle unconnected UDP sockets | Matthew Wild | 2011-01-08 | 1 | -1/+2 |
| | | |||||
| * | mod_bosh: Return true from send() | Matthew Wild | 2011-01-08 | 1 | -0/+1 |
| | | |||||
| * | mod_storage_sql: Create table automatically for all databases now, not just ↵ | Matthew Wild | 2011-01-08 | 1 | -19/+21 |
| | | | | | | | | SQLite. Also rename table from Prosody -> prosody. | ||||
* | | util.pubsub: Pass true instead of nil as the actor in a bunch of places, and ↵ | Matthew Wild | 2011-01-08 | 1 | -7/+7 |
| | | | | | | | | fix a bunch of methods to not traceback on this (those with *_other capability checking). | ||||
* | | util.pubsub: Some tidying/optimisation to service:may() | Matthew Wild | 2011-01-08 | 1 | -4/+3 |
| | | |||||
* | | certs/openssl.cnf: Specify output encoding. | Kim Alvefur | 2011-01-08 | 1 | -2/+2 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-07 | 4 | -10/+18 |
|\| | |||||
| * | mod_storage_sql: Make the 'database' value for the SQLite3 driver relative ↵ | Matthew Wild | 2011-01-07 | 1 | -2/+9 |
| | | | | | | | | to the data path | ||||
| * | prosodyctl: Instead of calling datamanager.set_path(), just ensure ↵ | Matthew Wild | 2011-01-07 | 1 | -3/+4 |
| | | | | | | | | prosody.paths.data always contains the correct value (including config) | ||||
| * | prosody: Instead of calling datamanager.set_path(), just ensure ↵ | Matthew Wild | 2011-01-07 | 1 | -4/+3 |
| | | | | | | | | prosody.paths.data always contains the correct value (including config) | ||||
| * | util.datamanager: Use prosody.paths.data as the initial value for data_path | Matthew Wild | 2011-01-07 | 1 | -1/+2 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-07 | 1 | -4/+6 |
|\| | |||||
| * | prosody.cfg.lua: Give example for logging to console | Matthew Wild | 2011-01-07 | 1 | -0/+1 |
| | | |||||
| * | prosody.cfg.lua: Improve comment about enabling debug logging | Matthew Wild | 2011-01-07 | 1 | -1/+1 |
| | | |||||
| * | prosody.cfg.lua: Add mod_offline to the list of modules that can be ↵ | Matthew Wild | 2011-01-07 | 1 | -3/+4 |
| | | | | | | | | disabled, and add comments for all auto-loaded modules | ||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-07 | 4 | -36/+57 |
|\| | |||||
| * | prosody.cfg.lua.dist: Update to include storage configuration and examples ↵ | Matthew Wild | 2011-01-07 | 1 | -0/+12 |
| | | | | | | | | for SQL | ||||
| * | prosody.cfg.lua.dist: Add note about the require_encryption options | Matthew Wild | 2011-01-07 | 1 | -1/+6 |
| | | |||||
| * | storagemanager, mod_storage_internal: Split out default driver to ↵ | Matthew Wild | 2011-01-07 | 2 | -35/+36 |
| | | | | | | | | mod_storage_internal, and greatly simplify storagemanager's error handling and fallback code | ||||
| * | prosody.cfg.lua.dist: Add motd plugin | Matthew Wild | 2011-01-07 | 1 | -0/+1 |
| | | |||||
| * | mod_motd: Process value to strip any indentation from the config | Matthew Wild | 2011-01-07 | 1 | -0/+2 |
| | | |||||
* | | Merge 0.8->trunk | Matthew Wild | 2011-01-07 | 3 | -674/+0 |
|\| |