aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Automated merge with http://waqas.ath.cx/Matthew Wild2008-11-294-5/+59
| |\
| | * More Makefile improvements (install the certificates, and update the config o...Matthew Wild2008-11-291-2/+9
| | * Update Makefile to set correct paths on install with Debian packageMatthew Wild2008-11-291-1/+6
| | * Add some example certificates and update the config to point to themMatthew Wild2008-11-293-2/+44
| * | ejabberd db dump importer for ProsodyWaqas Hussain2008-11-293-0/+349
| |/
| * Add COPYING, remove LICENSEMatthew Wild2008-11-292-1/+343
| * Merfe from TobiasMatthew Wild2008-11-292-6/+5
| |\
| * | Fix for loading connlisteners when running without CFG_SOURCEDIRMatthew Wild2008-11-291-1/+1
* | | Automated merge.Tobias Markmann2008-11-292-6/+5
|\ \ \ | |/ / |/| / | |/
| * Apply IDNA to ASCII on hostnames.Tobias Markmann2008-11-291-1/+1
| * Forced merge.Tobias Markmann2008-11-299-20/+306
| |\
| * | Use unsigned int instead of uint because uint is already in use on OS X.Tobias Markmann2008-11-281-3/+1
| * | To use free you should include stdlib.h rather than malloc.h according to man...Tobias Markmann2008-11-281-1/+1
| * | Do idna_to_ascii when building own response.Tobias Markmann2008-11-282-4/+5
* | | Also look for binary modules in the parent directory when running testsMatthew Wild2008-11-291-0/+1
* | | Automated merge with http://waqas.ath.cx/Matthew Wild2008-11-296-14/+41
|\ \ \
| * | | Update Makefile to now pass config paths to prosody. Update prosody, modulema...Matthew Wild2008-11-295-11/+34
| * | | Fix for configmanager when config file can't be foundMatthew Wild2008-11-291-3/+7
* | | | Moved incoming c2s presence handling from stanza_router to presencemanagerWaqas Hussain2008-11-292-71/+93
|/ / /
* | | Rename and update config. Update Makefile for this change.Matthew Wild2008-11-292-7/+6
* | | More Makefile improvementsMatthew Wild2008-11-291-4/+14
| |/ |/|
* | Add a top-level Makefile and ./configure script. Update util-src Makefile for...Matthew Wild2008-11-293-7/+274
* | Removing pull_from_master.sh. Use hg fetch instead.Matthew Wild2008-11-291-3/+0
* | Load prosody instead of main.lia in mod_consoleWaqas Hussain2008-11-291-1/+1
* | Make prosody executableMatthew Wild2008-11-291-0/+0
* | Automated merge with http://waqas.ath.cx/Matthew Wild2008-11-291-0/+15
|\ \
| * | main.lua -> prosodyMatthew Wild2008-11-291-0/+15
* | | Added a FIXMEWaqas Hussain2008-11-291-1/+1
* | | Improved the regexp used to parse the client response a bit. Authenticating w...Waqas Hussain2008-11-291-1/+1
* | | Fixed logging in datamanagerWaqas Hussain2008-11-291-3/+1
|/ /
* | Merge from waqasMatthew Wild2008-11-283-4/+13
|\ \ | |/ |/|
| * Quickfix for dns.lua to not crash on failed connection to name serversWaqas Hussain2008-11-281-1/+2
| * Added option core.data_pathWaqas Hussain2008-11-282-3/+11
* | No more reading 1 byte at a time from socketsMatthew Wild2008-11-283-3/+3
* | Merge from waqasMatthew Wild2008-11-279-62/+16
|\|
| * Completely switched to new hashes library from the old md5 libraryWaqas Hussain2008-11-285-54/+12
| * Switched from md5 to sha256 for dialback key generationWaqas Hussain2008-11-281-2/+2
| * Stopped using the lbase64 libraryWaqas Hussain2008-11-282-2/+1
| * Added make.bat for windowsWaqas Hussain2008-11-271-0/+1
| * Removed MS specific preprocessor statements from the MakefileWaqas Hussain2008-11-271-4/+0
* | Add module:unload() to mod_console, and allow module:load() to take config paramMatthew Wild2008-11-271-2/+11
* | Merge from waqasMatthew Wild2008-11-274-5/+43
|\|
| * Makefile now works on windows with Microsoft's compilerWaqas Hussain2008-11-272-0/+34
| * Minor changes to C files (to prevent compiler warnings)Waqas Hussain2008-11-272-5/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-01 19:39:33 +0000