aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.10->trunkKim Alvefur2014-03-255-10/+17
|\
| * Merge 0.9->0.10Kim Alvefur2014-03-253-3/+8
| |\
| | * prosodyctl: Show real error if certificate config file can't be openedKim Alvefur2014-03-221-1/+6
| | * modulemanager: Load mod_saslauth on components by defaultKim Alvefur2014-03-221-1/+1
| | * mod_saslauth: Only do c2s SASL on normal VirtualHostsKim Alvefur2014-03-221-1/+1
| * | prosody.cfg.lua.dist: mod_posix is enabled by default on posix platforms nowKim Alvefur2014-03-221-1/+1
| * | util.sasl: Fix logic for when mechanisms with channel binding support are off...Kim Alvefur2014-03-221-6/+8
* | | Merge 0.10->trunkKim Alvefur2014-03-092-5/+6
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-03-092-5/+6
| |\|
| | * mod_http_files: Strip path separator from end of paths, was broken on Windows...Kim Alvefur2014-03-091-1/+2
| | * util.pluginloader: Always use path separator from package.config (thanks Junne)Kim Alvefur2014-03-091-4/+4
* | | Merge 0.10->trunkKim Alvefur2014-02-263-4/+9
|\| |
| * | Merge 0.9->0.10Kim Alvefur2014-02-263-4/+9
| |\|
| | * mod_http: Fix http_external_url setting without an explicit portKim Alvefur2014-02-261-0/+3
| | * mod_http: Use hostname from the correct context (thanks gryffus)Kim Alvefur2014-02-201-1/+1
| | * tools/ejabberd2prosody: Don't throw an error if XML CDATA is null ([] in Erla...Waqas Hussain2014-02-181-2/+4
| | * mod_auth_anonymous: Fixed a traceback in listing all users (issue#396).Waqas Hussain2014-02-171-1/+1
* | | Merge 0.10->trunkKim Alvefur2014-02-191-18/+1
|\| |
| * | mod_proxy65: Use mod_discoFlorian Zeitz2014-02-191-18/+1
* | | Merge 0.10->trunkKim Alvefur2014-02-191-5/+7
|\| |
| * | mod_auth_interal_hashed: Update salt and iteration count when setting a new p...Florian Zeitz2014-02-121-5/+7
* | | 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 W...Kim Alvefur2014-01-263-1/+9
| * | 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 generat...Waqas Hussain2014-01-181-2/+2
| | * tools/ejabberd2prosody: ?xmlelement? can be ?xmlel? in newer ejabberd (thanks...Waqas Hussain2014-01-181-1/+1
| | * MUC: Fire muc-room-destroyed event when the last participant leaves a non-per...Kim Alvefur2014-01-181-0/+1
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 02:25:41 +0000