Mickael Remond
|
cd2e2b1a88
|
Synchronizing master changes
|
2016-04-12 10:34:24 +02:00 |
|
Mickael Remond
|
5958a91428
|
Fix typo in error message
|
2016-04-12 10:27:43 +02:00 |
|
Holger Weiss
|
15d184a909
|
Disable TLS compression for s2s by default
TLS compression is not recommended, and it's already disabled by default
for c2s connections and for ejabberd_http.
|
2016-04-11 22:50:11 +02:00 |
|
Badlop
|
8c8a6869be
|
process2/2 is needed by mod_rest to provide its own AccessCommands
See processone/ejabberd-contrib#161
|
2016-04-11 17:21:44 +02:00 |
|
Badlop
|
695592a38c
|
Update check_password tests are the command now is fixed
|
2016-04-11 13:39:35 +02:00 |
|
badlop
|
bd3b7cd2df
|
Merge pull request #1064 from sezuan/fix_check_password
Fix check_password
|
2016-04-11 13:38:22 +02:00 |
|
Matthias Rieber
|
b67dc00db2
|
Fix check_password
|
2016-04-10 15:37:36 +02:00 |
|
Mickael Remond
|
127342449e
|
Allow testing user pattern directly in access rules
|
2016-04-08 19:45:25 +02:00 |
|
Paweł Chmielowski
|
b4739396ec
|
Switch to varchar(64) in mysql user.server/salt as text can't have default values
|
2016-04-08 17:50:59 +02:00 |
|
Mickael Remond
|
1dbdd58b1b
|
Add TODO to improve ACL
|
2016-04-08 12:55:35 +02:00 |
|
Evgeniy Khramtsov
|
c5dbdfc71a
|
'serverkey' and 'salt' should have empty string as default
|
2016-04-08 13:02:08 +03:00 |
|
Paweł Chmielowski
|
86dfbe6ece
|
Make sure that ejabberd_sm sid are unique
|
2016-04-08 10:52:29 +02:00 |
|
Evgeniy Khramtsov
|
b83ec483e9
|
Send stream trailer at the very end
|
2016-04-08 11:49:50 +03:00 |
|
Paweł Chmielowski
|
afd3accf75
|
Generate shorted jid for anonymous connections
|
2016-04-07 16:47:30 +02:00 |
|
Paweł Chmielowski
|
0935f493ee
|
Add tests for anonymous and digest-md5 auth
|
2016-04-07 16:47:01 +02:00 |
|
Mickael Remond
|
373f9fb0eb
|
Add tests on Access rules returning values
|
2016-04-07 13:04:58 +02:00 |
|
Mickael Remond
|
60c0c8e968
|
Add test when mixing ip / user rules
|
2016-04-07 12:35:29 +02:00 |
|
Paweł Chmielowski
|
18557fa3d6
|
Start of tests for cyrsasl module
|
2016-04-07 12:28:19 +02:00 |
|
Mickael Remond
|
a938af4180
|
IP based ACL / Access rules and sequential evaluation of rules
|
2016-04-07 12:06:30 +02:00 |
|
Paweł Chmielowski
|
d5c29360fb
|
Fix anonymous auth
|
2016-04-07 10:02:37 +02:00 |
|
Mickael Remond
|
48a1d818d6
|
Rebase master
|
2016-04-06 18:14:47 +02:00 |
|
Mickael Remond
|
eb36440c2e
|
Variant for user ACL test
|
2016-04-06 18:13:08 +02:00 |
|
Mickael Remond
|
47039aed15
|
Allow clearing all ACL and access rules
|
2016-04-06 18:13:08 +02:00 |
|
Mickael Remond
|
d45ad3e3a5
|
Add initial basic ACL test
|
2016-04-06 18:13:08 +02:00 |
|
Mickael Remond
|
5ad8c790c7
|
Export add_access/3 to allow setting ACL outside of yaml config file
|
2016-04-06 18:13:08 +02:00 |
|
Mickael Remond
|
5efcf0a175
|
Stringprep can already be started, do not check result
|
2016-04-06 18:11:46 +02:00 |
|
Mickael Remond
|
0916694e0e
|
Merge branch 'master' of github.com:processone/ejabberd
|
2016-04-06 17:56:01 +02:00 |
|
Mickael Remond
|
2900aa208f
|
Log Elixir test result for investigation and include this log file in travis for troubleshooting failed tests
|
2016-04-06 17:55:56 +02:00 |
|
Badlop
|
27b4217a9d
|
Tweak srg_get_info result formatting (#1048)
|
2016-04-06 17:55:19 +02:00 |
|
Mickael Remond
|
a9e50468b6
|
Better error message in logs
|
2016-04-06 15:07:44 +02:00 |
|
Mickael Remond
|
abf768274a
|
Fix error message paramater formatting
|
2016-04-06 15:05:19 +02:00 |
|
Mickael Remond
|
f78b170c24
|
Add initial basic ACL test
|
2016-04-06 13:59:33 +02:00 |
|
Mickael Remond
|
991529a657
|
Export add_access/3 to allow setting ACL outside of yaml config file
|
2016-04-06 13:59:06 +02:00 |
|
Mickael Remond
|
b2279d481d
|
Merge branch 'master' of github.com:processone/ejabberd
|
2016-04-06 13:57:12 +02:00 |
|
Mickael Remond
|
267fdb2e95
|
Now we need to start stringprep before config
|
2016-04-06 13:51:05 +02:00 |
|
badlop
|
d9f1061b8a
|
Merge pull request #1051 from genric/patch-1
Fix mod_muc_admin:set_room_affiliation options persistence
|
2016-04-06 13:44:12 +02:00 |
|
badlop
|
dd654fa794
|
Merge pull request #1052 from genric/patch-2
Fix mod_muc_admin:get_room_options
|
2016-04-06 13:25:46 +02:00 |
|
Mickael Remond
|
1b9b5f8e6a
|
Merge branch 'master' of github.com:processone/ejabberd
|
2016-04-06 12:59:58 +02:00 |
|
Mickael Remond
|
67b9b82261
|
We need to set hosts in options to be able to retrieve 'MYHOSTS'
|
2016-04-06 12:59:27 +02:00 |
|
Mickaël Rémond
|
2eee2de6e2
|
Merge pull request #1054 from richp10/master
upgrade stringprep to 1.03
|
2016-04-06 12:05:26 +02:00 |
|
richp10
|
acc11195f8
|
upgrade stringprep to 1.03
|
2016-04-06 08:40:10 +00:00 |
|
genric
|
be7f65da05
|
Fix mod_muc_admin:get_room_options
Fix mod_muc_admin:get_room_options to match the ejabberd_commands result spec.
|
2016-04-05 14:13:28 +02:00 |
|
Evgeniy Khramtsov
|
232915184c
|
Merge branch 'add-error-reason'
|
2016-04-05 13:10:09 +03:00 |
|
Evgeniy Khramtsov
|
9ac6e4edf7
|
Replace more ?ERR_* macros with ?ERRT_*
|
2016-04-05 13:09:44 +03:00 |
|
genric
|
490aa2c6a6
|
Fix mod_muc_admin:set_room_affiliation
Add missing options so they are stored when set_room_affiliation is invoked, instead of being ignored and set to default values after muc restart.
|
2016-04-04 14:02:34 +02:00 |
|
Mickaël Rémond
|
ca9ac019eb
|
Merge pull request #1046 from processone/commands-update
Add support for versioning in ejabberd commands
|
2016-04-01 14:24:08 +02:00 |
|
Mickael Remond
|
e24da5789e
|
Apply fixes and remove tests for missing methods
|
2016-04-01 13:05:41 +02:00 |
|
Mickael Remond
|
47266de6d7
|
Do not use underscore variable
|
2016-04-01 12:24:49 +02:00 |
|
Mickael Remond
|
f243c30847
|
Rollback mod_admin_extra
|
2016-04-01 12:24:00 +02:00 |
|
Mickael Remond
|
2a2a47b5c6
|
Fix merge issues
|
2016-04-01 12:12:19 +02:00 |
|