Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-05-31 21:07:55 +02:00
Code Releases Activity
8,361 Commits 7 Branches 106 Tags 79 MiB
1915f29d4b
Commit Graph

8361 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Badlop
c8bec07c45 Clone to the dir specified in rebar.config... useful for erlang-sqlite3 2021-02-23 19:45:41 +01:00
Holger Weiß
b41ce8828c
Add question/answer-based CAPTCHA script (#3533) 
* New captcha.sh question/answer based

* Keep original CAPTCHA script

Rather than replacing the original CAPTCHA script, keep it next to the
new one, for the moment.

* CAPTCHA-ng script cleanup

* remove various bashisms
* replace all echos with printf
+ add quotations to many variables

Co-authored-by: Adrien Bourmault <neox@os-k.eu>
Co-authored-by: nico wellpott <nico@magicbroccoli.de>
 2021-02-22 09:34:02 +01:00
Badlop
3720b42b0f When using rebar3, "make dialyzer" needs just a single call 2021-02-19 17:00:39 +01:00
Badlop
69be0abdba Fix Dialyzer warning about function contract that changed in fad14ff31 2021-02-19 17:00:35 +01:00
Badlop
09f5e2aa03 Improve support for rebar3 in "make translations" 2021-02-19 17:00:32 +01:00
Paweł Chmielowski
7da033f733 Fix muc tests 2021-02-17 13:09:29 +01:00
Paweł Chmielowski
14871c54ac Take in account subscriber's affiliation when checking access to moderated room 
This should fix issue #3525
 2021-02-17 10:45:30 +01:00
Michael Slezak
3c16f21413 Allow ejabberd to be compatible as a dependency for an Erlang project using rebar3 2021-02-16 10:28:30 -07:00
Paweł Chmielowski
14d87cb5e9 Skip reading roster in one more case in mod_caps 2021-02-16 13:39:34 +01:00
Badlop
72ecf91f08 Return modules errors in set_vcard callback (#3502) 2021-02-16 13:09:33 +01:00
Badlop
4bc57f76eb make hooks and options work with rebar3 too 2021-02-16 13:09:30 +01:00
Badlop
18c9f5eedf Create annotated tags, meant for releases, instead of lightweight (#3512) 2021-02-16 13:09:27 +01:00
Badlop
4495f0f0b9 For OTP<22 define LAGER macro in ext_mod like in rebar.config (#3493) 2021-02-16 13:09:21 +01:00
Paweł Chmielowski
fad14ff319 Make fetching roster in mod_privacy lazy 2021-02-16 10:57:55 +01:00
Paweł Chmielowski
8cb7ff7a88 Add fallback branch to last commit 2021-02-16 10:40:35 +01:00
Paweł Chmielowski
96929a5084 Don't request roster in mod_caps when not needed 2021-02-16 10:13:29 +01:00
Stu Tomlinson
1f194e417d
fix eldap certificate verification (#3528) 
Reported in #3527. Add hostname matching function, and specify SNI

Also, OTP 23 dropped backwards compatibility for 0, 1, 2 values for verify, so
replace with combination of verify_none/verify_peer and fail_if_no_peer_cert
as appropriate
 2021-02-15 14:29:58 +01:00
Badlop
e3fd120fd4 According to fast_tls, only atom and binary may accompany error tuple 2021-02-11 20:38:51 +01:00
Badlop
7b8bd960c6 Fix URL of CAPTCHA section 2021-02-11 20:38:45 +01:00
Paweł Chmielowski
d147c733bb Update xmpp 2021-02-10 10:10:24 +01:00
Paweł Chmielowski
3d7fa15be7 Add argument guards to roster commands 2021-02-09 13:46:23 +01:00
Stu Tomlinson
6a0b01fe7f
Move sql directory from extra_src_dirs to src_dirs (#3520) 
rebar3 needs sql directory as a src dir so that tests can reference sql
files, so sql dir was added to extra_src_dirs in d9c1befb. It turns out
extra_src_dirs does unexpected unwanted extra things like copy all beam
files there too, so move sql dir to regular src_dirs
 2021-02-08 13:02:50 +01:00
Frank
2d79a69719
Fix PONG responses (#3515) 
Co-authored-by: Frank Diebolt <frank.diebolt@al-enterprise.com>
 2021-02-04 19:57:20 +01:00
Badlop
a51e777c56 Try to fix coveralls report in Travis, related to commit 2f3f6f8b7 2021-02-04 11:27:47 +01:00
Badlop
1c3a7b7c96 Use the mysql service available in Travis 
Xenial in Travis nowadays includes mysql 5.7
Reverted "Let Travis grab MySQL 5.6 from repo.mysql.com"
Reverted "Use static key for mysql repo" and related ones
 2021-02-02 19:03:14 +01:00
Badlop
26ee3141a9 Improve prepare-tr so *.msg files inform to not edit them (#3484) 2021-02-02 18:58:36 +01:00
Badlop
75c0443df2 Test against newest 23.1.2, and remove useless intermediate 22.3 2021-02-02 18:58:32 +01:00
Marek
5eab8450e7
New listener for encrypted ejabberd_c2s 
Add a new listener on port 5223 for the TLS-enabled ejabberd_c2s, which combined with proper SRV records allows passing the XEP-0368 compliance test.
 2021-02-02 15:25:19 +01:00
Divine
22d76bd1a4
Fix specified key was too long (#3513) 
* Fix specified key was too long

This adds the correct engine and sets it to utf8mb4 collate. Prevents "Specified key was too long; max key length is 1000 bytes" from happening.

* Make two import SQL files consistent 

As suggested by @prefiks
 2021-02-01 22:50:33 +01:00
Badlop
bb397bb424 Fix bug handling jid:decode/1 return, introduced in cdb286d1d (#3461) 2021-02-01 00:10:33 +01:00
Badlop
b3d9c0d1f7 Fix bug in send_message introduced in 7fc500dae (#3485) 2021-02-01 00:09:18 +01:00
Badlop
d3aeed839d Fix MAM tests that now fail due to commit d6e9e0342 (#3506) 2021-02-01 00:09:10 +01:00
Badlop
c0b364839c Fix typo in Weblate URL 2021-02-01 00:08:22 +01:00
Holger Weiss
6a6b771e0b mod_mam: Add missing semicolon 2021-01-29 20:27:07 +01:00
Holger Weiss
58e28e82bb Merge remote-tracking branch 'processone/pr/3506' 
* processone/pr/3506:
  Remove queryid from MAM fin element
 2021-01-29 19:25:40 +01:00
Paul Fariello
d6e9e03422 Remove queryid from MAM fin element 
According to xep, fin element is not supposed to have a queryid attribute.
 2021-01-29 19:21:45 +01:00
Jerome Sautret
fca41796c0 Fix version number 2021-01-29 16:00:35 +01:00
Jerome Sautret
b1fec7dc29 Bump version in mix.exs 2021-01-29 10:01:29 +01:00
Paweł Chmielowski
8c5b312601 Add cache for displayed groups in ldap_shared_cache 
This is based on pull request by Ivan Agarkov:
 https://github.com/processone/ejabberd/pull/952
 2021-01-28 12:57:47 +01:00
Paweł Chmielowski
ee3ecc6cc0 Update mix deps 2021-01-28 11:04:53 +01:00
Paweł Chmielowski
f708bbe2e8 Update deps 2021-01-28 10:42:16 +01:00
Paweł Chmielowski
f7004f793d Fix delete_old_message when using sqlite spool table 
This fixes issue #3503
 2021-01-27 19:41:21 +01:00
Badlop
5c3b3d22db Other minor translation updates 2021-01-27 18:18:18 +01:00
Badlop
cfd1c710f2 Update Chinese translation (thanks to Shelley Shian) 2021-01-27 18:18:15 +01:00
Badlop
601a61249e Update Portuguese (Brazil) translation (thanks to Wellington Terumi Uemura) 2021-01-27 18:17:56 +01:00
Badlop
8180b6b54e Update Norwegian Bokmål translation (thanks to Allan Nordhøy) 2021-01-27 18:13:58 +01:00
Badlop
a260270483 Update Indonesian translation (thanks to Uira) 2021-01-27 18:12:26 +01:00
Badlop
9b9a2d380b Update German translation (thanks to Maximilian Trummer) 2021-01-27 18:10:08 +01:00
Badlop
5ec8cf9e09 Document the recent oauth_cache_rest_failure_life_time option 2021-01-27 17:44:17 +01:00
Badlop
248d8b8aff Update ejabberd man file (#3490) 2021-01-27 17:25:46 +01:00