aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge 0.10 -> trunkKim Alvefur2014-02-125-9/+12
|\| |
| * | Merge 0.9 -> 0.10Kim Alvefur2014-02-122-2/+4
| |\|
| | * mod_admin_telnet: Prep jids for user:create() etc.Kim Alvefur2014-02-091-2/+1
| | |
| | * mod_s2s: Log a warning if no local addresses are found, as this breaks s2soutKim Alvefur2014-02-091-0/+3
| | |
| * | mod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392)Kim Alvefur2014-02-121-1/+1
| | |
| * | mod_storage_sql2: archive:delete() with username = true deletes for all usersKim Alvefur2014-02-091-0/+4
| | |
| * | mod_ping: Use type-specific eventKim Alvefur2014-02-091-6/+3
| | |
* | | Merge 0.10->trunkKim Alvefur2014-02-061-1/+1
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-02-061-1/+1
| |\|
| | * mod_motd: Strip indentation only, leave multiple newlinesKim Alvefur2014-02-061-1/+1
| | |
* | | Merge 0.10->trunkKim Alvefur2014-02-037-9/+28
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-02-031-1/+1
| |\|
| | * tools/ejabberd2prosody: Handle new room member format.Kim Alvefur2014-01-271-1/+1
| | |
| * | mod_c2s: Break out stream opening into a separate functionFlorian Zeitz2014-01-311-6/+16
| | |
| * | MUC: Tag PMs with <x>, like presence stanzasKim Alvefur2014-01-281-0/+1
| | |
| * | 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.10->trunkMatthew Wild2014-01-213-5/+9
|\| |
| * | 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.10->trunkMatthew Wild2014-01-183-14/+85
|\| |
| * | 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
| | |
* | | Merge 0.10->trunkMatthew Wild2014-01-183-14/+21
|\| |
| * | 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
| | |
* | | Merge 0.10->trunkMatthew Wild2014-01-123-10/+14
|\| |
| * | MergeMatthew Wild2014-01-123-19/+45
| |\ \
| | * | mod_storage_sql2: Fix syntax error in subquery (Thanks Lance)Kim Alvefur2014-01-051-2/+2
| | | |
| * | | 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.10->trunk and Happy New Year!Kim Alvefur2013-12-313-26/+45
|\ \ \ \ | | |_|/ | |/| |
| * | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 12:02:11 +0000