|
Automated merge with http://84.46.7.57:1234
|
Matthew Wild |
Wed, 03 Dec 2008 19:34:41 +0000 |
|
Making makefile work under OS X finally. Yeah OS X's gcc is a little bit strange.
|
Tobias Markmann |
Wed, 03 Dec 2008 20:32:03 +0100 |
|
Using new LFLAGS variable.
|
Tobias Markmann |
Wed, 03 Dec 2008 19:43:59 +0100 |
|
Added an error log message for this case
|
Matthew Wild |
Wed, 03 Dec 2008 18:06:04 +0000 |
|
Quick fix for an issue that needs more looking into
|
Matthew Wild |
Wed, 03 Dec 2008 18:01:56 +0000 |
|
Automated merge with http://waqas.ath.cx/
|
Matthew Wild |
Wed, 03 Dec 2008 17:24:20 +0000 |
|
Fix for handling latin1 encoded hostnames in SASL
|
Waqas Hussain |
Wed, 03 Dec 2008 22:08:49 +0500 |
|
Fix GPL'ing MIT/X licensed code :)
|
Matthew Wild |
Wed, 03 Dec 2008 16:44:03 +0000 |
|
Update HACKERS
|
Matthew Wild |
Wed, 03 Dec 2008 16:20:58 +0000 |
|
Fill blank with URL
|
Matthew Wild |
Wed, 03 Dec 2008 16:07:15 +0000 |
|
Remove stray merge marker
|
Matthew Wild |
Wed, 03 Dec 2008 16:01:58 +0000 |
|
Merge from waqas
|
Matthew Wild |
Wed, 03 Dec 2008 15:09:58 +0000 |
|
config and data directories taken from path, and quoted to allow spaces in path
|
Waqas Hussain |
Wed, 03 Dec 2008 19:57:08 +0500 |
|
Converted prosody.cfg.lua.dist to use windows end-of-lines
|
Waqas Hussain |
Wed, 03 Dec 2008 19:56:05 +0500 |
|
Fix license (left some boilerplate in)
|
Matthew Wild |
Wed, 03 Dec 2008 14:59:27 +0000 |
|
and the C files too
|
Matthew Wild |
Wed, 03 Dec 2008 14:45:03 +0000 |
|
Insert copyright/license headers
|
Matthew Wild |
Wed, 03 Dec 2008 14:39:07 +0000 |
|
Fix port number in mod_console instructions
|
Matthew Wild |
Wed, 03 Dec 2008 13:06:23 +0000 |
|
lxmppd -> Prosody
|
Matthew Wild |
Wed, 03 Dec 2008 13:02:23 +0000 |
|
Fix macosx ostype target
|
Matthew Wild |
Sun, 30 Nov 2008 19:59:28 +0000 |
|
Fix debian ostype target
|
Matthew Wild |
Sun, 30 Nov 2008 19:58:41 +0000 |
|
Change sed usage back into one sed script for incompetent versions of sed
|
Matthew Wild |
Sun, 30 Nov 2008 19:58:22 +0000 |
|
Use install to strip symbols
|
Matthew Wild |
Sun, 30 Nov 2008 19:36:30 +0000 |
|
'install' libs to util before top-level make install
|
Matthew Wild |
Sun, 30 Nov 2008 19:31:43 +0000 |
|
Potential fixes for building on Mac OSX
|
Matthew Wild |
Sun, 30 Nov 2008 19:02:00 +0000 |
|
No need for the placeholder file in tests/ because the directory is no longer empty
|
Matthew Wild |
Sun, 30 Nov 2008 18:59:29 +0000 |
|
Add test for latin1toutf8 (which passes)
|
Matthew Wild |
Sun, 30 Nov 2008 18:57:23 +0000 |
|
Converting latin encoded responsed to utf-8 when needed.
|
Tobias Markmann |
Sun, 30 Nov 2008 17:34:47 +0100 |
|
Automerge with waqas.
|
Tobias Markmann |
Sun, 30 Nov 2008 17:18:31 +0100 |
|
Automated merge with h-h.
|
Tobias Markmann |
Sun, 30 Nov 2008 15:18:45 +0100 |
|
Remove that idn stuff for realm because it's either an ugly hack that the password_handler isn't ready for or something worse.
|
Tobias Markmann |
Sun, 30 Nov 2008 02:26:37 +0100 |
|
Added function latin1toutf8 to sasl.lua, for processing non-utf8 responses
|
Waqas Hussain |
Sun, 30 Nov 2008 20:58:48 +0500 |
|
Makefile fix for creating datadir in correct place on install
|
Matthew Wild |
Sun, 30 Nov 2008 14:30:22 +0000 |
|
Installation improvements (auto-creation of data directories)
|
Matthew Wild |
Sun, 30 Nov 2008 04:22:43 +0000 |
|
Don't overwrite config on make install if it already exists
|
Matthew Wild |
Sun, 30 Nov 2008 01:16:55 +0000 |
|
Path fix for auto-creating directories
|
Waqas Hussain |
Sun, 30 Nov 2008 06:14:41 +0500 |
|
Merge from waqas
|
Matthew Wild |
Sun, 30 Nov 2008 01:02:12 +0000 |
|
Auto-create data directories on start
|
Waqas Hussain |
Sun, 30 Nov 2008 06:01:37 +0500 |
|
Merge with Tobias
|
Matthew Wild |
Sun, 30 Nov 2008 00:38:41 +0000 |
|
idna-to-unicode so password_handler looks for the right domain.
|
Tobias Markmann |
Sun, 30 Nov 2008 01:35:40 +0100 |
|
Do idna-to-ascii to the realm we send first in Digest-MD5.
|
Tobias Markmann |
Sun, 30 Nov 2008 00:44:23 +0100 |
|
Yet another fix for the makefile :)
|
Matthew Wild |
Sun, 30 Nov 2008 00:33:58 +0000 |
|
Fix missing prosody.cfg.lua.install
|
Matthew Wild |
Sat, 29 Nov 2008 22:55:16 +0000 |
|
Don't write to prosody.cfg.lua from Makefile. Much apologies to poor albert :(
|
Matthew Wild |
Sat, 29 Nov 2008 22:28:11 +0000 |
|
Add -fPIC to util-src/Makefile
|
Matthew Wild |
Sat, 29 Nov 2008 22:20:59 +0000 |
|
Another automatic merge, this gets annoying."
|
Tobias Markmann |
Sat, 29 Nov 2008 22:11:21 +0100 |
|
Fixed the ejabberd importer to work with the pipe sign "|" as a separator in erlang lists
|
Waqas Hussain |
Sun, 30 Nov 2008 02:08:37 +0500 |
|
Autocommit.
|
Tobias Markmann |
Sat, 29 Nov 2008 21:13:12 +0100 |
|
Automated merge.
|
Tobias Markmann |
Sat, 29 Nov 2008 20:33:14 +0100 |
|
Automated merge.
|
Tobias Markmann |
Sat, 29 Nov 2008 20:30:35 +0100 |
|
Make ejabberd2prosody.lua a little more cross-platform :)
|
Matthew Wild |
Sat, 29 Nov 2008 19:52:20 +0000 |
|
Make ejabberd2prosody.lua eecutable
|
Matthew Wild |
Sat, 29 Nov 2008 19:14:54 +0000 |
|
Automated merge with http://waqas.ath.cx/
|
Matthew Wild |
Sat, 29 Nov 2008 19:09:38 +0000 |
|
ejabberd db dump importer for Prosody
|
Waqas Hussain |
Sat, 29 Nov 2008 23:59:27 +0500 |
|
More Makefile improvements (install the certificates, and update the config on install to find them)
|
Matthew Wild |
Sat, 29 Nov 2008 17:52:10 +0000 |
|
Update Makefile to set correct paths on install with Debian package
|
Matthew Wild |
Sat, 29 Nov 2008 17:22:05 +0000 |
