Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Return more user friendly, human readable error description | Mickael Remond | 2016-07-24 | 1 | -7/+14 | |
| | | | | ||||||
| * | | | Make default OAuth token TTL values more user friendly | Mickael Remond | 2016-07-23 | 1 | -9/+7 | |
| | | | | ||||||
| * | | | Add support for checking access rules conformance for commands | Mickael Remond | 2016-07-23 | 4 | -24/+52 | |
| | | | | ||||||
| * | | | Error when not authorized should be 403 | Mickael Remond | 2016-07-23 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | Move any access rules check to ACL module | Mickael Remond | 2016-07-23 | 2 | -11/+14 | |
| | | | | ||||||
| * | | | Clean-up of error codes and format json structure | Mickael Remond | 2016-07-23 | 1 | -7/+20 | |
| | | | | ||||||
* | | | | mod_http_upload_quota: Apply cosmetic changes | Holger Weiss | 2016-07-27 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | Use "fun f/1" syntax in place of "fun(X) -> f(X) end". | |||||
* | | | | Add 'allow_subscription' MUC configuration option | Evgeniy Khramtsov | 2016-07-26 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Add DB backend support for ejabberd_oauth | Alexey Shchepin | 2016-07-25 | 3 | -36/+120 | |
| | | | | ||||||
* | | | | Export acl:parse_ip_netmask/1 for mod_rest (ejabberd-contrib#175) | Badlop | 2016-07-25 | 1 | -0/+1 | |
| | | | | ||||||
* | | | | Don't return error for blocked MUC PMs | Holger Weiss | 2016-07-24 | 1 | -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 stanza | Holger Weiss | 2016-07-23 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | Log a debug message when an unacknowledged message is neither resent nor bounced because it's archived. | |||||
* | | | Preserve PID for offline sessions | Holger Weiss | 2016-07-23 | 4 | -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 type | Pablo Polvorin | 2016-07-22 | 2 | -0/+120 | |
| | | | | | | | | | | | | As in https://tools.ietf.org/html/rfc6749#section-4.3 | |||||
* | | | stringprep might already be started | Pablo Polvorin | 2016-07-22 | 1 | -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 required | Pablo Polvorin | 2016-07-22 | 1 | -0/+1 | |
| | | | ||||||
* | | | oauth: single jid field instead of username/password fields | Pablo Polvorin | 2016-07-22 | 1 | -6/+3 | |
| | | | ||||||
* | | | Convert password provided by web form to UTF8 before passing it (#375) | Badlop | 2016-07-22 | 1 | -1/+2 | |
| | | | ||||||
* | | | Quote postgresql database name (#1136) | Jerome Sautret | 2016-07-22 | 1 | -1/+1 | |
| | | | ||||||
* | | | Fix handling of complex values as arguments in http_api | Paweł Chmielowski | 2016-07-22 | 1 | -20/+25 | |
| | | | ||||||
* | | | Merge pull request #1201 from xmppjingle/master | Evgeny Khramtsov | 2016-07-22 | 1 | -3/+7 | |
|\ \ \ | | | | | | | | | External Component Connection Hooks | |||||
| * | | | External Component Hook | xmppjingle | 2016-07-21 | 1 | -7/+3 | |
| | | | | | | | | | | | | | | | | | | | | Changed Hook Trigger Event and included a Reason upon component_disconnected/2 Hook | |||||
| * | | | Merge remote-tracking branch 'processone/master' | xmppjingle | 2016-07-18 | 1 | -27/+2 | |
| |\ \ \ | ||||||
| * | | | | External Component Connection Hooks | xmppjingle | 2016-07-18 | 1 | -2/+10 | |
| | | | | | ||||||
* | | | | | Oauth callback must pass expires_in as ttl instead of epoch | Pablo Polvorin | 2016-07-20 | 1 | -4/+4 | |
| | | | | | ||||||
* | | | | | Use different version of elixir depending on erlang version | Paweł Chmielowski | 2016-07-20 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Add else branch to if_version_{above,below} | Paweł Chmielowski | 2016-07-20 | 1 | -1/+15 | |
| | | | | | ||||||
* | | | | | Make processing of if_* clauses in rebar.config recursive | Paweł Chmielowski | 2016-07-20 | 1 | -4/+11 | |
| | | | | | ||||||
* | | | | | Fix test for changes in oauth expiry | Pablo Polvorin | 2016-07-19 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Merge branch 'master' of github.com:processone/ejabberd | Pablo Polvorin | 2016-07-19 | 1 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | mod_mam: Fix handling of result set page limit | Holger Weiss | 2016-07-19 | 1 | -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 size | Holger Weiss | 2016-07-19 | 1 | -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 TTL | Pablo Polvorin | 2016-07-19 | 1 | -29/+56 | |
|/ / / / / | ||||||
* | | | | | Upgrade Elixir version to 1.2 in rebar config | Mickael Remond | 2016-07-19 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | This matches the version used in mix.exs | |||||
* | | | | | Lock relx version as newer version does not compile fine | Mickael Remond | 2016-07-19 | 2 | -11/+14 | |
| | | | | | ||||||
* | | | | | Make access rules in ejabberd_web_admin configurable | Paweł Chmielowski | 2016-07-19 | 1 | -6/+20 | |
| | | | | | ||||||
* | | | | | Fix command argument formatting | Pablo Polvorin | 2016-07-19 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Add 'ejabberd:user' and 'ejabberd:admin' oauth scopes | Pablo Polvorin | 2016-07-19 | 5 | -45/+76 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 'ejabberd:user' includes all commands defined with policy "user". 'ejabberd:admin' includes commands defined with policy "admin". | |||||
* | | | | | Fix ce0d1704c6cc167c8bc891587952f78c55f979ad | Pablo Polvorin | 2016-07-18 | 2 | -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/> tag | Holger Weiss | 2016-07-18 | 1 | -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 stanzas | Holger Weiss | 2016-07-10 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | Just log a debug message if a stream management session times out and some stanzas weren't acknowledged. | |||||
* | | | Fix compilation error | Evgeniy Khramtsov | 2016-07-10 | 1 | -1/+1 | |
| | | | ||||||
* | | | Use hooks instead of direct calls to mod_mam | Evgeniy Khramtsov | 2016-07-09 | 3 | -67/+111 | |
| | | | ||||||
* | | | mod_http_upload_quota: Depend on mod_http_upload | Holger Weiss | 2016-07-08 | 1 | -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 iconv | Mickael Remond | 2016-07-08 | 1 | -2/+2 | |
| | | | ||||||
* | | | Do send last items only for subscription on current plugin type | Christophe Romain | 2016-07-08 | 1 | -1/+2 | |
| | | | ||||||
* | | | Rename MUC/Sub's namespace | Evgeniy Khramtsov | 2016-07-08 | 2 | -6/+6 | |
| | | | ||||||
* | | | Handle MUC/Sub subscriptions list request | Evgeniy Khramtsov | 2016-07-08 | 1 | -0/+25 | |
| | | | ||||||
* | | | Advertise MUC/Sub support in MUC service disco#info | Evgeniy Khramtsov | 2016-07-08 | 1 | -0/+2 | |
| | | | ||||||
* | | | Experimental MUC/Sub support | Evgeniy Khramtsov | 2016-07-08 | 3 | -345/+706 | |
| | | |