| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge 0.7->trunk | Matthew Wild | 2010-06-29 | 1 | -1/+1 |
|\ |
|
| * | Merge backout | Matthew Wild | 2010-06-29 | 1 | -1/+1 |
| |\ |
|
| | * | Backed out changeset 454e1cf18daf (this isn't for debugging, it's to inform t... | Matthew Wild | 2010-06-29 | 1 | -1/+1 |
* | | | prosody: Load util.xmppstream :( | Matthew Wild | 2010-05-09 | 1 | -0/+1 |
* | | | Merge 0.7->trunk | Waqas Hussain | 2010-05-07 | 1 | -1/+5 |
|\| | |
|
| * | | prosody: Modified function metatable for better string representation of func... | Waqas Hussain | 2010-05-07 | 1 | -0/+4 |
| |/ |
|
| * | prosody: Lowered log level for a log message. | Waqas Hussain | 2010-05-07 | 1 | -1/+1 |
* | | eventmanager, prosody: Adapt eventmanager to use prosody.events, as a step to... | Matthew Wild | 2010-05-04 | 1 | -11/+4 |
* | | Merge 0.7->trunk (with MUC needing checking, waqas) | Matthew Wild | 2010-05-04 | 1 | -0/+24 |
|\| |
|
| * | prosody: Set metatable on functions to allow easy access to upvalues. | Waqas Hussain | 2010-04-19 | 1 | -0/+24 |
* | | Merge 0.7->trunk | Matthew Wild | 2010-03-22 | 1 | -2/+2 |
|\| |
|
| * | Merge 0.6->0.7 | Matthew Wild | 2010-03-22 | 1 | -2/+2 |
| |\ |
|
| | * | Update copyright headers for 2010 | Matthew Wild | 2010-03-22 | 1 | -2/+2 |
| | * | Merge 0.6.2/waqas with 0.6.2/MattJ | Matthew Wild | 2010-03-03 | 1 | -4/+34 |
| | |\ |
|
| | | * | prosody: More accurate friendly error message in the event that creating the ... | Matthew Wild | 2010-02-13 | 1 | -2/+6 |
| | | * | prosody: Add a catch-all friendly message for when any port is in use we want... | Matthew Wild | 2010-02-05 | 1 | -0/+2 |
| | | * | prosody: Show friendly error when no config present for legacy SSL ports | Matthew Wild | 2010-01-31 | 1 | -0/+3 |
| | | * | prosody: Log error message when failing to open ports | Matthew Wild | 2010-01-31 | 1 | -1/+19 |
| | | * | prosody: Listen for component connections on port 5347 by default. | Waqas Hussain | 2010-01-24 | 1 | -1/+1 |
| | | * | prosody: Call tostring on the key being used for nil global read before conca... | Waqas Hussain | 2009-12-10 | 1 | -1/+1 |
| | | * | prosody: Log a warning and traceback, but don't throw an error on nil global ... | Waqas Hussain | 2009-12-10 | 1 | -1/+1 |
| | | * | Mainfile: Broke up a really long line. | Waqas Hussain | 2009-12-10 | 1 | -2/+5 |
| | * | | util.dependencies: Load luarocks.loader/luarocks.require | Matthew Wild | 2010-01-28 | 1 | -1/+3 |
| | * | | prosody: net_activate_ports: Accept strings as well as numbers for specifying... | Matthew Wild | 2010-01-09 | 1 | -0/+1 |
| | * | | prosody: Fixed a possible nil concatenation. | Waqas Hussain | 2009-12-16 | 1 | -2/+2 |
| | * | | prosody: Less strict matching for the magic 'interrupted' error | Matthew Wild | 2009-12-07 | 1 | -1/+1 |
| | * | | Disable SSLv2 by default, it's known to be insecure. | Paul Aurich | 2009-12-04 | 1 | -1/+1 |
| | |/ |
|
* | | | Merge with 0.7 | Matthew Wild | 2010-03-01 | 1 | -1/+1 |
|\| | |
|
| * | | prosody: Bump log message describing current connection backend to level 'info' | Matthew Wild | 2010-02-27 | 1 | -1/+1 |
* | | | prosody: Don't add fallbacks to package.path and package.cpath. | Waqas Hussain | 2010-02-16 | 1 | -3/+0 |
|/ / |
|
* | | prosody: More accurate friendly error message in the event that creating the ... | Matthew Wild | 2010-02-13 | 1 | -2/+6 |
* | | prosody: Use certmanager to create the global SSL context | Matthew Wild | 2010-02-13 | 1 | -6/+3 |
* | | prosody, prosodyctl: Re-jiggle load order again, fixes logging config not bei... | Matthew Wild | 2010-02-11 | 1 | -28/+37 |
* | | prosody: Add a catch-all friendly message for when any port is in use we want... | Matthew Wild | 2010-02-05 | 1 | -0/+2 |
* | | prosody: Initialize logging before checking dependencies (fixes another trace... | Matthew Wild | 2010-02-05 | 1 | -3/+3 |
* | | prosody: Show friendly error when no config present for legacy SSL ports | Matthew Wild | 2010-01-31 | 1 | -0/+3 |
* | | prosody: Log error message when failing to open ports | Matthew Wild | 2010-01-31 | 1 | -1/+19 |
* | | prosody: Only set the ssl_ctx for 'ssl' connections | Matthew Wild | 2010-01-31 | 1 | -1/+1 |
* | | prosody: Check dependencies (and load LuaRocks) earlier on in the startup pro... | Matthew Wild | 2010-01-28 | 1 | -7/+4 |
* | | util.dependencies, prosody, prosodyctl: Give util.dependencies a check_depend... | Matthew Wild | 2010-01-28 | 1 | -1/+3 |
* | | prosody: Listen for component connections on port 5347 by default. | Waqas Hussain | 2010-01-24 | 1 | -1/+1 |
* | | prosody: net_activate_ports: Accept strings as well as numbers for specifying... | Matthew Wild | 2010-01-09 | 1 | -0/+1 |
* | | prosody: Read list of possible config extensions from configmanager, removes ... | Matthew Wild | 2010-01-09 | 1 | -3/+3 |
* | | prosody: Fixed a possible nil concatenation. | Waqas Hussain | 2009-12-16 | 1 | -2/+2 |
* | | prosody: Fix to net_activate_ports to mend binding to specific interfaces | Paul Aurich | 2009-12-15 | 1 | -4/+4 |
* | | prosody: Added config option 'ssl_ports' to allow multiplexed SSL ports. | Waqas Hussain | 2009-12-10 | 1 | -0/+3 |
* | | prosody: Use the multiplex listener when the 'ports' config option is specified. | Waqas Hussain | 2009-12-10 | 1 | -4/+8 |
* | | net_activate_ports: Use the default config option 'ports' when no option is s... | Waqas Hussain | 2009-12-10 | 1 | -1/+2 |
* | | prosody: Call tostring on the key being used for nil global read before conca... | Waqas Hussain | 2009-12-10 | 1 | -1/+1 |
* | | prosody: Log a warning and traceback, but don't throw an error on nil global ... | Waqas Hussain | 2009-12-10 | 1 | -1/+1 |