aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* modulemanager: Always load a platform-specific module, add stub modules for ↵Kim Alvefur2014-01-263-1/+9
| | | | Windows and unknown platforms
* mod_posix: Daemonize by default only when installedKim Alvefur2014-01-261-1/+1
|
* Merge 0.9->0.10Matthew Wild2014-01-212-3/+4
|\
| * tools/ejabberd2prosody: Disable generating a config, as the format it ↵Waqas Hussain2014-01-181-2/+2
| | | | | | | | generates is completely out of date.
| * tools/ejabberd2prosody: ?xmlelement? can be ?xmlel? in newer ejabberd ↵Waqas Hussain2014-01-181-1/+1
| | | | | | | | (thanks cr).
| * MUC: Fire muc-room-destroyed event when the last participant leaves a ↵Kim Alvefur2014-01-181-0/+1
| | | | | | | | non-persistent room
* | mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is givenKim Alvefur2014-01-211-2/+5
| |
* | mod_storage_sql2: Fix another SQL syntax error that slipped troughKim Alvefur2014-01-211-1/+1
| |
* | Merge 0.9->0.10Matthew Wild2014-01-183-14/+85
|\|
| * tools/ejabberd2prosody: Add support for importing MUC rooms.Waqas Hussain2014-01-181-0/+51
| |
| * tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors.Waqas Hussain2014-01-161-10/+24
| |
| * additional fix for erlparse loading in ejabberd2prosody.luaVadim Misbakh-Soloviov2013-06-141-0/+1
| |
| * package{,c}path fixes for migration toolsVadim Misbakh-Soloviov2013-06-145-5/+34
| |
| * mod_tls: Let s2s_secure_auth override s2s_require_encryption and warn if ↵Kim Alvefur2014-01-151-0/+6
| | | | | | | | they differ
| * mod_tls: Rename variables to be less confusingKim Alvefur2014-01-151-4/+4
| |
* | mod_storage_sql2: Fix SQL syntaxKim Alvefur2014-01-181-2/+2
| |
* | MUC: Expose room metatable on moduleKim Alvefur2014-01-181-2/+3
| |
* | MUC: Split out sending of the topic into method separate from sending historyKim Alvefur2014-01-181-0/+3
| |
* | MUC: Split saving to history into a separate methodKim Alvefur2014-01-181-10/+13
| |
* | MergeMatthew Wild2014-01-123-19/+45
|\ \
| * | mod_storage_sql2: Fix syntax error in subquery (Thanks Lance)Kim Alvefur2014-01-051-2/+2
| | |
| * | util.pubsub: Separate data from node configurationKim Alvefur2013-12-301-7/+26
| | |
| * | util.pubsub: Fire events on more actionsKim Alvefur2013-12-261-0/+4
| | |
| * | mod_pubsub: Don't sent error replies from service disco events, let ↵Kim Alvefur2013-12-301-6/+3
| | | | | | | | | | | | mod_disco handle that
| * | mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. ↵Kim Alvefur2013-12-251-2/+6
| | | | | | | | | | | | Conflicting items are removed.
| * | mod_storage_sql2: Include user, host and store in id lookupKim Alvefur2013-12-251-4/+6
| | |
* | | Merge 0.9->0.10Matthew Wild2014-01-122-8/+12
|\ \ \ | |/ / |/| / | |/
| * Tagging 0.9.3Matthew Wild2014-01-120-0/+0
| |
| * mod_tls: Log error when TLS initialization failsMatthew Wild2014-01-121-2/+9
| |
| * mod_s2s: Include IP in log messages, if host is unavailableFlorian Zeitz2014-01-051-4/+4
| |
| * tools/migration/migrator/prosody_files: Fix undefined global access of ↵Waqas Hussain2014-01-031-4/+8
| | | | | | | | ?error?, print the actual error message and correct file path in the error message when we fail to load a file, skip broken files instead of failing migration.
* | Merge 0.9->0.10Kim Alvefur2013-12-181-1/+7
|\|
| * mod_component: Enable TCP keepalives on component streamsKim Alvefur2013-12-181-0/+6
| |
| * mod_component: Decrease priority of component auth hookKim Alvefur2013-12-181-1/+1
| |
* | Merge 0.9->0.10Matthew Wild2013-12-162-6/+3
|\|
| * net.server_select: Don't remove the socket from sendlist when we might have ↵Matthew Wild2013-12-161-5/+1
| | | | | | | | data in the buffer (we'll now let sendbuffer() take care of that) (thanks daurnimator)
| * net.http: assert() for socket creation success so it doesn't silently fail ↵Matthew Wild2013-12-161-1/+2
| | | | | | | | (thanks daurnimator)
* | Merge 0.9->0.10Matthew Wild2013-12-161-1/+4
|\|
| * util.jid: Strip trailing '.' when normalizing hostnamesMatthew Wild2013-12-161-1/+4
| |
| * mod_muc: Remove extra parenthesis (thanks janhouse)Kim Alvefur2013-12-141-1/+1
| |
* | mod_muc: Remove extra parenthesis (thanks janhouse)Kim Alvefur2013-12-141-1/+1
| |
* | Merge 0.9->0.10Matthew Wild2013-12-132-2/+3
|\|
| * mod_muc: Allow admins to always bypass restrict_room_creation (thanks Chris B)Matthew Wild2013-12-131-1/+1
| |
| * prosody: Store the config file name so the same file can be used when reloadingKim Alvefur2013-12-131-1/+2
| |
* | Merge 0.9->0.10Matthew Wild2013-12-112-1/+9
|\|
| * Tagging 0.9.2 (again)Matthew Wild2013-12-040-0/+0
| |
| * Makefile, configure: Add option for disabling generation of example certificatesKim Alvefur2013-11-302-1/+9
| |
* | Merge 0.9->0.10Matthew Wild2013-11-290-0/+0
|\|
| * Tagging 0.9.2Matthew Wild2013-11-290-0/+0
| |
* | Merge 0.9->0.10Kim Alvefur2013-11-281-0/+2
|\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-13 11:19:22 +0000