Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Remove stray merge marker | Matthew Wild | 2008-12-03 | 1 | -1/+0 |
| | |||||
* | Merge from waqas | Matthew Wild | 2008-12-03 | 63 | -78/+1149 |
|\ | |||||
| * | Fix license (left some boilerplate in) | Matthew Wild | 2008-12-03 | 2 | -62/+0 |
| | | |||||
| * | and the C files too | Matthew Wild | 2008-12-03 | 2 | -0/+40 |
| | | |||||
| * | Insert copyright/license headers | Matthew Wild | 2008-12-03 | 55 | -1/+1094 |
| | | |||||
| * | Fix port number in mod_console instructions | Matthew Wild | 2008-12-03 | 1 | -1/+1 |
| | | |||||
| * | lxmppd -> Prosody | Matthew Wild | 2008-12-03 | 2 | -3/+3 |
| | | |||||
| * | Fix macosx ostype target | Matthew Wild | 2008-11-30 | 1 | -0/+2 |
| | | |||||
| * | Fix debian ostype target | Matthew Wild | 2008-11-30 | 1 | -0/+2 |
| | | |||||
| * | Change sed usage back into one sed script for incompetent versions of sed | Matthew Wild | 2008-11-30 | 1 | -6/+4 |
| | | |||||
| * | Use install to strip symbols | Matthew Wild | 2008-11-30 | 1 | -2/+1 |
| | | |||||
| * | 'install' libs to util before top-level make install | Matthew Wild | 2008-11-30 | 1 | -2/+1 |
| | | |||||
* | | config and data directories taken from path, and quoted to allow spaces in path | Waqas Hussain | 2008-12-03 | 1 | -3/+3 |
| | | |||||
* | | Converted prosody.cfg.lua.dist to use windows end-of-lines | Waqas Hussain | 2008-12-03 | 1 | -78/+78 |
|/ | |||||
* | Potential fixes for building on Mac OSX | Matthew Wild | 2008-11-30 | 2 | -4/+31 |
| | |||||
* | No need for the placeholder file in tests/ because the directory is no ↵ | Matthew Wild | 2008-11-30 | 1 | -1/+0 |
| | | | | longer empty | ||||
* | Add test for latin1toutf8 (which passes) | Matthew Wild | 2008-11-30 | 2 | -0/+76 |
| | |||||
* | Converting latin encoded responsed to utf-8 when needed. | Tobias Markmann | 2008-11-30 | 1 | -0/+7 |
| | |||||
* | Automerge with waqas. | Tobias Markmann | 2008-11-30 | 2 | -3/+18 |
|\ | |||||
| * | Added function latin1toutf8 to sasl.lua, for processing non-utf8 responses | Waqas Hussain | 2008-11-30 | 1 | -0/+16 |
| | | |||||
| * | Makefile fix for creating datadir in correct place on install | Matthew Wild | 2008-11-30 | 1 | -3/+2 |
| | | |||||
* | | Automated merge with h-h. | Tobias Markmann | 2008-11-30 | 4 | -26/+65 |
|\| | |||||
| * | Installation improvements (auto-creation of data directories) | Matthew Wild | 2008-11-30 | 3 | -18/+33 |
| | | |||||
| * | Don't overwrite config on make install if it already exists | Matthew Wild | 2008-11-30 | 1 | -1/+1 |
| | | |||||
| * | Path fix for auto-creating directories | Waqas Hussain | 2008-11-30 | 1 | -1/+1 |
| | | |||||
| * | Merge from waqas | Matthew Wild | 2008-11-30 | 1 | -1/+25 |
| |\ | |||||
| | * | Auto-create data directories on start | Waqas Hussain | 2008-11-30 | 1 | -1/+25 |
| | | | |||||
| * | | Merge with Tobias | Matthew Wild | 2008-11-30 | 1 | -2/+3 |
| |\ \ | |||||
| * | | | Yet another fix for the makefile :) | Matthew Wild | 2008-11-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fix missing prosody.cfg.lua.install | Matthew Wild | 2008-11-29 | 1 | -1/+1 |
| | | | | |||||
| * | | | Don't write to prosody.cfg.lua from Makefile. Much apologies to poor albert :( | Matthew Wild | 2008-11-29 | 1 | -3/+3 |
| | | | | |||||
| * | | | Add -fPIC to util-src/Makefile | Matthew Wild | 2008-11-29 | 1 | -2/+2 |
| | | | | |||||
* | | | | Remove that idn stuff for realm because it's either an ugly hack that the ↵ | Tobias Markmann | 2008-11-30 | 1 | -2/+2 |
| |/ / |/| | | | | | | | | password_handler isn't ready for or something worse. | ||||
* | | | idna-to-unicode so password_handler looks for the right domain. | Tobias Markmann | 2008-11-30 | 1 | -1/+2 |
| | | | |||||
* | | | Do idna-to-ascii to the realm we send first in Digest-MD5. | Tobias Markmann | 2008-11-30 | 1 | -1/+1 |
|/ / | |||||
* | | Another automatic merge, this gets annoying." | Tobias Markmann | 2008-11-29 | 2 | -178/+176 |
|\| | |||||
| * | Fixed the ejabberd importer to work with the pipe sign "|" as a separator in ↵ | Waqas Hussain | 2008-11-30 | 2 | -178/+176 |
| | | | | | | | | erlang lists | ||||
* | | Autocommit. | Tobias Markmann | 2008-11-29 | 1 | -175/+178 |
|\| | |||||
| * | Make ejabberd2prosody.lua a little more cross-platform :) | Matthew Wild | 2008-11-29 | 1 | -175/+178 |
| | | |||||
* | | Automated merge. | Tobias Markmann | 2008-11-29 | 10 | -7/+753 |
|\| | |||||
| * | Make ejabberd2prosody.lua eecutable | Matthew Wild | 2008-11-29 | 1 | -0/+1 |
| | | |||||
| * | Automated merge with http://waqas.ath.cx/ | Matthew Wild | 2008-11-29 | 4 | -5/+59 |
| |\ | |||||
| | * | More Makefile improvements (install the certificates, and update the config ↵ | Matthew Wild | 2008-11-29 | 1 | -2/+9 |
| | | | | | | | | | | | | on install to find them) | ||||
| | * | Update Makefile to set correct paths on install with Debian package | Matthew Wild | 2008-11-29 | 1 | -1/+6 |
| | | | |||||
| | * | Add some example certificates and update the config to point to them | Matthew Wild | 2008-11-29 | 3 | -2/+44 |
| | | | |||||
| * | | ejabberd db dump importer for Prosody | Waqas Hussain | 2008-11-29 | 3 | -0/+349 |
| |/ | |||||
| * | Add COPYING, remove LICENSE | Matthew Wild | 2008-11-29 | 2 | -1/+343 |
| | | |||||
| * | Merfe from Tobias | Matthew Wild | 2008-11-29 | 2 | -6/+5 |
| |\ | |||||
| * | | Fix for loading connlisteners when running without CFG_SOURCEDIR | Matthew Wild | 2008-11-29 | 1 | -1/+1 |
| | | | |||||
* | | | Automated merge. | Tobias Markmann | 2008-11-29 | 2 | -6/+5 |
|\ \ \ | |/ / |/| / | |/ |