aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Automated merge with http://waqas.ath.cx/Matthew Wild2008-12-044-18/+23
|\ \ | |/ |/|
| * Automated merge with http://waqas.ath.cx/Matthew Wild2008-12-044-18/+23
| |\
| | * Abstract xmlhandlers a bit more, also add error callbacksMatthew Wild2008-12-043-15/+18
| | |
| | * Don't send stream:features to incoming s2s connectionsMatthew Wild2008-12-041-1/+3
| | |
| | * Fix logger ids for c2s and s2soutMatthew Wild2008-12-042-2/+2
| | |
* | | Changed util.datamanager to use util.serializationWaqas Hussain2008-12-051-44/+5
| | |
* | | Changed the datastore for vCards from vCard to vcard in mod_vcard and ↵Waqas Hussain2008-12-052-6/+6
|/ / | | | | | | mod_register
* | Changed the ejabberd import script to use util.serializationWaqas Hussain2008-12-042-69/+4
| |
* | Added module util.serializationWaqas Hussain2008-12-041-0/+81
|/
* Automated merge with http://waqas.ath.cx/Matthew Wild2008-12-042-7/+15
|\
| * Added tag 0.1.0 for changeset c157c1412bdaMatthew Wild2008-12-030-0/+0
| |
| * Fix Makefile to link with Lua againvault/0.1.00.1.0Matthew Wild2008-12-031-2/+2
| |
| * Fix configure to save LFLAGS, and also set proper defaults for all sensible OSesMatthew Wild2008-12-032-2/+4
| |
| * Automated merge with http://84.46.7.57:1234Matthew Wild2008-12-034-866/+851
| |\
| * | Making makefile work under OS X finally. Yeah OS X's gcc is a little bit ↵Tobias Markmann2008-12-031-5/+10
| | | | | | | | | | | | strange.
| * | Using new LFLAGS variable.Tobias Markmann2008-12-031-1/+2
| | |
* | | Change modules to use the new add_feature module API method.Waqas Hussain2008-12-0410-12/+12
| | | | | | | | | | | | This also fixes the bug causing disco features being added to every disco reply for every host.
* | | 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 ↵Matthew Wild2008-11-301-1/+0
| | | | longer empty
* 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
| |