Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity
6,883 Commits 7 Branches 109 Tags 66 MiB
e37a1a73f1
Commit Graph

6883 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Badlop
e37a1a73f1 Add specific Var names to CAPTCHA fallback form fields (#2672) 2018-11-27 19:10:42 +01:00
Christophe Romain
932d995a1d Revert "Upgrade Elixir to 1.6.6 (#2653)" 
This reverts commit d3a9fbf62f.
rebar2 (which is still used) is not able to cope with this change
it should check lib/elixir/src/elixir.app.src instead of src/elixir.app.src
as src/elixir.app.src moved away, currently check fails and this breaks
jenkins tests.

options: use rebar3, or drop rebar completely to rely only on mix.
 2018-11-27 11:01:52 +01:00
Christophe Romain
d3a9fbf62f Upgrade Elixir to 1.6.6 (#2653) 2018-11-27 09:57:59 +01:00
Evgeny Khramtsov
94ef57721b Merge branch 'master' of github.com:processone/ejabberd 2018-11-23 16:25:02 +03:00
Evgeny Khramtsov
207c0eebe4 Improve tests for mod_private 2018-11-23 16:24:44 +03:00
Badlop
133bc764cd Fix typo in recent PR commit (#2697) 2018-11-23 13:23:00 +01:00
Christophe Romain
8ebf31d949 Bump lager version in mix as well 2018-11-23 13:00:19 +01:00
badlop
cc9a1a0917
Merge pull request #2697 from Snowmanko/master 
Update - fixed ejabberdctl push_roster description
 2018-11-23 12:55:44 +01:00
Evgeny Khramtsov
a84be928ef Fix test case for invalid language 2018-11-23 14:11:14 +03:00
Evgeny Khramtsov
fcff3c60b1 Only advertise conversion feature when mod_pubsub is loaded 2018-11-23 14:01:06 +03:00
Evgeny Khramtsov
d79ddd7b5c Bump lager version 2018-11-23 13:34:21 +03:00
Evgeny Khramtsov
1cdca1ab99 Support for XEP-0411: Bookmarks Conversion 2018-11-23 13:33:29 +03:00
Evgeny Khramtsov
87f8355908
Merge pull request #2690 from nosnilmot/stopping-hook 
Add ejabberd_stopping hook
 2018-11-22 23:21:45 +03:00
Snowman
9ed5ba01b2
Update - fixed ejabberdctl push_roster description 2018-11-22 16:32:05 +01:00
Christophe Romain
4b3db3a9cb Relax result matching to fix pgsql keepalive (#2632) 2018-11-21 18:06:32 +01:00
Mickael Remond
8a960f77d4
Remove unused link 2018-11-21 11:54:02 +01:00
Stu Tomlinson
d4cd3ddc32 Add ejabberd_stopping hook 
This hook allows modules to detect when ejabberd is stopping and adjust
behaviour if desired
 2018-11-19 15:11:33 +00:00
Holger Weiss
88749e2cdb CONTRIBUTORS: UTF-8 encode my name 2018-11-19 15:23:35 +01:00
Paweł Chmielowski
1214a83cca Use never version of meck 2018-11-19 14:15:29 +01:00
Paweł Chmielowski
8e3bbcac9f Another attempt for db access on travis 2018-11-19 13:53:06 +01:00
Paweł Chmielowski
0ad319e288 Third time's the charm? Let load scheme before changing permissions 2018-11-19 13:17:46 +01:00
Mickaël Rémond
9a351c0aff
Update CONTRIBUTING.md 2018-11-19 13:12:35 +01:00
Paweł Chmielowski
d642a9db88 Fix command for loading pgsql schema 2018-11-19 12:58:45 +01:00
Paweł Chmielowski
0c4f5dbb7e Try to load db schemas externally on travis 2018-11-19 12:49:29 +01:00
Mickael Remond
181019198c
Thank you, contributors 2018-11-19 11:38:44 +01:00
Mickaël Rémond
61dcab13a4
Expand contribution document 2018-11-19 11:17:08 +01:00
Mickaël Rémond
9c1c854138
Initial contributing document 2018-11-19 11:03:10 +01:00
Mickael Remond
912d4e2165
Merge branch 'master' of github.com:processone/ejabberd 2018-11-19 10:40:05 +01:00
Mickael Remond
41a24a8f8e
Markdown version is the main README version 2018-11-19 10:39:54 +01:00
Mickaël Rémond
3c3dd80ea9 Update issue templates 2018-11-19 10:37:04 +01:00
Mickael Remond
68f8194886
Use new naming for Github issue templates 2018-11-19 10:35:07 +01:00
Badlop
06e9d34018 Handle some malformed URL requests in ejabberd_http (#2687) 2018-11-16 12:13:17 +01:00
Evgeny Khramtsov
1d80addb7d Get rid of 'catch-all' statements 2018-11-15 15:07:58 +03:00
Evgeny Khramtsov
43498b39c1 Replace dict with maps 
This will improve performance and memory consumptions of large MUCs
 2018-11-15 14:13:45 +03:00
badlop
2b09d6a761
Merge pull request #2683 from paulmenzel/use-https-url-in-readme 
Use HTTPS URL for docs.ejabberd.im in `README`
 2018-11-13 10:30:09 +01:00
Paul Menzel
a5eabcea35 README: Use HTTPS URL for docs.ejabberd.im 
Directly use the HTTPS URL.

    $ curl -I http://docs.ejabberd.im
    HTTP/1.1 301 Moved Permanently
    Server: Cowboy
    Connection: keep-alive
    Location: https://docs.ejabberd.im/
    Date: Mon, 12 Nov 2018 14:31:07 GMT
    Content-Type: text/plain; charset=utf-8
    Via: 1.1 vegur

    $ curl -I https://docs.ejabberd.im
    HTTP/1.1 200 OK
    Server: Cowboy
    Connection: keep-alive
    Set-Cookie: main-session=MTU0MjAzMzA1NnxOd3dBTkZWWVNrbEVRVkUwUVZvM1JGcEtTakpKTTA1RlYxQk1TelZKTmxkUlNGRk5Sa0ZVV0VSS1dVNHpSMDh6VEUxSVJFTkRVMEU9fHnVvedfnvRp4MtnGBKYfXIDSBTPilUvIp6Kz559FNKg; Path=/; Expires=Mon, 12 Nov 2018 22:30:56 GMT; Max-Age=28800; HttpOnly
    Date: Mon, 12 Nov 2018 14:30:56 GMT
    Content-Type: text/html; charset=utf-8
    Via: 1.1 vegur
 2018-11-12 15:30:22 +01:00
Badlop
78d4e90d47 Remove references in configs to http_poll; it was removed in ba69c469b5 2018-11-12 14:26:00 +01:00
Holger Weiss
133c45ce2b Don't suppress notifications on PEP node removal 
Send node deletion notifications (as per XEP-0060, #8.4.2) also for PEP
nodes.
 2018-11-12 12:54:53 +01:00
Paweł Chmielowski
d43d9ff0e2 Fix mod_http_apt_test 2018-11-09 14:55:19 +01:00
Badlop
da9bcc3370 Recover logging of user joining room, lost in 32de9a56 (thanks to elexis1) 2018-11-09 13:21:35 +01:00
Alexey Shchepin
48594544ed Fix for the previous commit 2018-11-09 14:18:48 +03:00
Alexey Shchepin
d16b99d830 Track presences sent via a multicast service 2018-11-09 03:27:24 +03:00
Holger Weiss
7d9c2b77f2 Merge remote-tracking branch 'processone/pr/2675' 
* processone/pr/2675:
  Fix another typo in ejabberd.yml
  Fix tiny typo in configuration file
 2018-11-07 12:51:32 +01:00
Ave
d11d9db3d6
Fix another typo in ejabberd.yml 2018-11-07 14:44:27 +03:00
Ave
2001418edd
Fix tiny typo in configuration file 2018-11-07 14:41:16 +03:00
Badlop
9f7d3520aa Fix unused variable warning 2018-11-06 00:08:45 +01:00
Badlop
602bfa3c3c Local stanzas are routed one by one, not by multicast 2018-11-06 00:07:34 +01:00
badlop
9253f3d113
Merge pull request #2655 from hamano/missing_redis_sm.lua 
missing priv/lua/redis_sm.lua
 2018-10-31 11:54:43 +01:00
Holger Weiss
dd93c0b457 ejabberd_logger: Disable debug logging properly 
Don't forget to disable xmpp's debug logging when reducing the log level
from 5 to a lower value.
 2018-10-31 02:42:54 +01:00
Badlop
a73aac691e Don't preprocess arguments, format_args verifies and prepares them (#2629) 2018-10-31 01:34:04 +01:00