aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge 0.8->trunkMatthew Wild2011-06-120-0/+0
|\
| * Tagging 0.8.2Matthew Wild2011-06-120-0/+0
* | Merge 0.8->trunkMatthew Wild2011-06-111-4/+14
|\|
| * mod_storage_sql: Add extra logging and error handling around table creationvault/0.8.20.8.2Matthew Wild2011-06-111-4/+11
| * mod_storage_sql: Add sql_manage_tables to disable table creation/updating.Matthew Wild2011-06-111-0/+3
* | Merge 0.8->trunkMatthew Wild2011-06-074-11/+11
|\|
| * Backout bcdff2b1d3ec from 0.8 - going to commit a slightly cleaner patch for ...Matthew Wild2011-06-071-1/+1
| * mod_dialback: More robust handling of multiple outstanding dialback requests ...Matthew Wild2011-06-061-4/+4
| * Backout commit d6366294f618 which I was testing and didn't mean to push to 0.8Matthew Wild2011-06-051-20/+10
| * mod_groups: Persist changes to mod_groups contacts (e.g. moving groups)Christian Haase2011-06-051-1/+1
| * mod_bosh: Fix terminate logic - process any stanzas in a terminating request,...Matthew Wild2011-03-041-10/+20
| * migrator/prosody_sql.lua: Fix for compatibility with non-MySQL databasesMatthew Wild2011-06-051-1/+1
| * mod_storage_sql: Fix commit c806a599224a for compatibility with non-MySQL dat...Matthew Wild2011-06-051-1/+1
| * mod_bosh: Mark a session as active when a request comes in, even if we don't ...Matthew Wild2011-06-051-5/+5
* | s2smanager: Fix letter case in log message (thanks darkrain)Matthew Wild2011-06-051-1/+1
* | Merge 0.8->trunkMatthew Wild2011-06-052-10/+10
|\|
| * util.xmppstream: Check to make sure parser.stop is present before calling it.Waqas Hussain2011-06-051-1/+1
| * COPYING: Reflow the all-caps text. It was wrapping really badly in the Window...Waqas Hussain2011-06-051-7/+7
| * COPYING: Update copyright year; it's 2011 already.Waqas Hussain2011-06-051-2/+2
* | util.encodings: Fix small typo introduced in 7f789266b741Matthew Wild2011-06-041-1/+1
* | mod_component: Small code clarity fixMatthew Wild2011-06-041-1/+1
* | Merge with FlorobMatthew Wild2011-06-031-1/+1
|\ \
| * | mod_admin_adhoc: Only allow global admins to shut the server downFlorian Zeitz2011-06-031-1/+1
* | | Merge 0.8->trunkMatthew Wild2011-06-031-0/+2
|\ \ \ | |/ / |/| / | |/
| * Tagging 0.8.1Matthew Wild2011-06-030-0/+0
| * mod_storage_sql: Log error when failing to update MySQL schemavault/0.8.10.8.1Matthew Wild2011-06-031-0/+2
* | Merge 0.8->trunkMatthew Wild2011-06-032-1/+24
|\|
| * migrator/prosody_sql.lua: Create (and upgrade) MySQL tables to use MEDIUMTEXT...Matthew Wild2011-06-031-0/+18
| * migrator/prosody_files: Don't choke on empty data stores for a user (thanks @...Matthew Wild2011-06-021-1/+6
* | mod_admin_adhoc: Add "Reload configuration" commandFlorian Zeitz2011-06-021-3/+13
* | mod_adhoc: Add support for commands only executable by global administratorsFlorian Zeitz2011-06-021-6/+9
* | Merge 0.8->trunkMatthew Wild2011-06-021-2/+5
|\|
| * Merge 0.7->0.8Matthew Wild2011-06-021-2/+5
| |\
| | * Merge 0.6->0.7Matthew Wild2011-06-021-1/+4
| | |\
| | | * xmlhandlers/xmppstream: Stop the parser when encountering restricted XML, com...Matthew Wild2011-06-021-1/+4
* | | | Merge 0.8->trunkMatthew Wild2011-06-022-0/+20
|\| | |
| * | | mod_storage_sql: Switch to MEDIUMTEXT for the 'value' column when using MySQL...Matthew Wild2011-06-021-0/+18
| * | | util.json: Fixed handling of truncated JSON.Waqas Hussain2011-06-021-0/+2
* | | | Merge 0.8->trunkMatthew Wild2011-06-021-1/+0
|\| | |
| * | | Merge 0.7->0.8Matthew Wild2011-06-021-1/+0
| |\| |
| | * | Merge 0.6->0.7Matthew Wild2011-06-021-1/+0
| | |\|
| | | * xmlhandlers: Don't restrict CDATAMatthew Wild2011-06-021-1/+0
* | | | Merge 0.8->trunkMatthew Wild2011-06-020-0/+0
|\| | |
| * | | Merge 0.7->0.8Matthew Wild2011-06-010-0/+0
| |\| |
| | * | Merge 0.6->0.7Matthew Wild2011-06-011-0/+22
| | |\|
| | | * xmlhandlers: Reject XML comments, processing instructions and (if supported b...Matthew Wild2011-06-011-0/+22
| * | | util.xmppstream: Reject XML comments, processing instructions and (if support...Matthew Wild2011-06-011-0/+21
* | | | util.xmppstream: Reject XML comments, processing instructions and (if support...Matthew Wild2011-06-011-0/+21
* | | | util.encodings: Check return values before proceedingPaul Aurich2011-05-221-3/+17
* | | | util.encodings: Swap code order ("ifndef" bugs me)Paul Aurich2011-05-221-75/+77