Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 0.9->trunk (who has been pushing to trunk?) | Matthew Wild | 2012-08-05 | 1 | -1/+5 |
|\ | |||||
| * | MUC: Fix private IQ results and errors for non-vcard queries. | Waqas Hussain | 2012-08-04 | 1 | -1/+5 |
| | | |||||
* | | hostmanager, mod_disco: Show optional 'name' option from the config in ↵ | Matthew Wild | 2012-08-05 | 1 | -2/+2 |
|/ | | | | disco#items queries (fixes use-case in #292) (thanks diSabler, mva) | ||||
* | mod_admin_adhoc, mod_announce: Explicitly specify possible actions for ↵ | Florian Zeitz | 2012-08-02 | 2 | -13/+13 |
| | | | | ad-hoc commands | ||||
* | mod_adhoc: Add support for specifying a default action | Florian Zeitz | 2012-08-02 | 1 | -2/+2 |
| | |||||
* | mod_muc: Fix syntax error (thanks Florob) | Matthew Wild | 2012-08-01 | 1 | -1/+1 |
| | |||||
* | mod_bosh: Remove redundant code (send stream features in only one place) ↵ | Matthew Wild | 2012-08-01 | 1 | -5/+1 |
| | | | | (thanks Zash) | ||||
* | mod_bosh: Remove troublesome return... continue processing of the streamopen ↵ | Matthew Wild | 2012-08-01 | 1 | -1/+0 |
| | | | | after session creation (because since 16c7b510694b we no longer send an early response) | ||||
* | MUC: Give host and server admins "owner" affiliation in all rooms. | Waqas Hussain | 2012-08-01 | 1 | -1/+13 |
| | |||||
* | MUC: Expose room metatable in the MUC lib. | Waqas Hussain | 2012-08-01 | 1 | -0/+2 |
| | |||||
* | MUC: Send unavailable presence when the component or server is shutting down. | Waqas Hussain | 2012-08-01 | 1 | -0/+27 |
| | |||||
* | MUC: Fix private IQ and message routing. | Waqas Hussain | 2012-08-01 | 1 | -27/+45 |
| | | | | | | - All private IQ results are now routed to the resource that send the original request - Private messages are now routed to all of the user's sessions - Much cleaner code | ||||
* | mod_presence, rostermanager: Bring outbound subscription cancellation in ↵ | Waqas Hussain | 2012-08-01 | 1 | -5/+12 |
| | | | | line with RFC6121. | ||||
* | mod_component: For disconnected external components, if a name is specified ↵ | Waqas Hussain | 2012-08-01 | 1 | -0/+12 |
| | | | | in config, return it in disco#info replies. | ||||
* | MUC: Return <item-not-found/> on message and iq to non-existent rooms ↵ | Waqas Hussain | 2012-08-01 | 1 | -0/+4 |
| | | | | (thanks Maranda). | ||||
* | mod_storage_sql: Return connection from connect even if already connected ↵ | Matthew Wild | 2012-07-30 | 1 | -1/+1 |
| | | | | (thanks IRON) | ||||
* | mod_storage_sql: Complete transactions in list_stores and purge | Kim Alvefur | 2012-07-30 | 1 | -5/+5 |
| | |||||
* | mod_storage_sql: Keep connections in a shared cache table | Kim Alvefur | 2012-07-30 | 1 | -0/+22 |
| | |||||
* | mod_bosh: Correctly handle data included in the session initiation request, ↵ | Matthew Wild | 2012-07-29 | 1 | -37/+43 |
| | | | | and cork session while a request is being processed, preventing replying to requests when there may be more data to come, reducing round-trips. | ||||
* | Merge with Zash | Matthew Wild | 2012-07-28 | 2 | -2/+39 |
|\ | |||||
| * | mod_storage_sql: Add method for removing all data belonging to a user | Kim Alvefur | 2012-07-28 | 1 | -0/+8 |
| | | |||||
| * | mod_storage_internal: Add method for removing all data belonging to a user | Kim Alvefur | 2012-07-28 | 1 | -0/+4 |
| | | |||||
| * | mod_storage_sql: Add method for listing stores | Kim Alvefur | 2012-07-28 | 1 | -0/+18 |
| | | |||||
| * | mod_storage_sql: Split out query handling logic from getsql() into a ↵ | Kim Alvefur | 2012-07-28 | 1 | -2/+5 |
| | | | | | | | | separate function | ||||
| * | mod_storage_internal: Add method for listing stores | Kim Alvefur | 2012-07-28 | 1 | -0/+4 |
| | | |||||
* | | mod_bosh: Backout revision bc0a68cae236 (experimental bosh_auto_cork option) ↵ | Matthew Wild | 2012-07-28 | 1 | -2/+1 |
|/ | | | | as I don't believe it works | ||||
* | mod_admin_telnet: Import prosody.incoming_s2s | Matthew Wild | 2012-07-28 | 1 | -5/+6 |
| | |||||
* | mod_admin_telnet: Fix usage of incorrect variable | Matthew Wild | 2012-07-28 | 1 | -1/+1 |
| | |||||
* | mod_admin_telnet: Remove unused variable | Matthew Wild | 2012-07-28 | 1 | -1/+1 |
| | |||||
* | mod_admin_telnet: Import portmanager and s2smanager, as they are both used | Matthew Wild | 2012-07-28 | 1 | -0/+2 |
| | |||||
* | mod_admin_telnet: Fix broken indentation | Matthew Wild | 2012-07-28 | 1 | -14/+14 |
| | |||||
* | mod_admin_telnet: Use module:get_option() instead of configmanager directly | Matthew Wild | 2012-07-28 | 1 | -1/+1 |
| | |||||
* | Merge with Florob | Matthew Wild | 2012-07-28 | 28 | -295/+445 |
|\ | |||||
| * | mod_dialback: Ignore <db:verify/> with a 'type' attribute on incoming ↵ | Matthew Wild | 2012-07-27 | 1 | -0/+5 |
| | | | | | | | | connections, instead of interpreting them as a request to verify a key | ||||
| * | mod_vcard: Remove vcard_compatibility COMPAT (moved to mod_compat_vcard in ↵ | Matthew Wild | 2012-07-26 | 1 | -9/+4 |
| | | | | | | | | prosody-modules), and add warning for those using the option | ||||
| * | mod_muc: Remove unused variable and pull hosts into a local | Kim Alvefur | 2012-07-26 | 1 | -3/+3 |
| | | |||||
| * | mod_muc: Use module:send() instead of core_*_stanza() | Kim Alvefur | 2012-07-26 | 1 | -2/+2 |
| | | |||||
| * | mod_announce, mod_motd, mod_pubsub, mod_register, mod_watchregistrations, ↵ | Kim Alvefur | 2012-07-26 | 6 | -7/+7 |
| | | | | | | | | mod_welcome: Use module:send() instead of core_*_stanza() | ||||
| * | mod_admin_adhoc, mod_admin_telnet, mod_bosh, mod_c2s, mod_component, ↵ | Kim Alvefur | 2012-07-26 | 9 | -5/+10 |
| | | | | | | | | mod_pep, mod_presence, mod_roster, mod_s2s: Import core_post_stanza from the global prosody table. | ||||
| * | mod_admin_telnet: Add xmpp:ping(from, to), useful for initiating s2s connections | Kim Alvefur | 2012-07-26 | 1 | -0/+14 |
| | | |||||
| * | Merge with Zash | Matthew Wild | 2012-07-25 | 1 | -4/+3 |
| |\ | |||||
| | * | mod_admin_telnet: Remove useless call to string.lower() | Kim Alvefur | 2012-07-24 | 1 | -2/+1 |
| | | | |||||
| | * | mod_admin_telnet: Add missing import of usermanager | Kim Alvefur | 2012-07-24 | 1 | -0/+2 |
| | | | |||||
| | * | mod_admin_telnet: Remove unused or duplicated locals | Kim Alvefur | 2012-07-24 | 1 | -2/+0 |
| | | | |||||
| * | | mod_pep: Allow configurable service discovery identity (Fix) | IRON | 2012-07-25 | 1 | -1/+1 |
| | | | |||||
| * | | mod_pep: Allow configurable service discovery identity | IRON | 2012-07-25 | 1 | -1/+1 |
| |/ | |||||
| * | mod_auth_cyrus, util.sasl_cyrus: Add new option 'cyrus_server_fqdn' to ↵ | Matthew Wild | 2012-07-24 | 1 | -1/+3 |
| | | | | | | | | override the hostname passed to Cyrus (and used in e.g. GSSAPI/Kerberos) - fixes #295 | ||||
| * | mod_muc: Fix a couple of cases of 'forbidden' stanza error being sent with ↵ | Matthew Wild | 2012-07-24 | 1 | -2/+2 |
| | | | | | | | | type 'cancel' - fixes #303 | ||||
| * | mod_bosh: Use new format for headers when checking for proxies to get the ↵ | Kim Alvefur | 2012-07-23 | 1 | -1/+1 |
| | | | | | | | | originating IP | ||||
| * | mod_s2s: Bump s2s_timeout to 90, to allow for the TCP timeout (in most ↵ | Matthew Wild | 2012-07-23 | 1 | -1/+1 |
| | | | | | | | | cases) - this allows us to continue to try other targets |