aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Let systemd restart ejabberd on failureHolger Weiss2016-10-191-0/+1
| | | | | The "RestartSec=5" setting has no effect if "Restart" is not also specified.
* Use "Type=forking" in systemd unitHolger Weiss2016-10-191-2/+1
| | | | ejabberd is not a "oneshot" process.
* Don't set "NoNewPrivileges" in systemd unitHolger Weiss2016-10-191-3/+0
| | | | | | The "NoNewPrivileges" setting breaks some PAM and extauth setups. Fixes #1281.
* Don't let systemd hide /home and /tmpHolger Weiss2016-10-191-2/+0
| | | | | | | | | Admins might expect ejabberd to be able to access data below /home or /tmp. For example, they might use those locations to dump/restore Mnesia backups, or as a document root for mod_http_fileserver or mod_http_upload. Fixes #1297.
* Merge pull request #1343 from gardenia/mod_muc_configurable_max_discoitemsbadlop2016-10-191-19/+25
|\ | | | | New option max_rooms_discoitems instead of constant (#1236)
| * mod_muc: made the constant MAX_ROOMS_DISCOITEMS configurablecolm2016-10-181-19/+25
|/
* Fix randoms:uniform/1 returnEvgeniy Khramtsov2016-10-181-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 R19Evgeniy Khramtsov2016-10-1811-17/+29
|
* Merge pull request #1338 from marcphilipp/muc_invite_hookbadlop2016-10-171-0/+2
|\ | | | | Introduce muc_invite hook
| * Introduce muc_invite hookMarc Philipp2016-10-141-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 backendsJerome Sautret2016-10-171-1/+1
| |
* | Convert ejabberd_xmlrpc to new api_permissionsPaweł Chmielowski2016-10-143-24/+63
|/
* Always include <actions/> with ad-hoc responsesHolger Weiss2016-10-131-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 storageHolger Weiss2016-10-121-2/+3
|
* Merge pull request #1331 from weiss/send-message-omit-copiesbadlop2016-10-121-37/+2
|\ | | | | Don't let "send_message" duplicate the message
| * Don't let "send_message" duplicate the messageHolger Weiss2016-10-101-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 statisticsHolger Weiss2016-10-112-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 17Holger Weiss2016-10-071-3/+3
|
* XEP-0198: Cope with invalid 'from'/'to' attributesHolger Weiss2016-10-061-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.
* Disable one test for now, we may change how this part is handledPaweł Chmielowski2016-10-061-6/+6
|
* Use correct field for oauth scopePaweł Chmielowski2016-10-061-1/+1
|
* Make handling of oauth clauses be more consistent with other rulesPaweł Chmielowski2016-10-061-10/+24
|
* Use proper default value for api_permissionsPaweł Chmielowski2016-10-061-6/+7
|
* Fix typos in Czech translation (#1318)Badlop2016-10-052-9/+4
|
* Initialize ejabberd_access_permissions in elixir testsPaweł Chmielowski2016-10-056-6/+12
|
* New api permissions frameworkPaweł Chmielowski2016-10-059-136/+724
|
* ejabberd_sm: Clean up old offline session entriesHolger Weiss2016-10-021-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 jidChristophe Romain2016-09-291-1/+1
|
* PubSub: fix notification on subscription changeChristophe Romain2016-09-291-6/+2
|
* PubSub: fix error type on item deletion with insufficient priviledgeChristophe Romain2016-09-292-10/+10
|
* Fix 404 response formatting (thanks to Kaggggggga)(#1306)Badlop2016-09-281-1/+1
|
* ejabberd_http: Handle missing POST data gracefullyHolger Weiss2016-09-271-13/+16
| | | | | Return a "bad request" error instead of crashing if receiving POST/PUT data fails.
* Use inets instead of lhttpc in http_p1Alexey Shchepin2016-09-271-2/+2
|
* Add http_p1.erl, rest.erl, and oauth2 ReST backend for tokens.Alexey Shchepin2016-09-274-0/+638
|
* mod_carboncopy: Don't copy MUC PMsHolger Weiss2016-09-191-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 ↵Badlop2016-09-192-5/+7
| | | | (#1242)
* Revert "Fix getting of subscribed rooms: consider also temporary ones (#1242)"Badlop2016-09-192-12/+5
| | | | This reverts commit f2cc81dfead352d4e8c4b3f546d1c2d734076c5c.
* Fix getting of subscribed rooms: consider also temporary ones (#1242)Badlop2016-09-192-5/+12
|
* Store the Allow Subscription room option (#1301)Badlop2016-09-191-0/+1
|
* Don't worry about storage_type of the Acl mnesia table (#1206)Badlop2016-09-191-6/+0
|
* Use mnesia calls instead of ets for Acl and Access tables (#1206)Badlop2016-09-193-11/+11
|
* Update riakc to support r19Christophe Romain2016-09-161-6/+1
|
* node_mb_sql: Add missing (SQL-specific) functionsHolger Weiss2016-09-151-1/+8
|
* Merge pull request #1249 from weiss:push-requirements16.09Christophe Romain2016-09-133-25/+87
|\
| * Merge branch 'push-requirements' of https://github.com/weiss/ejabberd into ↵Christophe Romain2016-09-133-25/+87
|/| | | | | | | weiss-push-requirements
| * mod_mam: Add 'store_mam_message' hookHolger Weiss2016-08-151-5/+17
| | | | | | | | | | The new 'store_mam_message' hook is invoked whenever a MAM message is stored.
| * mod_offline: Add 'store_offline_message' hookHolger Weiss2016-08-151-8/+16
| | | | | | | | | | The new 'store_offline_message' hook is invoked whenever an offline message is stored.
| * ejabberd_c2s: Add XEP-0198 resumption hooksHolger Weiss2016-08-151-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 elementsHolger Weiss2016-08-151-0/+30
| |
* | Allow to create room with custom configChristophe Romain2016-09-131-13/+37
| |