aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.8->trunkMatthew Wild2011-04-0510-49/+67
|\
| * usermanager: Check host exists before trying to look up admins for itMatthew Wild2011-04-051-0/+2
| |
| * util.dependencies: Add a dummy util.ztact loader to log a message for people ↵Matthew Wild2011-04-051-0/+13
| | | | | | | | still using it (e.g. in their Debian-derived config files)
| * tools/migration/prosody-migrator.lua: Refactor store handler loading to ↵Matthew Wild2011-04-051-13/+22
| | | | | | | | report errors they throw
| * tools/migration/migrator/prosody_sql: Throw a friendlier error when LuaDBI ↵Matthew Wild2011-04-051-1/+5
| | | | | | | | is not found
| * prosody.cfg.lua.dist: Add example of 'authentication' optionMatthew Wild2011-04-051-0/+9
| |
| * mod_privacy: Remove several unused variable declarationsMatthew Wild2011-03-291-3/+1
| |
| * mod_privacy: Remove unused function, sendUnavailableMatthew Wild2011-03-291-22/+0
| |
| * sessionmanager: Fire pre-resource-unbind to allow plugins (such as ↵Matthew Wild2011-03-291-4/+11
| | | | | | | | mod_smacks) to hook and prevent/override session destruction
| * tools/migration: Rename main.lua -> prosody-migrator.lua and update the MakefileMatthew Wild2011-03-212-3/+3
| |
| * 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
| |