d00a634025
Fix includes in eunit compilation flags
2016-11-18 14:02:47 +01:00
daab95e3b5
Fix elixir tests
2016-11-18 12:54:06 +01:00
45e77ea483
Remove useless NO_EXT_LIB flag
2016-11-18 12:25:01 +01:00
e69937d93a
Get rid of substitute_forwarded
2016-11-18 11:51:57 +01:00
f57f267c54
Merge branch 'master' of github.com:processone/ejabberd
...
Conflicts:
test/ejabberd_SUITE.erl
2016-11-18 13:39:10 +03:00
b8dcc911a3
Make common tests working again
2016-11-18 13:38:08 +03:00
995c97671d
Add auth to mod_http_fileserver
2016-11-17 12:59:46 +01:00
1c90b19d74
Fix typo
2016-11-16 18:24:12 +01:00
8ced3bdbe9
Remove obsolete/temp file
2016-11-16 14:18:51 +01:00
3cd174cb56
Ensure that presence_broadcast room option is stored ( #1380 )
2016-11-16 13:35:50 +01:00
e69ddd981f
Tell git to ignore the example file ejabberd.service
2016-11-16 13:12:57 +01:00
b1723c6e2d
Handle correctly p1_http:request result
2016-11-16 13:11:23 +01:00
2929f5b5bc
Minor cosmetic changes on pubsub code
2016-11-15 18:35:20 +01:00
4d4ad922a2
Cosmetic validator changes
2016-11-15 18:14:21 +01:00
8df68266f2
Add missing verbs for RESTfull operation
2016-11-15 14:35:26 +01:00
2b93de6912
apply string optimizations
2016-11-15 14:32:22 +01:00
909e0eb5dd
Add configurable weight for commands
2016-11-15 14:18:34 +01:00
e75dd17e2c
Fix tests that use #forwarded
2016-11-15 10:02:21 +01:00
41794c57d6
Use new version of fast_xml
2016-11-15 10:02:21 +01:00
5ffc01db53
Fix types in check_password_hash
2016-11-15 10:02:21 +01:00
717159a98f
Make string args in http_api be list strings
2016-11-15 10:02:21 +01:00
309962fb8b
Use p1_http from p1_utils 1.0.6
2016-11-14 16:52:03 +01:00
3765210698
Fix IQ result processing
2016-11-13 16:56:05 +03:00
13d5da4da6
Add some copyright notices
2016-11-13 16:46:04 +03:00
75c15d3853
Make xref working again if elixir is disabled
2016-11-13 14:29:52 +03:00
ebefd0d8d6
Add more control for decoding IQ payloads
2016-11-13 14:17:21 +03:00
7e9f1a6dc1
Don't auto-decode forwarded payload
2016-11-13 13:41:04 +03:00
132033d01a
Remove unused header file
2016-11-13 10:57:53 +03:00
21d78ed7f4
Don't use jlib.hrl outside of jlib.erl
2016-11-13 10:56:36 +03:00
b8f22ff538
Deprecate most of the functions from jlib.erl
2016-11-13 10:44:53 +03:00
534e73f732
Uncomment forgotten block of code
2016-11-12 14:51:43 +03:00
de81c50199
Revert "Support to provide password when subscribing to a room ( #1306 )"
...
This reverts commit 566ac872fe
2016-11-12 14:47:29 +03:00
5d552c8463
Merge branch 'master' into xml-ng
2016-11-12 14:41:37 +03:00
78a44e0176
Merge branch 'master' into xml-ng
...
Conflicts:
src/adhoc.erl
src/cyrsasl_oauth.erl
src/ejabberd_c2s.erl
src/ejabberd_config.erl
src/ejabberd_service.erl
src/gen_mod.erl
src/mod_admin_extra.erl
src/mod_announce.erl
src/mod_carboncopy.erl
src/mod_client_state.erl
src/mod_configure.erl
src/mod_echo.erl
src/mod_mam.erl
src/mod_muc.erl
src/mod_muc_room.erl
src/mod_offline.erl
src/mod_pubsub.erl
src/mod_stats.erl
src/node_flat_sql.erl
src/randoms.erl
2016-11-12 13:27:15 +03:00
566ac872fe
Support to provide password when subscribing to a room ( #1306 )
2016-11-10 20:48:43 +01:00
e841a6ec34
Add more tests for offline storage
2016-11-08 15:15:19 +03:00
e9dd3ffe9c
Merge branch 'xml-ng' of github.com:processone/ejabberd into xml-ng
2016-11-07 10:11:40 +03:00
56c91d3c58
Add roster tests
2016-11-07 10:10:57 +03:00
bd060bc1bb
Support several groups separated by ; in add_rosteritem command
2016-11-04 18:45:27 +01:00
49d3b7ec1d
Throw error if room name or host has invalid characters ( #1360 )
2016-11-04 17:28:28 +01:00
5e723bc90e
Fix reading room jids from file for create and destroy_rooms_file commands
2016-11-04 16:54:31 +01:00
bab71f0832
Replace ctlscriptpath and produce ejabberd.service file ( #434 )
2016-11-04 16:35:59 +01:00
62db030942
Merge mod_opt_type from db sub-modules to main module mod_opt_type
2016-11-04 12:58:08 +01:00
2a63d0e95a
mod_mam: Use user JID for stanza ID 'by' attribute
...
Use the user (or room) JID instead of the server JID for the 'by'
attribute of <stanza-id/> and <archived/> tags. That's what the
examples in XEP-0313 v0.2 and XEP-0359 v0.3.0 suggest.
2016-11-01 08:47:08 +01:00
149cc9654f
Append ; to privacy_list_data exporting lines (thanks to Marcio Luciano Donada)
2016-10-24 13:42:33 +02:00
9d977e484a
Use base64:mime_decode/1 for SASL packets
...
It will be now possible to accept SASL packets with only
single '=' character set as required by RFC6120
2016-10-22 13:09:11 +03:00
f6236d456d
Add more tests for privacy lists and blocking command
2016-10-22 13:01:45 +03:00
ed6bc9081b
Merge pull request #1349 from prasadvaidya/master
...
Fix: Replace erlang function with fail-safe jlib function.
2016-10-21 13:32:29 +02:00
cdafd3254b
Rollback minor change, to avoid redundant use of fail-safe function
2016-10-21 15:02:39 +05:30
509776a0d1
Fix: Replace erlang function with fail-safe jlib function.
2016-10-21 13:57:47 +05:30
Paweł Chmielowski