Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mod_compression: Use get_child() and get_child_text() | Kim Alvefur | 2014-04-03 | 1 | -3/+2 |
| | |||||
* | mod_compression: Remove checks for impossible conditions | Kim Alvefur | 2014-04-03 | 1 | -3/+3 |
| | |||||
* | Merge 0.9->0.10 | Matthew Wild | 2014-04-02 | 136 | -2257/+3484 |
|\ | |||||
| * | Merge 0.9->0.10 | Kim Alvefur | 2014-03-25 | 3 | -3/+8 |
| |\ | |||||
| * | | prosody.cfg.lua.dist: mod_posix is enabled by default on posix platforms now | Kim Alvefur | 2014-03-22 | 1 | -1/+1 |
| | | | |||||
| * | | util.sasl: Fix logic for when mechanisms with channel binding support are ↵ | Kim Alvefur | 2014-03-22 | 1 | -6/+8 |
| | | | | | | | | | | | | offered | ||||
| * | | Merge 0.9->0.10 | Kim Alvefur | 2014-03-09 | 2 | -5/+6 |
| |\ \ | |||||
| * \ \ | Merge 0.9->0.10 | Kim Alvefur | 2014-02-26 | 3 | -4/+9 |
| |\ \ \ | |||||
| * | | | | mod_proxy65: Use mod_disco | Florian Zeitz | 2014-02-19 | 1 | -18/+1 |
| | | | | | |||||
| * | | | | mod_auth_interal_hashed: Update salt and iteration count when setting a new ↵ | Florian Zeitz | 2014-02-12 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | password | ||||
| * | | | | Merge 0.9 -> 0.10 | Kim Alvefur | 2014-02-12 | 2 | -2/+4 |
| |\ \ \ \ | |||||
| * | | | | | 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.9->0.10 | Kim Alvefur | 2014-02-06 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge 0.9->0.10 | Kim Alvefur | 2014-02-03 | 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.9->0.10 | Matthew Wild | 2014-01-21 | 2 | -3/+4 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | 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.9->0.10 | Matthew Wild | 2014-01-18 | 3 | -14/+85 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | 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 |
| | | | | | | | | | | |||||
| * | | | | | | | | | MUC: Split saving to history into a separate method | Kim Alvefur | 2014-01-18 | 1 | -10/+13 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge | Matthew Wild | 2014-01-12 | 3 | -19/+45 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | mod_storage_sql2: Fix syntax error in subquery (Thanks Lance) | Kim Alvefur | 2014-01-05 | 1 | -2/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | util.pubsub: Separate data from node configuration | Kim Alvefur | 2013-12-30 | 1 | -7/+26 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | util.pubsub: Fire events on more actions | Kim Alvefur | 2013-12-26 | 1 | -0/+4 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | mod_pubsub: Don't sent error replies from service disco events, let ↵ | Kim Alvefur | 2013-12-30 | 1 | -6/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mod_disco handle that | ||||
| | * | | | | | | | | | mod_storage_sql2: Expose the unique key argument, allowing arbitrary ids. ↵ | Kim Alvefur | 2013-12-25 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicting items are removed. | ||||
| | * | | | | | | | | | mod_storage_sql2: Include user, host and store in id lookup | Kim Alvefur | 2013-12-25 | 1 | -4/+6 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge 0.9->0.10 | Matthew Wild | 2014-01-12 | 2 | -8/+12 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Merge 0.9->0.10 | Kim Alvefur | 2013-12-18 | 1 | -1/+7 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge 0.9->0.10 | Matthew Wild | 2013-12-16 | 2 | -6/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge 0.9->0.10 | Matthew Wild | 2013-12-16 | 1 | -1/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | mod_muc: Remove extra parenthesis (thanks janhouse) | Kim Alvefur | 2013-12-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge 0.9->0.10 | Matthew Wild | 2013-12-13 | 2 | -2/+3 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.9->0.10 | Matthew Wild | 2013-12-11 | 2 | -1/+9 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.9->0.10 | Matthew Wild | 2013-11-29 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.9->0.10 | Kim Alvefur | 2013-11-28 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.9->0.10 | Kim Alvefur | 2013-11-24 | 4 | -37/+25 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge 0.9->0.10 | Matthew Wild | 2013-11-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | util.sql: Fix previous commit | Kim Alvefur | 2013-11-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | util.sql: Get character set info from the correct database. | Kim Alvefur | 2013-11-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | | | | Merge 0.9->0.10 | Matthew Wild | 2013-11-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=false | Kim Alvefur | 2013-11-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | |