aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Return more user friendly, human readable error descriptionMickael Remond2016-07-241-7/+14
| | | |
| * | | Make default OAuth token TTL values more user friendlyMickael Remond2016-07-231-9/+7
| | | |
| * | | Add support for checking access rules conformance for commandsMickael Remond2016-07-234-24/+52
| | | |
| * | | Error when not authorized should be 403Mickael Remond2016-07-231-5/+5
| | | |
| * | | Move any access rules check to ACL moduleMickael Remond2016-07-232-11/+14
| | | |
| * | | Clean-up of error codes and format json structureMickael Remond2016-07-231-7/+20
| | | |
* | | | mod_http_upload_quota: Apply cosmetic changesHolger Weiss2016-07-271-3/+3
| | | | | | | | | | | | | | | | Use "fun f/1" syntax in place of "fun(X) -> f(X) end".
* | | | Add 'allow_subscription' MUC configuration optionEvgeniy Khramtsov2016-07-261-0/+1
| | | |
* | | | Add DB backend support for ejabberd_oauthAlexey Shchepin2016-07-253-36/+120
| | | |
* | | | Export acl:parse_ip_netmask/1 for mod_rest (ejabberd-contrib#175)Badlop2016-07-251-0/+1
| | | |
* | | | Don't return error for blocked MUC PMsHolger Weiss2016-07-241-5/+12
|/ / / | | | | | | | | | | | | | | | | | | If a message stanza is blocked as per XEP-0016 or XEP-0191 and the stanza is marked as a private MUC message, don't return an error. This makes sure users won't be kicked from MUC rooms when blocking other participants.
* | | XEP-0198: Log debug message when dropping stanzaHolger Weiss2016-07-231-0/+3
| | | | | | | | | | | | | | | Log a debug message when an unacknowledged message is neither resent nor bounced because it's archived.
* | | Preserve PID for offline sessionsHolger Weiss2016-07-234-42/+59
| | | | | | | | | | | | | | | | | | | | | Don't set the PID to 'undefined' when a session goes offline, as this looses the information which node created the session table entry. Fixes #1196.
* | | Support oauth password grant typePablo Polvorin2016-07-222-0/+120
| | | | | | | | | | | | As in https://tools.ietf.org/html/rfc6749#section-4.3
* | | stringprep might already be startedPablo Polvorin2016-07-221-1/+1
| | | | | | | | | | | | | | | | | | Depending on the way the test us ran (full test suite or the elixir quicktest one) the stringprep might already be loaded.
* | | Fix elixir test case: stringprep was requiredPablo Polvorin2016-07-221-0/+1
| | |
* | | oauth: single jid field instead of username/password fieldsPablo Polvorin2016-07-221-6/+3
| | |
* | | Convert password provided by web form to UTF8 before passing it (#375)Badlop2016-07-221-1/+2
| | |
* | | Quote postgresql database name (#1136)Jerome Sautret2016-07-221-1/+1
| | |
* | | Fix handling of complex values as arguments in http_apiPaweł Chmielowski2016-07-221-20/+25
| | |
* | | Merge pull request #1201 from xmppjingle/masterEvgeny Khramtsov2016-07-221-3/+7
|\ \ \ | | | | | | | | External Component Connection Hooks
| * | | External Component Hookxmppjingle2016-07-211-7/+3
| | | | | | | | | | | | | | | | | | | | Changed Hook Trigger Event and included a Reason upon component_disconnected/2 Hook
| * | | Merge remote-tracking branch 'processone/master'xmppjingle2016-07-181-27/+2
| |\ \ \
| * | | | External Component Connection Hooksxmppjingle2016-07-181-2/+10
| | | | |
* | | | | Oauth callback must pass expires_in as ttl instead of epochPablo Polvorin2016-07-201-4/+4
| | | | |
* | | | | Use different version of elixir depending on erlang versionPaweł Chmielowski2016-07-201-1/+1
| | | | |
* | | | | Add else branch to if_version_{above,below}Paweł Chmielowski2016-07-201-1/+15
| | | | |
* | | | | Make processing of if_* clauses in rebar.config recursivePaweł Chmielowski2016-07-201-4/+11
| | | | |
* | | | | Fix test for changes in oauth expiryPablo Polvorin2016-07-191-1/+1
| | | | |
* | | | | Merge branch 'master' of github.com:processone/ejabberdPablo Polvorin2016-07-191-0/+2
|\ \ \ \ \
| * | | | | mod_mam: Fix handling of result set page limitHolger Weiss2016-07-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore function clause for handling a client-specified result set page limit that doesn't exceed mod_mam's upper threshold.
| * | | | | mod_mam: Always limit result set page sizeHolger Weiss2016-07-191-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit the number of messages returned for a given MAM request even if the client didn't specify an RSM set (not just if the client specified an RSM set without a limit). This is still not done for MAM v0.2 requests though, as that version of the XEP doesn't require clients to support RSM.
* | | | | | Let user choose the desired oauth token TTLPablo Polvorin2016-07-191-29/+56
|/ / / / /
* | | | | Upgrade Elixir version to 1.2 in rebar configMickael Remond2016-07-191-1/+1
| | | | | | | | | | | | | | | | | | | | This matches the version used in mix.exs
* | | | | Lock relx version as newer version does not compile fineMickael Remond2016-07-192-11/+14
| | | | |
* | | | | Make access rules in ejabberd_web_admin configurablePaweł Chmielowski2016-07-191-6/+20
| | | | |
* | | | | Fix command argument formattingPablo Polvorin2016-07-191-1/+1
| | | | |
* | | | | Add 'ejabberd:user' and 'ejabberd:admin' oauth scopesPablo Polvorin2016-07-195-45/+76
| | | | | | | | | | | | | | | | | | | | | | | | | 'ejabberd:user' includes all commands defined with policy "user". 'ejabberd:admin' includes commands defined with policy "admin".
* | | | | Fix ce0d1704c6cc167c8bc891587952f78c55f979adPablo Polvorin2016-07-182-38/+38
| |/ / / |/| | | | | | | | | | | | | | | | | | | Original request was to allow ejabberd sysadmin to generate tokens for specific users. JIDs must not be passed as argument when requesting the tokens.
* | | | jlib: Don't try to keep just one <delay/> tagHolger Weiss2016-07-181-27/+2
|/ / / | | | | | | | | | | | | | | | | | | It seems unclear whether XEP-0203 really mandates that stanzas may not have multiple <delay/> tags. Editing/removing existing tags doesn't seem worth the effort, especially as we'd have to take more care which tag to keep if the stanza already has more than one.
* | | Omit [info] message with number of queued stanzasHolger Weiss2016-07-101-2/+2
| | | | | | | | | | | | | | | Just log a debug message if a stream management session times out and some stanzas weren't acknowledged.
* | | Fix compilation errorEvgeniy Khramtsov2016-07-101-1/+1
| | |
* | | Use hooks instead of direct calls to mod_mamEvgeniy Khramtsov2016-07-093-67/+111
| | |
* | | mod_http_upload_quota: Depend on mod_http_uploadHolger Weiss2016-07-081-1/+1
| | | | | | | | | | | | | | | mod_http_upload_quota uses mod_http_upload's "docroot" option, so the mod_http_upload configuration must be parsed, first. Fixes #1025.
* | | Update stringprep and iconvMickael Remond2016-07-081-2/+2
| | |
* | | Do send last items only for subscription on current plugin typeChristophe Romain2016-07-081-1/+2
| | |
* | | Rename MUC/Sub's namespaceEvgeniy Khramtsov2016-07-082-6/+6
| | |
* | | Handle MUC/Sub subscriptions list requestEvgeniy Khramtsov2016-07-081-0/+25
| | |
* | | Advertise MUC/Sub support in MUC service disco#infoEvgeniy Khramtsov2016-07-081-0/+2
| | |
* | | Experimental MUC/Sub supportEvgeniy Khramtsov2016-07-083-345/+706
| | |