prosody.git
10 years agoplugins/muc/lock.lib: Need to let creator into the locked room :)
daurnimator [Wed, 2 Apr 2014 19:56:37 +0000 (15:56 -0400)]
plugins/muc/lock.lib: Need to let creator into the locked room :)

10 years agoplugins/muc: Move locking to seperate module
daurnimator [Wed, 2 Apr 2014 19:48:25 +0000 (15:48 -0400)]
plugins/muc: Move locking to seperate module

10 years agoplugins/muc/mod_muc: Move room locking into hook
daurnimator [Wed, 2 Apr 2014 19:36:08 +0000 (15:36 -0400)]
plugins/muc/mod_muc: Move room locking into hook

10 years agoplugins/muc/muc.lib: Move description functions out to own file
daurnimator [Wed, 2 Apr 2014 19:14:52 +0000 (15:14 -0400)]
plugins/muc/muc.lib: Move description functions out to own file

10 years agoplugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes inste...
daurnimator [Wed, 2 Apr 2014 15:35:00 +0000 (11:35 -0400)]
plugins/muc/muc.lib: Modify muc-config-submitted to keep a list of status codes instead of fields changed

10 years agoplugins/muc/muc.lib: Refactor out process_form into hooks
daurnimator [Tue, 1 Apr 2014 21:45:03 +0000 (17:45 -0400)]
plugins/muc/muc.lib: Refactor out process_form into hooks

10 years agoplugins/muc/muc.lib: Move default config layout into hooks
daurnimator [Tue, 1 Apr 2014 21:10:01 +0000 (17:10 -0400)]
plugins/muc/muc.lib: Move default config layout into hooks

10 years agoplugins/muc/muc.lib: Split up get_disco_info into events
daurnimator [Tue, 1 Apr 2014 19:41:44 +0000 (15:41 -0400)]
plugins/muc/muc.lib: Split up get_disco_info into events

This was done so we can split off functionality to other files later (e.g. plugins/muc/password)

10 years agoplugins/muc/muc.lib: Add muc-room-locked event
daurnimator [Mon, 31 Mar 2014 18:46:59 +0000 (14:46 -0400)]
plugins/muc/muc.lib: Add muc-room-locked event

10 years agoplugins/muc/muc.lib: restrict invitations in members only rooms to admins
daurnimator [Mon, 31 Mar 2014 18:45:42 +0000 (14:45 -0400)]
plugins/muc/muc.lib: restrict invitations in members only rooms to admins

10 years agoplugins/muc/muc.lib: Don't try and get occupant jids for annotating invite affiliatio...
daurnimator [Mon, 31 Mar 2014 18:44:52 +0000 (14:44 -0400)]
plugins/muc/muc.lib: Don't try and get occupant jids for annotating invite affiliation changes

10 years agoplugins/muc/muc.lib: Update declines to be more like invites
daurnimator [Mon, 31 Mar 2014 18:06:35 +0000 (14:06 -0400)]
plugins/muc/muc.lib: Update declines to be more like invites

10 years agoplugins/muc/muc.lib: Add pre-invite event. Move role check to it
daurnimator [Mon, 31 Mar 2014 17:54:27 +0000 (13:54 -0400)]
plugins/muc/muc.lib: Add pre-invite event. Move role check to it

10 years agoplugins/muc/muc.lib: Tidy up muc-invite event.
daurnimator [Mon, 31 Mar 2014 16:31:15 +0000 (12:31 -0400)]
plugins/muc/muc.lib: Tidy up muc-invite event.

  - Send inside of the actual handle_invite function
  - Move password, compat and body tagging into event handlers

10 years agoplugins/muc/muc.lib: Remove top level pre-join event. Assign event priorities for...
daurnimator [Mon, 31 Mar 2014 16:21:43 +0000 (12:21 -0400)]
plugins/muc/muc.lib: Remove top level pre-join event. Assign event priorities for other handlers

10 years agoplugins/muc/muc.lib: Use occupant methods where possible
daurnimator [Sat, 29 Mar 2014 00:28:20 +0000 (20:28 -0400)]
plugins/muc/muc.lib: Use occupant methods where possible

10 years agoplugins/muc/muc.lib: Subjects get sent even if empty.
daurnimator [Sat, 29 Mar 2014 00:25:10 +0000 (20:25 -0400)]
plugins/muc/muc.lib: Subjects get sent even if empty.

10 years agoplugins/muc/muc.lib: Fix typo (moderators vs moderator)
daurnimator [Fri, 28 Mar 2014 22:47:35 +0000 (18:47 -0400)]
plugins/muc/muc.lib: Fix typo (moderators vs moderator)

10 years agoplugins/muc/muc.lib: nick change unavailables should be from original occupant jid
daurnimator [Fri, 28 Mar 2014 22:33:57 +0000 (18:33 -0400)]
plugins/muc/muc.lib: nick change unavailables should be from original occupant jid

10 years agoplugins/muc/muc.lib: Status codes should be inside of x element
daurnimator [Fri, 28 Mar 2014 22:33:38 +0000 (18:33 -0400)]
plugins/muc/muc.lib: Status codes should be inside of x element

10 years agoplugins/muc/muc.lib: Improve set affiliation logic;
daurnimator [Fri, 28 Mar 2014 21:58:25 +0000 (17:58 -0400)]
plugins/muc/muc.lib: Improve set affiliation logic;

  - Each affiliation and role is now ranked
    - Changes up in affiliation will not downgrade your role
  - Now sends a new set of presences if you gained moderator in a semi-anonymous room.
  - Better input validation; matches closer with ':set_role'
  - Don't short circuit; as if user has non-default role they will not get updated

10 years agoplugins/muc/muc.lib: Smarter validation in set_affiliation
daurnimator [Fri, 28 Mar 2014 18:15:18 +0000 (14:15 -0400)]
plugins/muc/muc.lib: Smarter validation in set_affiliation

10 years agoplugins/muc/muc.lib: Fix anonymous check in `send_occupant_list`
daurnimator [Fri, 28 Mar 2014 17:34:46 +0000 (13:34 -0400)]
plugins/muc/muc.lib: Fix anonymous check in `send_occupant_list`

10 years agoplugins/muc/muc.lib: Allow `:send_occupant_list` to have no filter
daurnimator [Fri, 28 Mar 2014 17:14:33 +0000 (13:14 -0400)]
plugins/muc/muc.lib: Allow `:send_occupant_list` to have no filter

10 years agoplugins/muc/muc.lib: Fix sending occupant jid instead of real jid in <item/> actor
daurnimator [Fri, 28 Mar 2014 17:11:11 +0000 (13:11 -0400)]
plugins/muc/muc.lib: Fix sending occupant jid instead of real jid in <item/> actor

10 years agoplugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role
daurnimator [Fri, 28 Mar 2014 17:05:36 +0000 (13:05 -0400)]
plugins/muc/muc.lib: Clean up :set_role. Removes :can_set_role

10 years agoplugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation
daurnimator [Fri, 28 Mar 2014 15:05:52 +0000 (11:05 -0400)]
plugins/muc/muc.lib: Remove callback parameter from set_role and set_affiliation

10 years agoplugins/muc/muc.lib: non-function changes (reordering, semicolons and comments)
daurnimator [Thu, 27 Mar 2014 23:18:57 +0000 (19:18 -0400)]
plugins/muc/muc.lib: non-function changes (reordering, semicolons and comments)

10 years agoplugins/muc: Massive refactor
daurnimator [Thu, 27 Mar 2014 23:16:13 +0000 (19:16 -0400)]
plugins/muc: Massive refactor

We now have occupant objects; you grab them, modify them, save them.
New presence handling code.
Modify all presence sending to go via new functions.

10 years agoplugins/muc/muc.lib: If decline is to person in room; route to all sessions
daurnimator [Thu, 27 Mar 2014 23:16:46 +0000 (19:16 -0400)]
plugins/muc/muc.lib: If decline is to person in room; route to all sessions

10 years agoplugins/muc/muc.lib: Have timestamp as seconds since epoch inside of history
daurnimator [Thu, 27 Mar 2014 22:10:34 +0000 (18:10 -0400)]
plugins/muc/muc.lib: Have timestamp as seconds since epoch inside of history

10 years agoplugins/muc: Rename admin query hook
daurnimator [Thu, 27 Mar 2014 22:09:42 +0000 (18:09 -0400)]
plugins/muc: Rename admin query hook

10 years agoplugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nick and...
daurnimator [Mon, 24 Mar 2014 20:32:18 +0000 (16:32 -0400)]
plugins/muc/muc.lib: Add :broadcast method; use it from :broadcast_except_nick and :broadcast_message

10 years agoplugins/muc/muc.lib: Extra utility functions around subjects
daurnimator [Mon, 24 Mar 2014 17:36:43 +0000 (13:36 -0400)]
plugins/muc/muc.lib: Extra utility functions around subjects

10 years agoplugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event...
daurnimator [Mon, 24 Mar 2014 17:34:06 +0000 (13:34 -0400)]
plugins/muc/muc.lib: Add muc-get-history event; it uses an iterator in the event object so that messages don't need to be all in memory at once

10 years agoplugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history
daurnimator [Mon, 24 Mar 2014 17:10:54 +0000 (13:10 -0400)]
plugins/muc/muc.lib: Add muc-broadcast-message event. Use it for saving to history

10 years agoplugins/muc/muc.lib: Better password check
daurnimator [Mon, 24 Mar 2014 16:44:31 +0000 (12:44 -0400)]
plugins/muc/muc.lib: Better password check

10 years agoplugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members...
daurnimator [Mon, 24 Mar 2014 14:25:43 +0000 (10:25 -0400)]
plugins/muc/muc.lib: Add muc-occupant-prejoin events; Use it for banned, members-only, password, nick-conflict and lock checks

This reorders some of the checks.
Importantly; affiliations are checked first: this means banned users cannot try and guess passwords

10 years agoplugins/muc/muc.lib: Move password check and nick conflict check into `handle_join`
daurnimator [Fri, 21 Mar 2014 18:01:02 +0000 (14:01 -0400)]
plugins/muc/muc.lib: Move password check and nick conflict check into `handle_join`

10 years agoplugins/muc/muc.lib: Additional `route_to_occupant` usage
daurnimator [Thu, 20 Mar 2014 20:19:13 +0000 (16:19 -0400)]
plugins/muc/muc.lib: Additional `route_to_occupant` usage

10 years agoplugins/muc/muc.lib: Remove duplicate variable; it can never be nil.
daurnimator [Thu, 20 Mar 2014 20:14:22 +0000 (16:14 -0400)]
plugins/muc/muc.lib: Remove duplicate variable; it can never be nil.

10 years agoplugins/muc/muc.lib: Add decline event for parity with invite
daurnimator [Thu, 20 Mar 2014 19:50:29 +0000 (15:50 -0400)]
plugins/muc/muc.lib: Add decline event for parity with invite

10 years agoplugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant...
daurnimator [Thu, 20 Mar 2014 19:22:02 +0000 (15:22 -0400)]
plugins/muc/muc.lib: Add route_to_occupant function to send a stanza to all occupant sessions

10 years agoplugins/muc: Have utility methods for locking the room
daurnimator [Thu, 20 Mar 2014 15:06:10 +0000 (11:06 -0400)]
plugins/muc: Have utility methods for locking the room

10 years agoplugins/muc/muc.lib: Use occupant jids when whois == "moderators"
daurnimator [Wed, 19 Mar 2014 21:50:49 +0000 (17:50 -0400)]
plugins/muc/muc.lib: Use occupant jids when whois == "moderators"

10 years agoplugins/muc/muc.lib: Allow users with affiliations to invite while not in room themselves
daurnimator [Wed, 19 Mar 2014 21:50:00 +0000 (17:50 -0400)]
plugins/muc/muc.lib: Allow users with affiliations to invite while not in room themselves

10 years agoplugins/muc/muc.lib: Use `get_role` in `handle_admin_item_get_command`. Removed a...
daurnimator [Wed, 19 Mar 2014 21:46:25 +0000 (17:46 -0400)]
plugins/muc/muc.lib: Use `get_role` in `handle_admin_item_get_command`. Removed a TODO that's already done

10 years agoplugins/muc/muc.lib: Send invite out from event: removes '-prepared' from event name
daurnimator [Wed, 19 Mar 2014 21:33:32 +0000 (17:33 -0400)]
plugins/muc/muc.lib: Send invite out from event: removes '-prepared' from event name

10 years agoplugins/muc/muc.lib: Check role instead of current_nick
daurnimator [Wed, 19 Mar 2014 21:30:21 +0000 (17:30 -0400)]
plugins/muc/muc.lib: Check role instead of current_nick

10 years agoplugins/muc/muc.lib: Remove `payload` argument from `handle_mediated_*`; extract...
daurnimator [Wed, 19 Mar 2014 20:28:11 +0000 (16:28 -0400)]
plugins/muc/muc.lib: Remove `payload` argument from `handle_mediated_*`; extract it from inside.

10 years agoplugins/muc/muc.lib: Fix wrong variable in `construct_stanza_id` block
daurnimator [Wed, 19 Mar 2014 20:24:17 +0000 (16:24 -0400)]
plugins/muc/muc.lib: Fix wrong variable in `construct_stanza_id` block

10 years agoplugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations...
daurnimator [Wed, 19 Mar 2014 20:19:31 +0000 (16:19 -0400)]
plugins/muc/muc.lib: Add muc-invite-prepared event; Use it for granting affiliations in members only rooms

10 years agoplugins/muc/muc.lib: Don't get same variable twice.....
daurnimator [Wed, 19 Mar 2014 19:01:18 +0000 (15:01 -0400)]
plugins/muc/muc.lib: Don't get same variable twice.....

10 years agoplugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick
daurnimator [Wed, 19 Mar 2014 19:00:53 +0000 (15:00 -0400)]
plugins/muc/muc.lib: Use `get_occupant_jid` method instead of indexing _jid_nick

10 years agoplugins/muc/muc.lib: Fetch config via accessors instead of using `_data`
daurnimator [Wed, 19 Mar 2014 18:39:31 +0000 (14:39 -0400)]
plugins/muc/muc.lib: Fetch config via accessors instead of using `_data`

10 years agoplugins/muc/muc.lib: In `_route_stanza` access occupant data less often
daurnimator [Wed, 19 Mar 2014 18:35:17 +0000 (14:35 -0400)]
plugins/muc/muc.lib: In `_route_stanza` access occupant data less often

10 years agoplugins/muc/muc.lib: Tidy up `get_filtered_presence`
daurnimator [Wed, 19 Mar 2014 18:06:04 +0000 (14:06 -0400)]
plugins/muc/muc.lib: Tidy up `get_filtered_presence`

10 years agoplugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition.
daurnimator [Wed, 19 Mar 2014 17:59:59 +0000 (13:59 -0400)]
plugins/muc/muc.lib: Tidy up is_kickable_error: it didn't need to return the condition.

Also removes `get_error_condition`; it was a one liner used in one place

10 years agoplugins/muc/muc.lib: Use module.host where `muc_domain` was previously
daurnimator [Wed, 19 Mar 2014 17:57:02 +0000 (13:57 -0400)]
plugins/muc/muc.lib: Use module.host where `muc_domain` was previously

10 years agoplugins/muc/muc.lib: Remove unused methods (breaks api)
daurnimator [Wed, 19 Mar 2014 17:56:14 +0000 (13:56 -0400)]
plugins/muc/muc.lib: Remove unused methods (breaks api)

10 years agoplugins/muc/muc.lib: Use more modern stanza methods
daurnimator [Wed, 19 Mar 2014 16:19:44 +0000 (12:19 -0400)]
plugins/muc/muc.lib: Use more modern stanza methods

10 years agoplugins/muc: Provide a reasonable default `route_stanza`
daurnimator [Wed, 19 Mar 2014 16:03:15 +0000 (12:03 -0400)]
plugins/muc: Provide a reasonable default `route_stanza`

10 years agoplugins/muc/mod_muc: host sessions have a .send these days
daurnimator [Tue, 18 Mar 2014 22:56:26 +0000 (18:56 -0400)]
plugins/muc/mod_muc: host sessions have a .send these days

10 years agoplugins/muc/mod_muc: Refactor to use new methods available
daurnimator [Tue, 18 Mar 2014 22:55:52 +0000 (18:55 -0400)]
plugins/muc/mod_muc: Refactor to use new methods available

10 years agoplugins/muc/muc: Add 'muc-occupant-left' event
daurnimator [Tue, 18 Mar 2014 22:52:28 +0000 (18:52 -0400)]
plugins/muc/muc: Add 'muc-occupant-left' event

10 years agoplugins/muc/muc: Only call get_password once in invite creation
daurnimator [Tue, 18 Mar 2014 20:01:53 +0000 (16:01 -0400)]
plugins/muc/muc: Only call get_password once in invite creation

10 years agoplugins/muc/muc: When there's no history; return an empty iterator
daurnimator [Tue, 18 Mar 2014 19:42:48 +0000 (15:42 -0400)]
plugins/muc/muc: When there's no history; return an empty iterator

10 years agoplugins/muc/muc: Support mediated declines
daurnimator [Tue, 18 Mar 2014 19:15:28 +0000 (15:15 -0400)]
plugins/muc/muc: Support mediated declines

10 years agoplugins/muc/muc: Rename `handle_invite_to_room` to `handle_mediated_invite`; clean...
daurnimator [Tue, 18 Mar 2014 19:15:14 +0000 (15:15 -0400)]
plugins/muc/muc: Rename `handle_invite_to_room` to `handle_mediated_invite`; clean up logic

10 years agoplugins/muc/muc: Check for mediated invites in a smarter way
daurnimator [Tue, 18 Mar 2014 18:56:20 +0000 (14:56 -0400)]
plugins/muc/muc: Check for mediated invites in a smarter way

10 years agoplugins/muc/muc: Add copyright for daurnimator
daurnimator [Tue, 18 Mar 2014 18:54:41 +0000 (14:54 -0400)]
plugins/muc/muc: Add copyright for daurnimator

10 years agoplugins/muc/muc.lib: Add disco iq handlers with compatible argument signature
daurnimator [Sat, 22 Feb 2014 00:06:33 +0000 (19:06 -0500)]
plugins/muc/muc.lib: Add disco iq handlers with compatible argument signature

10 years agoplugins/muc/muc.lib: Move all kick code into one place
daurnimator [Fri, 21 Feb 2014 23:04:38 +0000 (18:04 -0500)]
plugins/muc/muc.lib: Move all kick code into one place

10 years agoplugins/muc/muc.lib: Make use of return values to send service-unavailable errors
daurnimator [Fri, 21 Feb 2014 22:52:40 +0000 (17:52 -0500)]
plugins/muc/muc.lib: Make use of return values to send service-unavailable errors

10 years agoplugins/muc/muc.lib: Add some missing return values
daurnimator [Fri, 21 Feb 2014 22:40:16 +0000 (17:40 -0500)]
plugins/muc/muc.lib: Add some missing return values

10 years agoplugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant`
daurnimator [Fri, 21 Feb 2014 22:17:01 +0000 (17:17 -0500)]
plugins/muc/muc.lib: Move (de)construct_stanza_id into `handle_iq_to_occupant`

It is the only place they were used; and I left the old function names in as comments.
One reason for doing this was to reduce accesses to _occupants; which may be in a database in future revisions

10 years agoplugins/muc/muc.lib: Refactor _to_occupant handlers
daurnimator [Fri, 21 Feb 2014 21:30:43 +0000 (16:30 -0500)]
plugins/muc/muc.lib: Refactor _to_occupant handlers

10 years agoplugins/muc/muc.lib: Split out the room iq handler into functions
daurnimator [Fri, 21 Feb 2014 20:48:26 +0000 (15:48 -0500)]
plugins/muc/muc.lib: Split out the room iq handler into functions

10 years agoplugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions
daurnimator [Thu, 20 Feb 2014 21:50:18 +0000 (16:50 -0500)]
plugins/muc/muc.lib: Factor `handle_to_occupant` out into many functions

10 years agoplugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko)
daurnimator [Thu, 20 Feb 2014 19:36:49 +0000 (14:36 -0500)]
plugins/muc/muc.lib: Split up `handle_to_room` into smaller handlers (thanks sysko)

10 years agoplugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history`
daurnimator [Wed, 19 Feb 2014 22:39:57 +0000 (17:39 -0500)]
plugins/muc/muc.lib: Split out `send_history` into `parse_history` and `get_history`

10 years agoplugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file
daurnimator [Tue, 18 Feb 2014 22:21:47 +0000 (17:21 -0500)]
plugins/muc/mod_muc: Move Xep-0307 MUC unique to seperate file

10 years agoMerge 0.9 -> 0.10
Kim Alvefur [Wed, 12 Feb 2014 18:26:22 +0000 (19:26 +0100)]
Merge 0.9 -> 0.10

10 years agomod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392)
Kim Alvefur [Wed, 12 Feb 2014 18:25:15 +0000 (19:25 +0100)]
mod_saslauth: Make sure sasl handler has add_cb_handler (fixes #392)

10 years agomod_admin_telnet: Prep jids for user:create() etc.
Kim Alvefur [Sun, 9 Feb 2014 14:17:01 +0000 (15:17 +0100)]
mod_admin_telnet: Prep jids for user:create() etc.

10 years agomod_s2s: Log a warning if no local addresses are found, as this breaks s2sout
Kim Alvefur [Sun, 9 Feb 2014 14:13:46 +0000 (15:13 +0100)]
mod_s2s: Log a warning if no local addresses are found, as this breaks s2sout

10 years agomod_storage_sql2: archive:delete() with username = true deletes for all users
Kim Alvefur [Sun, 9 Feb 2014 14:12:13 +0000 (15:12 +0100)]
mod_storage_sql2: archive:delete() with username = true deletes for all users

10 years agomod_ping: Use type-specific event
Kim Alvefur [Sun, 9 Feb 2014 14:09:12 +0000 (15:09 +0100)]
mod_ping: Use type-specific event

10 years agoMerge 0.9->0.10
Kim Alvefur [Thu, 6 Feb 2014 09:48:41 +0000 (10:48 +0100)]
Merge 0.9->0.10

10 years agomod_motd: Strip indentation only, leave multiple newlines
Kim Alvefur [Thu, 6 Feb 2014 09:44:21 +0000 (10:44 +0100)]
mod_motd: Strip indentation only, leave multiple newlines

10 years agoMerge 0.9->0.10
Kim Alvefur [Mon, 3 Feb 2014 06:23:33 +0000 (07:23 +0100)]
Merge 0.9->0.10

10 years agomod_c2s: Break out stream opening into a separate function
Florian Zeitz [Fri, 31 Jan 2014 11:01:12 +0000 (12:01 +0100)]
mod_c2s: Break out stream opening into a separate function

10 years agoMUC: Tag PMs with <x>, like presence stanzas
Kim Alvefur [Tue, 28 Jan 2014 18:21:21 +0000 (19:21 +0100)]
MUC: Tag PMs with <x>, like presence stanzas

10 years agotools/ejabberd2prosody: Handle new room member format.
Kim Alvefur [Mon, 27 Jan 2014 15:47:54 +0000 (16:47 +0100)]
tools/ejabberd2prosody: Handle new room member format.

10 years agomodulemanager: Always load a platform-specific module, add stub modules for Windows...
Kim Alvefur [Sun, 26 Jan 2014 20:16:24 +0000 (21:16 +0100)]
modulemanager: Always load a platform-specific module, add stub modules for Windows and unknown platforms

10 years agomod_posix: Daemonize by default only when installed
Kim Alvefur [Sun, 26 Jan 2014 17:35:03 +0000 (18:35 +0100)]
mod_posix: Daemonize by default only when installed

10 years agoMerge 0.9->0.10
Matthew Wild [Tue, 21 Jan 2014 03:24:40 +0000 (03:24 +0000)]
Merge 0.9->0.10

10 years agomod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given
Kim Alvefur [Tue, 21 Jan 2014 00:51:13 +0000 (01:51 +0100)]
mod_storage_sql2: Only attempt to delete conflicting items if an ID/key is given

10 years agomod_storage_sql2: Fix another SQL syntax error that slipped trough
Kim Alvefur [Mon, 20 Jan 2014 23:51:31 +0000 (00:51 +0100)]
mod_storage_sql2: Fix another SQL syntax error that slipped trough

10 years agotools/ejabberd2prosody: Disable generating a config, as the format it generates is...
Waqas Hussain [Sat, 18 Jan 2014 22:26:02 +0000 (17:26 -0500)]
tools/ejabberd2prosody: Disable generating a config, as the format it generates is completely out of date.