Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.10->trunk | Kim Alvefur | 2014-03-09 | 2 | -5/+6 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2014-03-09 | 2 | -5/+6 |
| |\ | |||||
| | * | mod_http_files: Strip path separator from end of paths, was broken on ↵ | Kim Alvefur | 2014-03-09 | 1 | -1/+2 |
| | | | | | | | | | | | | Windows (thanks Junne) | ||||
| | * | util.pluginloader: Always use path separator from package.config (thanks Junne) | Kim Alvefur | 2014-03-09 | 1 | -4/+4 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-02-26 | 3 | -4/+9 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-02-26 | 3 | -4/+9 |
| |\| | |||||
| | * | mod_http: Fix http_external_url setting without an explicit port | Kim Alvefur | 2014-02-26 | 1 | -0/+3 |
| | | | |||||
| | * | mod_http: Use hostname from the correct context (thanks gryffus) | Kim Alvefur | 2014-02-20 | 1 | -1/+1 |
| | | | |||||
| | * | tools/ejabberd2prosody: Don't throw an error if XML CDATA is null ([] in ↵ | Waqas Hussain | 2014-02-18 | 1 | -2/+4 |
| | | | | | | | | | | | | Erlang, instead of a string or being missing). | ||||
| | * | mod_auth_anonymous: Fixed a traceback in listing all users (issue#396). | Waqas Hussain | 2014-02-17 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-02-19 | 1 | -18/+1 |
|\| | | |||||
| * | | mod_proxy65: Use mod_disco | Florian Zeitz | 2014-02-19 | 1 | -18/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-02-19 | 1 | -5/+7 |
|\| | | |||||
| * | | mod_auth_interal_hashed: Update salt and iteration count when setting a new ↵ | Florian Zeitz | 2014-02-12 | 1 | -5/+7 |
| | | | | | | | | | | | | password | ||||
* | | | Merge 0.10 -> trunk | Kim Alvefur | 2014-02-12 | 5 | -9/+12 |
|\| | | |||||
| * | | Merge 0.9 -> 0.10 | Kim Alvefur | 2014-02-12 | 2 | -2/+4 |
| |\| | |||||
| | * | mod_admin_telnet: Prep jids for user:create() etc. | Kim Alvefur | 2014-02-09 | 1 | -2/+1 |
| | | | |||||
| | * | mod_s2s: Log a warning if no local addresses are found, as this breaks s2sout | Kim Alvefur | 2014-02-09 | 1 | -0/+3 |
| | | | |||||
| * | | mod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392) | Kim Alvefur | 2014-02-12 | 1 | -1/+1 |
| | | | |||||
| * | | mod_storage_sql2: archive:delete() with username = true deletes for all users | Kim Alvefur | 2014-02-09 | 1 | -0/+4 |
| | | | |||||
| * | | mod_ping: Use type-specific event | Kim Alvefur | 2014-02-09 | 1 | -6/+3 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-02-06 | 1 | -1/+1 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-02-06 | 1 | -1/+1 |
| |\| | |||||
| | * | mod_motd: Strip indentation only, leave multiple newlines | Kim Alvefur | 2014-02-06 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Kim Alvefur | 2014-02-03 | 7 | -9/+28 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-02-03 | 1 | -1/+1 |
| |\| | |||||
| | * | tools/ejabberd2prosody: Handle new room member format. | Kim Alvefur | 2014-01-27 | 1 | -1/+1 |
| | | | |||||
| * | | mod_c2s: Break out stream opening into a separate function | Florian Zeitz | 2014-01-31 | 1 | -6/+16 |
| | | | |||||
| * | | MUC: Tag PMs with <x>, like presence stanzas | Kim Alvefur | 2014-01-28 | 1 | -0/+1 |
| | | | |||||
| * | | modulemanager: Always load a platform-specific module, add stub modules for ↵ | Kim Alvefur | 2014-01-26 | 3 | -1/+9 |
| | | | | | | | | | | | | Windows and unknown platforms | ||||
| * | | mod_posix: Daemonize by default only when installed | Kim Alvefur | 2014-01-26 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-01-21 | 3 | -5/+9 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-01-21 | 2 | -3/+4 |
| |\| | |||||
| | * | tools/ejabberd2prosody: Disable generating a config, as the format it ↵ | Waqas Hussain | 2014-01-18 | 1 | -2/+2 |
| | | | | | | | | | | | | generates is completely out of date. | ||||
| | * | tools/ejabberd2prosody: ?xmlelement? can be ?xmlel? in newer ejabberd ↵ | Waqas Hussain | 2014-01-18 | 1 | -1/+1 |
| | | | | | | | | | | | | (thanks cr). | ||||
| | * | MUC: Fire muc-room-destroyed event when the last participant leaves a ↵ | Kim Alvefur | 2014-01-18 | 1 | -0/+1 |
| | | | | | | | | | | | | non-persistent room | ||||
| * | | mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given | Kim Alvefur | 2014-01-21 | 1 | -2/+5 |
| | | | |||||
| * | | mod_storage_sql2: Fix another SQL syntax error that slipped trough | Kim Alvefur | 2014-01-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-01-18 | 3 | -14/+85 |
|\| | | |||||
| * | | Merge 0.9->0.10 | Matthew Wild | 2014-01-18 | 3 | -14/+85 |
| |\| | |||||
| | * | tools/ejabberd2prosody: Add support for importing MUC rooms. | Waqas Hussain | 2014-01-18 | 1 | -0/+51 |
| | | | |||||
| | * | tools/ejabberdsql2prosody: Skip invalid XML in data, and print out errors. | Waqas Hussain | 2014-01-16 | 1 | -10/+24 |
| | | | |||||
| | * | additional fix for erlparse loading in ejabberd2prosody.lua | Vadim Misbakh-Soloviov | 2013-06-14 | 1 | -0/+1 |
| | | | |||||
| | * | package{,c}path fixes for migration tools | Vadim Misbakh-Soloviov | 2013-06-14 | 5 | -5/+34 |
| | | | |||||
| | * | mod_tls: Let s2s_secure_auth override s2s_require_encryption and warn if ↵ | Kim Alvefur | 2014-01-15 | 1 | -0/+6 |
| | | | | | | | | | | | | they differ | ||||
| | * | mod_tls: Rename variables to be less confusing | Kim Alvefur | 2014-01-15 | 1 | -4/+4 |
| | | | |||||
* | | | Merge 0.10->trunk | Matthew Wild | 2014-01-18 | 3 | -14/+21 |
|\| | | |||||
| * | | mod_storage_sql2: Fix SQL syntax | Kim Alvefur | 2014-01-18 | 1 | -2/+2 |
| | | | |||||
| * | | MUC: Expose room metatable on module | Kim Alvefur | 2014-01-18 | 1 | -2/+3 |
| | | | |||||
| * | | MUC: Split out sending of the topic into method separate from sending history | Kim Alvefur | 2014-01-18 | 1 | -0/+3 |
| | | |