aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Added function add_feature to modules API (for adding disco features)Waqas Hussain2008-12-041-1/+11
* Reorder the disco info elements to place always included elements firstWaqas Hussain2008-12-041-14/+15
* Added an error log message for this caseMatthew Wild2008-12-031-0/+4
* Quick fix for an issue that needs more looking intoMatthew Wild2008-12-031-3/+5
* Automated merge with http://waqas.ath.cx/Matthew Wild2008-12-034-866/+841
|\
| * Fix GPL'ing MIT/X licensed code :)Matthew Wild2008-12-031-860/+838
| * Update HACKERSMatthew Wild2008-12-031-4/+2
| * Fill blank with URLMatthew Wild2008-12-031-1/+1
| * Remove stray merge markerMatthew Wild2008-12-031-1/+0
* | Fix for handling latin1 encoded hostnames in SASLWaqas Hussain2008-12-032-3/+4
|/
* Merge from waqasMatthew Wild2008-12-0363-78/+1149
|\
| * Fix license (left some boilerplate in)Matthew Wild2008-12-032-62/+0
| * and the C files tooMatthew Wild2008-12-032-0/+40
| * Insert copyright/license headersMatthew Wild2008-12-0355-1/+1094
| * Fix port number in mod_console instructionsMatthew Wild2008-12-031-1/+1
| * lxmppd -> ProsodyMatthew Wild2008-12-032-3/+3
| * Fix macosx ostype targetMatthew Wild2008-11-301-0/+2
| * Fix debian ostype targetMatthew Wild2008-11-301-0/+2
| * Change sed usage back into one sed script for incompetent versions of sedMatthew Wild2008-11-301-6/+4
| * Use install to strip symbolsMatthew Wild2008-11-301-2/+1
| * 'install' libs to util before top-level make installMatthew Wild2008-11-301-2/+1
* | config and data directories taken from path, and quoted to allow spaces in pathWaqas Hussain2008-12-031-3/+3
* | Converted prosody.cfg.lua.dist to use windows end-of-linesWaqas Hussain2008-12-031-78/+78
|/
* Potential fixes for building on Mac OSXMatthew Wild2008-11-302-4/+31
* No need for the placeholder file in tests/ because the directory is no longer...Matthew Wild2008-11-301-1/+0
* Add test for latin1toutf8 (which passes)Matthew Wild2008-11-302-0/+76
* Converting latin encoded responsed to utf-8 when needed.Tobias Markmann2008-11-301-0/+7
* Automerge with waqas.Tobias Markmann2008-11-302-3/+18
|\
| * Added function latin1toutf8 to sasl.lua, for processing non-utf8 responsesWaqas Hussain2008-11-301-0/+16
| * Makefile fix for creating datadir in correct place on installMatthew Wild2008-11-301-3/+2
* | Automated merge with h-h.Tobias Markmann2008-11-304-26/+65
|\|
| * Installation improvements (auto-creation of data directories)Matthew Wild2008-11-303-18/+33
| * Don't overwrite config on make install if it already existsMatthew Wild2008-11-301-1/+1
| * Path fix for auto-creating directoriesWaqas Hussain2008-11-301-1/+1
| * Merge from waqasMatthew Wild2008-11-301-1/+25
| |\
| | * Auto-create data directories on startWaqas Hussain2008-11-301-1/+25
| * | Merge with TobiasMatthew Wild2008-11-301-2/+3
| |\ \
| * | | Yet another fix for the makefile :)Matthew Wild2008-11-301-1/+1
| * | | Fix missing prosody.cfg.lua.installMatthew Wild2008-11-291-1/+1
| * | | Don't write to prosody.cfg.lua from Makefile. Much apologies to poor albert :(Matthew Wild2008-11-291-3/+3
| * | | Add -fPIC to util-src/MakefileMatthew Wild2008-11-291-2/+2
* | | | Remove that idn stuff for realm because it's either an ugly hack that the pas...Tobias Markmann2008-11-301-2/+2
| |/ / |/| |
* | | idna-to-unicode so password_handler looks for the right domain.Tobias Markmann2008-11-301-1/+2
* | | Do idna-to-ascii to the realm we send first in Digest-MD5.Tobias Markmann2008-11-301-1/+1
|/ /
* | Another automatic merge, this gets annoying."Tobias Markmann2008-11-292-178/+176
|\|
| * Fixed the ejabberd importer to work with the pipe sign "|" as a separator in ...Waqas Hussain2008-11-302-178/+176
* | Autocommit.Tobias Markmann2008-11-291-175/+178
|\|
| * Make ejabberd2prosody.lua a little more cross-platform :)Matthew Wild2008-11-291-175/+178
* | Automated merge.Tobias Markmann2008-11-2910-7/+753
|\|
| * Make ejabberd2prosody.lua eecutableMatthew Wild2008-11-291-0/+1