aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge with 0.7Matthew Wild2010-02-220-0/+0
|\| |
| * | prosodyctl.man: Update email addressDwayne Bent2010-02-211-1/+1
| * | prosodyctl.man: Include new restart commandDwayne Bent2010-02-211-0/+4
* | | Merge with 0.7Matthew Wild2010-02-221-1/+1
|\| |
| * | mod_console: Uncomment the help for server:shutdown() - thanks darkrainMatthew Wild2010-02-221-1/+1
* | | prosodyctl.man: Update email addressDwayne Bent2010-02-211-1/+1
* | | prosodyctl.man: Include new restart commandDwayne Bent2010-02-211-0/+4
* | | Merge with 0.7Matthew Wild2010-02-211-0/+13
|\| |
| * | prosodyctl: Add restart command for KSid and johnny :)Matthew Wild2010-02-211-0/+13
* | | Merge with 0.7Matthew Wild2010-02-212-76/+104
|\| |
| * | prosody.cfg.lua.dist: Update config for 0.7, most improvements from the Arch ...Matthew Wild2010-02-211-75/+103
| * | ejabberd2prosody: Don't print passwords of imported accountsMatthew Wild2010-02-211-1/+1
* | | Merge trunk with trunkMatthew Wild2010-02-210-0/+0
|\ \ \
| * \ \ Merge with 0.7.Waqas Hussain2010-02-212-0/+13
| |\ \ \
* | \ \ \ Merge 0.7 with 0.7 with trunk \o/Matthew Wild2010-02-212-0/+13
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge 0.7 with 0.7Matthew Wild2010-02-212-0/+13
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mod_iq: Fire sub-events for iq/self events.Waqas Hussain2010-02-211-0/+12
| | * | | stanza_router: Make sure /self events are fired when the 'to' attribute is mi...Waqas Hussain2010-02-211-0/+1
* | | | | Merge with 0.7Matthew Wild2010-02-211-1/+1
|\| | | | | |_|/ / |/| | |
| * | | ejabberdsql2prosody: Don't print password of imported accounts (thanks azerttyu)Matthew Wild2010-02-211-1/+1
| |/ /
* | | Merge with 0.7Matthew Wild2010-02-202-252/+0
|\| |
| * | mod_debug: Obsoleted by mod_consoleMatthew Wild2010-02-201-191/+0
| * | mod_selftests: Obsolete, removeMatthew Wild2010-02-201-61/+0
| * | mod_offline: Remove from 0.7 (offline messages are handled in core at the mom...Matthew Wild2010-02-201-56/+0
* | | Backed out changeset e7b09424b486 (not removing mod_offline for trunk)Matthew Wild2010-02-201-0/+56
* | | mod_offline: Remove from 0.7 (offline messages are handled in core at the mom...Matthew Wild2010-02-201-56/+0
* | | mod_storage, plus a bit of SQL and XML.Waqas Hussain2010-02-195-0/+594
* | | Merge with 0.7Matthew Wild2010-02-193-13/+17
|\| |
| * | s2smanager: Use s2smanager log() if session doesn't have a logger (thanks Flo)Matthew Wild2010-02-191-1/+1
| * | net.http: Update print()s to log()s - don't ask how this came to be, I have n...Matthew Wild2010-02-191-8/+7
| * | net.httpclient_listener: Don't notify request of closed connection if the clo...Matthew Wild2010-02-191-1/+1
| * | net.http: destroy_request(): Remove update for new server API, pass request.h...Matthew Wild2010-02-191-2/+3
| * | net.http: Close connection when invalid status line is received from the serverMatthew Wild2010-02-191-1/+4
| * | net.http: Don't re-destroy a request when the connection is closedMatthew Wild2010-02-191-0/+1
* | | Merge with 0.7Matthew Wild2010-02-191-5/+14
|\| |
| * | net.http: Port commit 2f235c57d713 to net.http to fix headers in responses (t...Matthew Wild2010-02-191-5/+14
* | | Merge with 0.7Matthew Wild2010-02-180-0/+0
|\| |
| * | MUC: Allow role changes based on JIDs.Waqas Hussain2010-02-181-0/+3
* | | Merge with 0.7Matthew Wild2010-02-183-6/+19
|\| |
| * | README: Update URL for installation docsMatthew Wild2010-02-181-1/+1
| * | HACKERS: UpdateMatthew Wild2010-02-181-3/+5
| * | TODO: UpdateMatthew Wild2010-02-181-2/+13
* | | Merge with 0.7Matthew Wild2010-02-183-9/+11
|\| |
| * | net.adns: Don't treat locally-initiated disconnects as fatal with libevent ba...Matthew Wild2010-02-181-6/+8
| * | net.server_event: Pass false as connection error to disconnect handler if clo...Matthew Wild2010-02-181-1/+1
| * | modulemanager: Fix traceback on unloading global modules (thanks KSid)Matthew Wild2010-02-181-2/+2
* | | MUC: Allow role changes based on JIDs.Waqas Hussain2010-02-181-0/+3
* | | Merge with 0.7Matthew Wild2010-02-171-4/+4
|\| |
| * | net.server_event: Increase SSL handshake timeout to 30s, make handshake round...Matthew Wild2010-02-171-4/+4
* | | Merge with 0.7Matthew Wild2010-02-161-1/+3
|\| |