Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mod_muc: made the constant MAX_ROOMS_DISCOITEMS configurable | colm | 2016-10-18 | 1 | -19/+25 |
| | |||||
* | Fix randoms:uniform/1 return | Evgeniy Khramtsov | 2016-10-18 | 1 | -1/+1 |
| | | | | | Make sure randoms:uniform/1 returns values from the same interval as deprecated random:uniform/1 | ||||
* | Get rid of compile warnings for random/crypto modules on R19 | Evgeniy Khramtsov | 2016-10-18 | 10 | -17/+28 |
| | |||||
* | Merge pull request #1338 from marcphilipp/muc_invite_hook | badlop | 2016-10-17 | 1 | -0/+2 |
|\ | | | | | Introduce muc_invite hook | ||||
| * | Introduce muc_invite hook | Marc Philipp | 2016-10-14 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This adds a new hook that is triggered for each invite to an MUC room: - muc_invite(RoomJID, RoomConfig, From, To, Reason) -> ok where - RoomJID = From = To = #jid (see jlib.h) - RoomConfig = #config (see mod_muc_room.hrl) - Reason = binary() | ||||
* | | Fix delete_old_messages command for SQL backends | Jerome Sautret | 2016-10-17 | 1 | -1/+1 |
| | | |||||
* | | Convert ejabberd_xmlrpc to new api_permissions | Paweł Chmielowski | 2016-10-14 | 3 | -24/+63 |
|/ | |||||
* | Always include <actions/> with ad-hoc responses | Holger Weiss | 2016-10-13 | 1 | -2/+10 |
| | | | | | | XEP-0050 says: "The result for each stage (other than the last) of a command's execution SHOULD include an <actions/> element." Some clients insist on this. | ||||
* | Don't let MAM messages go into offline storage | Holger Weiss | 2016-10-12 | 1 | -2/+3 |
| | |||||
* | Merge pull request #1331 from weiss/send-message-omit-copies | badlop | 2016-10-12 | 1 | -37/+2 |
|\ | | | | | Don't let "send_message" duplicate the message | ||||
| * | Don't let "send_message" duplicate the message | Holger Weiss | 2016-10-10 | 1 | -37/+2 |
| | | | | | | | | | | | | | | | | In the past, the "send_message" command sent a copy of the message to each resource if the message was addressed to the bare JID of a local online user. When message carbons are enabled, this creates duplicates; and with MAM enabled, each copy is archived. Therefore, "send_message" no longer creates copies of the message. | ||||
* | | Ignore offline sessions in statistics | Holger Weiss | 2016-10-11 | 2 | -9/+4 |
|/ | | | | | | | | Offline sessions should not be counted when reporting the number of connected resources. Apart from that, this number is now also reported when using a non-default session management backend. | ||||
* | Make map syntax compatible with Erlang/OTP 17 | Holger Weiss | 2016-10-07 | 1 | -3/+3 |
| | |||||
* | XEP-0198: Cope with invalid 'from'/'to' attributes | Holger Weiss | 2016-10-06 | 1 | -3/+6 |
| | | | | | | | | Check whether the 'from' and 'to' attributes are valid before bouncing or resending a stanza from the stream management queue. They might be invalid in certain corner cases. Thanks to Evgeniy for spotting this. | ||||
* | Use correct field for oauth scope | Paweł Chmielowski | 2016-10-06 | 1 | -1/+1 |
| | |||||
* | Make handling of oauth clauses be more consistent with other rules | Paweł Chmielowski | 2016-10-06 | 1 | -10/+24 |
| | |||||
* | Use proper default value for api_permissions | Paweł Chmielowski | 2016-10-06 | 1 | -6/+7 |
| | |||||
* | New api permissions framework | Paweł Chmielowski | 2016-10-05 | 9 | -136/+724 |
| | |||||
* | ejabberd_sm: Clean up old offline session entries | Holger Weiss | 2016-10-02 | 1 | -3/+11 |
| | | | | | If the number of offline sessions exceeds the 'max_user_sessions' limit, remove the oldest entry from the table. | ||||
* | PubSub: creation jid must be bare jid | Christophe Romain | 2016-09-29 | 1 | -1/+1 |
| | |||||
* | PubSub: fix notification on subscription change | Christophe Romain | 2016-09-29 | 1 | -6/+2 |
| | |||||
* | PubSub: fix error type on item deletion with insufficient priviledge | Christophe Romain | 2016-09-29 | 2 | -10/+10 |
| | |||||
* | Fix 404 response formatting (thanks to Kaggggggga)(#1306) | Badlop | 2016-09-28 | 1 | -1/+1 |
| | |||||
* | ejabberd_http: Handle missing POST data gracefully | Holger Weiss | 2016-09-27 | 1 | -13/+16 |
| | | | | | Return a "bad request" error instead of crashing if receiving POST/PUT data fails. | ||||
* | Use inets instead of lhttpc in http_p1 | Alexey Shchepin | 2016-09-27 | 1 | -2/+2 |
| | |||||
* | Add http_p1.erl, rest.erl, and oauth2 ReST backend for tokens. | Alexey Shchepin | 2016-09-27 | 4 | -0/+638 |
| | |||||
* | mod_carboncopy: Don't copy MUC PMs | Holger Weiss | 2016-09-19 | 1 | -2/+8 |
| | | | | | | | Carbon copies of private MUC message are generally not desired, especially not when multiple clients joined the room with the same nick. In this case, the MUC service usually sends PMs to all joined resources anyway, so carbon-copying those PMs would create duplicates. | ||||
* | When getting list of subscribed rooms, check all including temporary ones ↵ | Badlop | 2016-09-19 | 2 | -5/+7 |
| | | | | (#1242) | ||||
* | Revert "Fix getting of subscribed rooms: consider also temporary ones (#1242)" | Badlop | 2016-09-19 | 2 | -12/+5 |
| | | | | This reverts commit f2cc81dfead352d4e8c4b3f546d1c2d734076c5c. | ||||
* | Fix getting of subscribed rooms: consider also temporary ones (#1242) | Badlop | 2016-09-19 | 2 | -5/+12 |
| | |||||
* | Store the Allow Subscription room option (#1301) | Badlop | 2016-09-19 | 1 | -0/+1 |
| | |||||
* | Don't worry about storage_type of the Acl mnesia table (#1206) | Badlop | 2016-09-19 | 1 | -6/+0 |
| | |||||
* | Use mnesia calls instead of ets for Acl and Access tables (#1206) | Badlop | 2016-09-19 | 3 | -11/+11 |
| | |||||
* | node_mb_sql: Add missing (SQL-specific) functions | Holger Weiss | 2016-09-15 | 1 | -1/+8 |
| | |||||
* | Merge branch 'push-requirements' of https://github.com/weiss/ejabberd into ↵ | Christophe Romain | 2016-09-13 | 3 | -25/+87 |
|\ | | | | | | | weiss-push-requirements | ||||
| * | mod_mam: Add 'store_mam_message' hook | Holger Weiss | 2016-08-15 | 1 | -5/+17 |
| | | | | | | | | | | The new 'store_mam_message' hook is invoked whenever a MAM message is stored. | ||||
| * | mod_offline: Add 'store_offline_message' hook | Holger Weiss | 2016-08-15 | 1 | -8/+16 |
| | | | | | | | | | | The new 'store_offline_message' hook is invoked whenever an offline message is stored. | ||||
| * | ejabberd_c2s: Add XEP-0198 resumption hooks | Holger Weiss | 2016-08-15 | 1 | -12/+24 |
| | | | | | | | | | | | | The new 'c2s_session_pending' and 'c2s_session_resumed' hooks are invoked when a stream management session is pending and resumed, respectively. | ||||
| * | Add functions to get/set some c2s state elements | Holger Weiss | 2016-08-15 | 1 | -0/+30 |
| | | |||||
* | | Allow to create room with custom config | Christophe Romain | 2016-09-13 | 1 | -13/+37 |
| | | |||||
* | | Expand parsing of json input to be able to handle update_roster command | Paweł Chmielowski | 2016-09-13 | 1 | -0/+19 |
| | | |||||
* | | Add X-Admin and basic auth header to CORS allowed headers in http_api | Paweł Chmielowski | 2016-09-12 | 1 | -1/+1 |
| | | |||||
* | | Properly process OPTIONS header in http_api for all paths | Paweł Chmielowski | 2016-09-12 | 1 | -1/+3 |
| | | |||||
* | | Fix nick-to-jid mapping for MUC subscribers | Evgeniy Khramtsov | 2016-09-12 | 1 | -12/+33 |
| | | |||||
* | | Support multiple room invitations (#1285) | Badlop | 2016-09-09 | 1 | -23/+40 |
| | | |||||
* | | Fix subscribed rooms list retreivement | Evgeniy Khramtsov | 2016-09-09 | 1 | -1/+2 |
| | | |||||
* | | XEP-0198: Cancel timer when waiting for resumption | Holger Weiss | 2016-09-09 | 1 | -1/+7 |
| | | | | | | | | | | If an ACK timer is active while going into the 'wait_for_resume' state, cancel that timer. | ||||
* | | Revert "Don't log an [error] message if Elixir is missing" | Holger Weiss | 2016-09-08 | 1 | -1/+1 |
| | | | | | | | | | | This reverts commit 41386d718dbc5f6e846baaac568ba1cae5eb7ec4. The issue was fixed with commit 4bd45bada70fc233bb87bc7ab099fc2407cea30b. | ||||
* | | Don't log an [error] message if Elixir is missing | Holger Weiss | 2016-09-08 | 1 | -1/+1 |
| | | | | | | | | | | | | The Elixir support is still optional. Closes #1250. | ||||
* | | Fix typo on previous commit (#1284) | Christophe Romain | 2016-09-08 | 1 | -1/+1 |
| | |