aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge 0.9->0.10Matthew Wild2014-04-02136-2257/+3484
|\
| * Merge 0.9->0.10Kim Alvefur2014-03-253-3/+8
| |\
| * | 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 ↵Kim Alvefur2014-03-221-6/+8
| | | | | | | | | | | | offered
| * | Merge 0.9->0.10Kim Alvefur2014-03-092-5/+6
| |\ \
| * \ \ Merge 0.9->0.10Kim Alvefur2014-02-263-4/+9
| |\ \ \
| * | | | mod_proxy65: Use mod_discoFlorian Zeitz2014-02-191-18/+1
| | | | |
| * | | | mod_auth_interal_hashed: Update salt and iteration count when setting a new ↵Florian Zeitz2014-02-121-5/+7
| | | | | | | | | | | | | | | | | | | | password
| * | | | Merge 0.9 -> 0.10Kim Alvefur2014-02-122-2/+4
| |\ \ \ \
| * | | | | 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.9->0.10Kim Alvefur2014-02-061-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge 0.9->0.10Kim Alvefur2014-02-031-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.9->0.10Matthew Wild2014-01-212-3/+4
| |\ \ \ \ \ \ \
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge 0.9->0.10Kim Alvefur2013-12-181-1/+7
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge 0.9->0.10Matthew Wild2013-12-162-6/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->0.10Matthew Wild2013-12-161-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | mod_muc: Remove extra parenthesis (thanks janhouse)Kim Alvefur2013-12-141-1/+1
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-12-132-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->0.10Matthew Wild2013-12-112-1/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->0.10Matthew Wild2013-11-290-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->0.10Kim Alvefur2013-11-281-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->0.10Kim Alvefur2013-11-244-37/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge 0.9->0.10Matthew Wild2013-11-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | util.sql: Fix previous commitKim Alvefur2013-11-121-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | util.sql: Get character set info from the correct database.Kim Alvefur2013-11-121-1/+1
| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge 0.9->0.10Matthew Wild2013-11-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | mod_storage_sql2: Auto increment columns won't be NULL, so drop nullable=falseKim Alvefur2013-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | util.sql: Rewrite auto increment columns to SERIAL for PostgreSQLKim Alvefur2013-11-111-3/+4
| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | util.sql: Fix to call execute on 'self' rather than 'engine' (thanks eisensheng)Matthew Wild2013-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-17 23:51:29 +0000