Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #684 from wcy123/master | Evgeny Khramtsov | 2016-03-25 | 1 | -1/+1 |
|\ | | | | | bug fix: ejabberd:start_app need to pass Type to application:start | ||||
| * | bug fix: ejabberd:start_app need to pass Type to application:start | wcy123 | 2015-07-30 | 1 | -1/+1 |
| | | |||||
* | | Merge commit 'refs/pull/524/head' of github.com:processone/ejabberd into ↵ | Evgeniy Khramtsov | 2016-03-25 | 18 | -116/+157 |
|\ \ | | | | | | | | | | sasl-api-change | ||||
| * | | Use SASL PLAIN authzid as client identity if auth module permits it | Ben Langfeld | 2015-05-06 | 16 | -261/+306 |
| | | | | | | | | | | | | | | | | | | This allows the authentication modules to perform SASL proxy authentication. It puts the onus on them to authorize the authcid to masquerade as the authzid. Doesn't currently implement such functionality in existing auth modules, since they cannot currently codify a relationship between the two identities. Does not permit the authzid to use a domain differently from the one of the connection. Note: digest might not work, but I have no interest in it, being deprecated. | ||||
| * | | Remove commented code | Ben Langfeld | 2015-05-06 | 1 | -4/+0 |
| | | | |||||
* | | | Allow running test groups independently | Mickael Remond | 2016-03-24 | 1 | -20/+51 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to be able to run only a few test groups, even if we do not have all database backends installed and configured locally. ejabberd test suite configures a specific host per backend. I changed ejabberd to allow ignoring some hosts from config file on start, by providing the exact list of hosts we want to start. This is done by setting an ejabberd app Erlang environment variable 'hosts' and passing the list of hosts we want to actually define. When doing so, the backend specific hosts defined in ejabberd test configuration file are simply ignored. As a result, we do not try to connect to unavailable backends. I linked that part to CT run test by defining the hosts list based on environment variable CT_BACKENDS. This variable is expected to be a comma separated list of available backends. When Erlang Common Tests are run with that environment variable set, only the host matching the name of the backend will be set, plus the default "localhost", common to many tests. This can be combined with rebar ct groups list. Example commands to run tests: CT_BACKENDS=riak,mnesia rebar ct suites=ejabberd CT_BACKENDS=mnesia rebar ct suites=ejabberd groups=mnesia | ||||
* | | | Fix is_connected/0 function | Evgeniy Khramtsov | 2016-03-22 | 1 | -2/+7 |
| | | | |||||
* | | | Keep alive Riak connections by default | Evgeniy Khramtsov | 2016-03-22 | 2 | -1/+8 |
| | | | |||||
* | | | Do not auto append IP suffix to usernames (#1008) | Evgeniy Khramtsov | 2016-03-22 | 1 | -17/+1 |
| | | | |||||
* | | | Improve ban_account command to work with other DBs than Mnesia (#977) | Badlop | 2016-03-21 | 1 | -15/+1 |
| | | | |||||
* | | | New command delete_mnesia deletes all tables that can be exported | Badlop | 2016-03-21 | 2 | -1/+38 |
| | | | |||||
* | | | Add simple Elixir unit test on jid:from_string | Mickael Remond | 2016-03-21 | 1 | -3/+7 |
| | | | |||||
* | | | support riak authentication | HAMANO Tsukasa | 2016-03-19 | 2 | -9/+45 |
| | | | |||||
* | | | Fix issue #1015 | Paweł Chmielowski | 2016-03-17 | 1 | -1/+1 |
| | | | |||||
* | | | Don't use jlib:jid_remove_resource | Paweł Chmielowski | 2016-03-16 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #1011 from oxoWrk/master | Paweł Chmielowski | 2016-03-16 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Bare JID in 'from' of Roster Push (RFC 6121 section 2.1.6) in mod_adm… | ||||
| * | | | Bare JID in 'from' of Roster Push (RFC 6121 section 2.1.6) in mod_admin_extra | root | 2016-03-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Make auto generated resources shorter | Paweł Chmielowski | 2016-03-16 | 1 | -3/+6 |
| | | | | |||||
* | | | | Start ezlib only if required, as it's optional (#1006) | Badlop | 2016-03-16 | 2 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #980 from sharewax/EJAB-1480 | Evgeny Khramtsov | 2016-03-14 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | EJAB-1480: fix issue with retreiving user roster | ||||
| * | | | EJAB-1480: fix issue with retreiving user roster | Anton Samets | 2016-03-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Fix Addresses element which lacked others local destinations | Badlop | 2016-03-14 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | When sending single packet, in addresses include all other group destinations, not only oneself | ||||
* | | | | Fix result type of "connected_users_info" command | Holger Weiss | 2016-03-14 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Closes #1002. | ||||
* | | | | Don't store watchdog notifications in MAM archives | Holger Weiss | 2016-03-14 | 1 | -2/+8 |
| | | | | |||||
* | | | | Unregister route at the very end | Evgeniy Khramtsov | 2016-03-13 | 1 | -2/+2 |
| | | | | |||||
* | | | | Add ODBC backend for MIX | Evgeniy Khramtsov | 2016-03-13 | 1 | -0/+170 |
| | | | | |||||
* | | | | Define pubsub node configuration per route/host explicitly | Evgeniy Khramtsov | 2016-03-13 | 1 | -20/+26 |
| | | | | |||||
* | | | | Make it possible to get virtual host of a registered route | Evgeniy Khramtsov | 2016-03-13 | 13 | -53/+79 |
| | | | | |||||
* | | | | Fix config fetch after host/serverhost cleanup | Christophe Romain | 2016-03-11 | 1 | -6/+0 |
| | | | | |||||
* | | | | Minimal auth_method ordering fix | Elias Rohrer | 2016-03-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Lager to Elixir Logger bridge is now compliant with ejabberd loglevel set / get | Mickael Remond | 2016-03-09 | 2 | -16/+29 |
| | | | | | | | | | | | | | | | | This should fix #966 | ||||
* | | | | Fix call to lager_util:is_loggable/3 | Mickael Remond | 2016-03-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Use p1_time_compat util for generating timestamp | Mickael Remond | 2016-03-09 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add Elixir Logger Backend to bridge logs from lager | Mickael Remond | 2016-03-09 | 2 | -2/+157 |
| | | | | | | | | | | | | | | | | | | | | We will need to support loglevel bridging. It should help with #966 | ||||
* | | | | Define mod_opt_type/1 callback | Evgeniy Khramtsov | 2016-03-09 | 1 | -1/+5 |
| | | | | |||||
* | | | | Unregister hooks and iq handlers on terminate | Evgeniy Khramtsov | 2016-03-09 | 1 | -1/+15 |
| | | | | |||||
* | | | | mod_http_upload: Add XEP-0363 v0.2 support | Holger Weiss | 2016-03-09 | 1 | -5/+33 |
| | | | | | | | | | | | | | | | | | | | | Include the maximum file size in the service discovery information, as specified by XEP-0363, version 0.2. | ||||
* | | | | Experimental MIX (XEP-0369) support | Evgeniy Khramtsov | 2016-03-08 | 5 | -2/+499 |
| | | | | |||||
* | | | | Merge pull request #989 from galambalazs/patch-1 | badlop | 2016-03-07 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | fix syntax highlighting by keeping "~s" together | ||||
| * | | | | fix syntax highlighting by keeping "~s" together | Balázs Galambosi | 2016-03-07 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | Merge pull request #988 from tnull/edoc_fix | badlop | 2016-03-07 | 5 | -86/+23 |
|\ \ \ \ | | | | | | | | | | | Fixed type specifications for 'rebar doc' | ||||
| * | | | | Fixed type specifications for 'rebar doc' | Elias Rohrer | 2016-03-07 | 5 | -86/+23 |
| |/ / / | | | | | | | | | | | | | | | | | - Fixed type @specs and -specs to remove 'rebar doc' errors - Removed a lot of wrong and deprecated documentation in ejabberd_piefxis.erl | ||||
* / / / | Fix format_result also in xmlrpc, after aa5caa3 (#982) | Badlop | 2016-03-07 | 1 | -1/+1 |
|/ / / | |||||
* | | | Define opt_type required be ejabberd_config behaviour. | Paweł Chmielowski | 2016-03-04 | 1 | -1/+4 |
| | | | |||||
* | | | Mark get_queue_length obsolete, and use count_offline_messages (#970) | Badlop | 2016-03-04 | 3 | -6/+6 |
| | | | |||||
* | | | ext_mod: switch to fast_xml and remove old p1_logger reference | Christophe Romain | 2016-03-03 | 1 | -3/+2 |
| | | | |||||
* | | | Fix pubsub disco after host/serverhost cleanup | Christophe Romain | 2016-03-03 | 1 | -1/+1 |
| | | | |||||
* | | | Enable flexible offline on disco#info as well | Evgeniy Khramtsov | 2016-03-03 | 1 | -2/+8 |
| | | | |||||
* | | | Missed a few calls in previous commits | Alexey Shchepin | 2016-03-02 | 1 | -16/+4 |
| | | | |||||
* | | | Raise an error when there are no fields to set in ?SQL_UPSERT | Alexey Shchepin | 2016-03-02 | 1 | -6/+35 |
| | | |