aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | net.httpserver: Revert commit eccd3c87d717 which has since been fixed in a ↵Matthew Wild2011-03-211-1/+0
| | | | | | | | | | | | | | | | better way
| * | | mod_dialback: Use session:close() on dialback failure instead of ↵Matthew Wild2011-03-211-2/+1
| | | | | | | | | | | | | | | | s2smanager.destroy_session() (thanks Zash)
* | | | Merge 0.8->trunkMatthew Wild2011-03-181-2/+2
|\| | |
| * | | tools/migration/Makefile: Don't install main.lua (we already install it as ↵Matthew Wild2011-03-031-2/+2
| | | | | | | | | | | | | | | | prosody-migrator) (thanks Enrico)
* | | | mod_pubsub: Remove checks for whether the JID being (un)subscribed is the ↵Matthew Wild2011-03-181-6/+0
| | | | | | | | | | | | | | | | actor's own - it's possible to (un)subscribe another JID if you have the (un)subscribe_other capability, which is already checked in util.pubsub (thanks Andrew)
* | | | mod_bosh: Fix terminate logic - process any stanzas in a terminating ↵Matthew Wild2011-03-041-10/+20
| | | | | | | | | | | | | | | | request, and add type='terminate' to any responses generated by those stanzas. Finally, close all remaining open requests with type='terminate' and close the session. Fixes #211 (thanks Maranda + waqas).
* | | | Merge 0.8->trunk.Waqas Hussain2011-03-022-3/+6
|\| | |
| * | | prosody: Load net.httpserver at startup, to avoid creating a global later.Waqas Hussain2011-03-021-0/+1
| | | |
| * | | net.connlisteners: Log traceback on errors in listener loading.Waqas Hussain2011-03-021-3/+5
| | | |
* | | | Merge 0.8->trunkMatthew Wild2011-03-011-1/+12
|\| | |
| * | | mod_storage_sql: Display friendlier error when LuaDBI is missingMatthew Wild2011-03-011-1/+12
| | | |
* | | | Merge 0.8->trunkMatthew Wild2011-02-265-9/+56
|\| | |
| * | | tools/migration/*: Numerous changes and restructuring, and the addition of a ↵Matthew Wild2011-02-265-9/+56
| | | | | | | | | | | | | | | | Makefile
* | | | Merge 0.8->trunkMatthew Wild2011-02-250-0/+0
|\| | |
| * | | tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling ↵Matthew Wild2011-02-252-8/+69
| | | | | | | | | | | | | | | | for config and command-line parameters
| * | | tools/migration/main.lua: Add command-line parsing, including ↵Matthew Wild2011-02-251-11/+29
| | | | | | | | | | | | | | | | --config=CONFIG_FILE, and the ability to specify to/from stores to migrate
| * | | tools/migration/config.lua: Minor fixes for more sensible defaultsMatthew Wild2011-02-251-10/+10
| | | |
* | | | tools/migration/*.lua: Rename config to migrator.cfg.lua, add error handling ↵Matthew Wild2011-02-252-8/+69
| | | | | | | | | | | | | | | | for config and command-line parameters
* | | | tools/migration/main.lua: Add command-line parsing, including ↵Matthew Wild2011-02-251-11/+29
| | | | | | | | | | | | | | | | --config=CONFIG_FILE, and the ability to specify to/from stores to migrate
* | | | tools/migration/config.lua: Minor fixes for more sensible defaultsMatthew Wild2011-02-251-10/+10
| | | |
* | | | Merge 0.8->trunkMatthew Wild2011-02-251-1/+1
|\| | |
| * | | mod_pep: Fix comparison between incoming hash and the cached hash for a JID, ↵Matthew Wild2011-02-251-1/+1
| | | | | | | | | | | | | | | | fixes repeated PEP events on presence (fixes #225)
* | | | Merge 0.8->trunkMatthew Wild2011-02-240-0/+0
|\| | |
| * | | util.sasl.scram: Fix bug in validate_username function. (Thanks Florob)Tobias Markmann2011-02-241-3/+3
| | | |
* | | | util.sasl.scram: Fix bug in validate_username function. (Thanks Florob)Tobias Markmann2011-02-241-3/+3
| | | |
* | | | Merge 0.8->trunk.Waqas Hussain2011-02-241-3/+18
|\| | |
| * | | MUC: Don't limit affiliation changes to owners, and allow owners to remove ↵Waqas Hussain2011-02-241-2/+17
| | | | | | | | | | | | | | | | themselves if they are not the last owner.
| * | | MUC: Add a textual error message when the user isn't allowed to get/set ↵Waqas Hussain2011-02-241-1/+1
| | | | | | | | | | | | | | | | config form.
* | | | Merge 0.8->trunkMatthew Wild2011-02-240-0/+0
|\| | |
| * | | util.stanza: Whitespace fix after merge (complicated)Matthew Wild2011-02-241-1/+1
| | | |
| * | | prosody, prosodyctl: Use plugin_paths in addition to, not instead of, the ↵Matthew Wild2011-02-242-4/+8
| | | | | | | | | | | | | | | | default plugin path
| * | | tools/migration/*.lua: Convert to unix line endingsMatthew Wild2011-02-235-416/+416
| | | |
| * | | net.httpserver: Removed an unused function.Waqas Hussain2011-02-231-4/+0
| | | |
| * | | net.httpserver: Fix HTTP after commit c299726d2b4e and add a 500 error ↵Matthew Wild2011-02-231-3/+13
| | | | | | | | | | | | | | | | response if a request handler fails to make a response to the client
| * | | tests/test_sasl.lua: Convert literal UTF-8/Latin1 chars to escape codes for ↵Matthew Wild2011-02-221-8/+1
| | | | | | | | | | | | | | | | weak text editors
| * | | tools/migration/*: Initial commit of a new migration tool. Currently ↵Waqas Hussain2011-02-235-0/+416
| | | | | | | | | | | | | | | | supports Prosody files and Prosody SQL as input and output.
| * | | net.httpserver: Catch errors thrown in HTTP handlers.Waqas Hussain2011-02-231-0/+8
| | | |
| * | | mod_auth_*: Get rid of undocumented and broken 'sasl_realm' config option.Waqas Hussain2011-02-234-10/+5
| | | |
| * | | mod_auth_cyrus: Print some diagnostic log messages about the available ↵Waqas Hussain2011-02-231-0/+13
| | | | | | | | | | | | | | | | mechanisms.
| * | | prosodyctl: Support for plugin_paths config optionMatthew Wild2011-02-221-0/+4
| | | |
| * | | mod_tls: Drop 'TLS negotiation started for ...' to debug level from infoMatthew Wild2011-02-221-1/+1
| | | |
| * | | s2smanager: Drop some log messages to debug level from info/warnMatthew Wild2011-02-221-2/+2
| | | |
| * | | prosody: Change plugin_path -> plugin_paths and make it an array instead of ↵Matthew Wild2011-02-221-1/+4
| | | | | | | | | | | | | | | | a string
| * | | util.pluginloader: Rewritten resource loading to be cleaner, and added ↵Waqas Hussain2011-02-221-26/+19
| | | | | | | | | | | | | | | | support for prosody-modules directory layout. "/" in plugin names is no longer supported.
| * | | util.stanza: Remove childtags and rename matching_tags -> childtags (they ↵Matthew Wild2011-02-221-1/+1
| | | | | | | | | | | | | | | | are API-compatible)
| * | | util.pluginloader: Remove unused support for custom loaders, to simplify ↵Waqas Hussain2011-02-201-9/+5
| | | | | | | | | | | | | | | | further refactoring.
| * | | modulemanager: Added module.path to the plugin API to let plugins determine ↵Waqas Hussain2011-02-201-1/+1
| | | | | | | | | | | | | | | | their load path.
| * | | util.pluginloader: Return file path on success in pluginloader.load_code().Waqas Hussain2011-02-201-1/+4
| | | |
| * | | util.pluginloader: Return full file path from internal file loader on ↵Waqas Hussain2011-02-201-3/+4
| | | | | | | | | | | | | | | | success, not just the name.
| * | | util.stanza: Rewrite clone() to be more optimized.Waqas Hussain2011-02-201-15/+12
| | | |