aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.8->trunkMatthew Wild2011-04-061-4/+3
|\
| * mod_tls: Fix for components to more reliably inherit SSL settings from their ...Matthew Wild2011-04-061-4/+3
* | Merge 0.8 -> trunkMatthew Wild2011-04-052-2/+13
|\|
| * Tagging 0.8.0Matthew Wild2011-04-050-0/+0
| * tools/migration/migrator/prosody_files.lua: Fix for previous commitvault/0.8.00.8.0Matthew Wild2011-04-051-1/+2
| * tools/migration/prosody-migrator.lua: Add messages to show when migration is ...Matthew Wild2011-04-051-1/+2
| * tools/migration: Support for ~/ in pathsMatthew Wild2011-04-052-1/+10
* | 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
| * tools/migration/prosody-migrator.lua: Refactor store handler loading to repor...Matthew Wild2011-04-051-13/+22
| * tools/migration/migrator/prosody_sql: Throw a friendlier error when LuaDBI is...Matthew Wild2011-04-051-1/+5
| * 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 mod_smacks...Matthew Wild2011-03-291-4/+11
| * 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 be...Matthew Wild2011-03-211-1/+0
| * mod_dialback: Use session:close() on dialback failure instead of s2smanager.d...Matthew Wild2011-03-211-2/+1
* | Merge 0.8->trunkMatthew Wild2011-03-181-2/+2
|\|
| * tools/migration/Makefile: Don't install main.lua (we already install it as pr...Matthew Wild2011-03-031-2/+2
* | mod_pubsub: Remove checks for whether the JID being (un)subscribed is the act...Matthew Wild2011-03-181-6/+0
* | mod_bosh: Fix terminate logic - process any stanzas in a terminating request,...Matthew Wild2011-03-041-10/+20
* | 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
* | 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
| * tools/migration/main.lua: Add command-line parsing, including --config=CONFIG...Matthew Wild2011-02-251-11/+29
| * 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
* | tools/migration/main.lua: Add command-line parsing, including --config=CONFIG...Matthew Wild2011-02-251-11/+29
* | 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
* | 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 th...Waqas Hussain2011-02-241-2/+17
| * MUC: Add a textual error message when the user isn't allowed to get/set confi...Waqas Hussain2011-02-241-1/+1
* | 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 def...Matthew Wild2011-02-242-4/+8
| * 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