Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | ejabberd_s2s_out: Remove Erlang/OTP version check | Holger Weiss | 2015-04-16 | 1 | -9/+2 | |
| | | | | | | | | | | The version check won't work for Erlang/OTP >= 17; and it's no longer needed, as we don't support versions older than R16 anyway. | |||||
* | | CSI test: Simplify and improve readability | Holger Weiss | 2015-04-16 | 1 | -20/+21 | |
| | | ||||||
* | | CSI test: Fix race when slave becomes active again | Holger Weiss | 2015-04-16 | 1 | -9/+11 | |
| | | | | | | | | | | | | Make sure the server processed the slave's active request after the previous test stanzas were received by the slave and before the final Chat State notification is sent by the master. | |||||
* | | Update get_password_s description with SCRAM return values | Badlop | 2015-04-15 | 1 | -2/+2 | |
| | | ||||||
* | | Revert "Hook on group message" | Badlop | 2015-04-15 | 1 | -2/+0 | |
| | | | | | | | | This reverts commit b81250d667c846d30499b5284585597a35c96631. | |||||
* | | Make sure that server processed our inactive request before processing ↵ | Paweł Chmielowski | 2015-04-15 | 1 | -0/+3 | |
| | | | | | | | | further in testing | |||||
* | | Merge pull request #426 from hairyhum/master | badlop | 2015-04-15 | 4 | -6/+67 | |
|\ \ | | | | | | | Migration of scram passwords with piefxis (riak and internal only) | |||||
| * | | Hook on group message | Feotov Daniil | 2015-02-24 | 1 | -0/+2 | |
| | | | ||||||
| * | | Migration of scram passwords with piefxis (riak and internal only) | Feotov Daniil | 2015-02-05 | 3 | -6/+65 | |
| | | | ||||||
* | | | Remove http_poll module | Paweł Chmielowski | 2015-04-15 | 7 | -456/+9 | |
| | | | | | | | | | | | | | | | | | | | | | For couple years browsers did limit ability to change cookies from js for different domains, this made http_poll connections practically not usuable. I don't think this module is used at all so it's time to put it to rest. | |||||
* | | | Enable websocket connection in default config file | Paweł Chmielowski | 2015-04-15 | 1 | -2/+3 | |
| | | | ||||||
* | | | Don't forget gen_tcp:listen/2 options | Holger Weiss | 2015-04-14 | 1 | -1/+2 | |
| | | | | | | | | | | | | Fixes #530. | |||||
* | | | Fix nick logging in mod_muc_log plaintext (#522) | Badlop | 2015-04-14 | 1 | -1/+6 | |
| | | | ||||||
* | | | Clean multicast routing code detected by xref | Badlop | 2015-04-10 | 1 | -27/+3 | |
| | | | ||||||
* | | | Add ability to configure parameters used by "make test" with test/config.ctc | Paweł Chmielowski | 2015-04-09 | 3 | -16/+57 | |
| | | | ||||||
* | | | Give better error messages for tests failing on #...{} = recv() lines | Paweł Chmielowski | 2015-04-09 | 3 | -91/+104 | |
| | | | ||||||
* | | | Show received input and expected input in ?recv* macros in case of failure | Paweł Chmielowski | 2015-04-09 | 2 | -4/+13 | |
| | | | | | | | | | | | | Throwing catch clause error is not that good for finding out what happened | |||||
* | | | Fix problem with pushing bufferend #xmlel-s to receiver in websocket code | Paweł Chmielowski | 2015-04-09 | 1 | -2/+4 | |
| | | | ||||||
* | | | Fix bug when sorting the list of rooms in WebAdmin | Badlop | 2015-04-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Remove hack with binary to integer conversion | Evgeniy Khramtsov | 2015-04-08 | 1 | -4/+2 | |
| | | | ||||||
* | | | Merge branch 'master' of github.com:processone/ejabberd | Evgeniy Khramtsov | 2015-04-08 | 6 | -33/+1435 | |
|\ \ \ | ||||||
| * | | | Copy multicast code from ejabberd-contrib to provide XEP-0033 (#521) | Badlop | 2015-04-08 | 6 | -33/+1435 | |
| | | | | ||||||
* | | | | Add virtual host support for SQLite | Evgeniy Khramtsov | 2015-04-08 | 5 | -50/+71 | |
|/ / / | ||||||
* | | | Add SQLite3 library checks at the configure script | Evgeniy Khramtsov | 2015-04-08 | 2 | -0/+163 | |
| | | | ||||||
* | | | Disable awkward trap_exit flag | Evgeniy Khramtsov | 2015-04-08 | 2 | -2/+0 | |
| | | | ||||||
* | | | Enable FOREIGN KEYS by default | Evgeniy Khramtsov | 2015-04-08 | 2 | -0/+2 | |
| | | | ||||||
* | | | Make sure SQLite always returns binaries | Evgeniy Khramtsov | 2015-04-08 | 1 | -2/+8 | |
| | | | ||||||
* | | | Merge pull request #486 from saa/sqlite_support | Evgeny Khramtsov | 2015-04-08 | 18 | -11/+538 | |
|\ \ \ | | | | | | | | | Add SQLite support | |||||
| * | | | Fix lite.sql and convert binary to integer | Sergey Abramyan | 2015-03-27 | 2 | -6/+8 | |
| | | | | ||||||
| * | | | Add SQLite support | Sergey Abramyan | 2015-03-20 | 17 | -9/+534 | |
| | | | | ||||||
* | | | | Add mod_muc_admin contrib. | Jerome Sautret | 2015-04-07 | 1 | -0/+888 | |
| | | | | ||||||
* | | | | ejabberd_listener: Remove Erlang/OTP version check | Holger Weiss | 2015-04-07 | 1 | -10/+2 | |
| | | | | | | | | | | | | | | | | We don't support Erlang/OTP versions older than R16 anyway. | |||||
* | | | | Merge pull request #518 from liudanking/master | Evgeny Khramtsov | 2015-04-07 | 1 | -3/+5 | |
|\ \ \ \ | | | | | | | | | | | fix otp version check in ejabberd_listener.erl listen_tcp/5 | |||||
| * | | | | fix otp version check in listen_tcp/5 | liudan | 2015-04-07 | 1 | -3/+5 | |
| | | | | | ||||||
* | | | | | Explicitly start crypto with start | Mickael Remond | 2015-04-07 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | This is to please Elixir / Phoenix enviroment | |||||
* | | | | Don't call send_element/2 if previous call failed | Holger Weiss | 2015-04-06 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | | | | | Be sure not to try sending data over a TCP socket that is no longer usable. | |||||
* | | | | Fix problem with c2s buffering on old style websocket connections | Paweł Chmielowski | 2015-04-06 | 1 | -2/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old style websocket do use binaries for transferring data to C2S, so when we buffer that data we need to handle it different than list of #xml structs used by new style connections. This fixes github issue #515. | |||||
* | | | | Merge pull request #513 from weiss/ignore-header-case | Paweł Chmielowski | 2015-04-06 | 1 | -2/+3 | |
|\ \ \ \ | | | | | | | | | | | ejabberd_websocket: Ignore case of HTTP header values | |||||
| * | | | | ejabberd_websocket: Ignore case of header values | Holger Weiss | 2015-04-05 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RFC 6455 says that the client's opening handshake includes an Upgrade header field "containing the value 'websocket', treated as an ASCII case-insensitive value." Closes #510. | |||||
* | | | | | Explicitely start crypto module | Mickael Remond | 2015-04-06 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | Without explicit start, it causes issue when embedding ejabberd into other apps. | |||||
* | | | | | Fix compilation result for asn1 files | Mickael Remond | 2015-04-06 | 1 | -3/+4 | |
| | | | | | ||||||
* | | | | | Remove unused variable | Mickael Remond | 2015-04-06 | 1 | -1/+1 | |
| | | | | | ||||||
* | | | | | Fix asn1 module compilation with mix | Mickael Remond | 2015-04-06 | 2 | -57/+36 | |
| | | | | | | | | | | | | | | | | | | | | This should solve building ejabberd as an Elixir dependency. | |||||
* | | | | | Fix type spec | Evgeniy Khramtsov | 2015-04-06 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | Make sure Mnesia dir environment and log file are list, not binary | Mickael Remond | 2015-04-06 | 3 | -2/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is useful for Elixir configuration, as binary is the more natural data type. Closes #514 | |||||
* | | | | | ejabberd can be embedded in an Elixir application | Mickael Remond | 2015-04-04 | 4 | -3/+115 | |
|/ / / / | ||||||
* | | | | Replace crypto calls that will be removed in a future release | Badlop | 2015-04-04 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Replace undefined value with empty one (processone/ejabberd-contrib#92) | Badlop | 2015-04-04 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Remove unused case clauses to make dialyzer happy | Holger Weiss | 2015-04-03 | 1 | -3/+0 | |
| | | | | ||||||
* | | | | Improve srg_get_info result format (processone/ejabberd-contrib#92) | Badlop | 2015-04-03 | 1 | -2/+7 | |
| | | | |