405a0a21c1
Merge pull request #1249 from weiss:push-requirements
2016-09-13 14:31:39 +02:00
c39501a48d
Merge branch 'push-requirements' of https://github.com/weiss/ejabberd into weiss-push-requirements
2016-09-13 14:29:14 +02:00
c3543e002d
Allow to create room with custom config
2016-09-13 11:52:59 +02:00
2f596b0e10
Expand parsing of json input to be able to handle update_roster command
2016-09-13 11:27:59 +02:00
054382f074
Add X-Admin and basic auth header to CORS allowed headers in http_api
2016-09-12 15:40:38 +02:00
96d05dad8f
Properly process OPTIONS header in http_api for all paths
2016-09-12 15:40:38 +02:00
1aca541639
Fix nick-to-jid mapping for MUC subscribers
2016-09-12 14:41:33 +03:00
d0761039ff
Support multiple room invitations ( #1285 )
2016-09-09 12:18:27 +02:00
fe1bf27ef3
Fix subscribed rooms list retreivement
2016-09-09 13:04:47 +03:00
d222fed228
XEP-0198: Cancel timer when waiting for resumption
...
If an ACK timer is active while going into the 'wait_for_resume' state,
cancel that timer.
2016-09-09 00:21:36 +02:00
8fd888eb2b
Revert "Don't log an [error] message if Elixir is missing"
...
This reverts commit 41386d718d4bd45bada7
2016-09-08 18:11:54 +02:00
41386d718d
Don't log an [error] message if Elixir is missing
...
The Elixir support is still optional.
Closes #1250 .
2016-09-08 17:59:40 +02:00
26a040e2d5
Fix typo on previous commit ( #1284 )
2016-09-08 16:32:16 +02:00
4bd45bada7
Start elixir config code only if elixir was enabled in configure script
2016-09-08 16:29:45 +02:00
ad39da0b0a
Full jid entity subscriptions should include bare jid records ( #1284 )
2016-09-08 16:27:16 +02:00
36ab9cc2ea
Fix message routing from subscribers
2016-09-08 16:39:34 +03:00
6c943aa293
Merge pull request #1287 from weiss/ack-timeout
...
New stream management option: ack_timeout
2016-09-08 12:45:16 +02:00
803270fc6b
Support for Elixir configuration file #1208
...
Contribution for Google Summer of code 2016 by Gabriel Gatu
2016-09-08 11:37:14 +02:00
e6f7233351
Support for publishing to hex.pm with latest Elixir mix
2016-09-08 10:52:43 +02:00
58a72bd395
Fix compilation with Elixir 1.3 / R19
2016-09-08 10:29:44 +02:00
d2621130a3
Typo
2016-09-08 10:27:14 +02:00
a8368278ec
Properly normalize resource_regexp acl rule
...
This fixes issue #1288 .
2016-09-08 08:45:10 +02:00
621f0e2b7c
New stream management option: ack_timeout
...
Close the connection if a stream management client fails to respond to
an acknowledgement request within 60 seconds. This number of seconds
can be changed with the new "ack_timeout" option, and the mechanism can
be disabled by specifying 'infinity'.
As a side effect of this change, a new acknowledgement is no longer
requested before the response to the previous request is received.
2016-09-07 23:16:54 +02:00
7a538bb88b
Enforce pathtype use with config path ( #1264 )
2016-09-07 17:38:35 +02:00
af0a493c66
Merge pull request #1253 from Amuhar/xep0356
2016-09-07 14:34:31 +02:00
f304149615
Create room on configuration request as per XEP-0045, 10.1.3
2016-09-07 11:15:19 +03:00
3803a8de3c
Link MUC subscription to bare JID
2016-09-07 10:33:37 +03:00
1edca899ff
Add SQL support for microblogging node plugin
2016-09-07 07:15:12 +02:00
c6afb9731b
Handle <subscriptions/> request to list MUC subscribers
2016-09-06 19:06:02 +03:00
5ec2874a96
Do not update muc_online_users table on MUC/Sub operations
2016-09-06 18:17:30 +03:00
417284a921
Add get_subscribers command to list MUC subscribers
2016-09-06 17:55:18 +03:00
af2999a783
node_mb: Call node_pep instead of node_hometree
2016-09-06 00:30:46 +02:00
48ce34987d
node_mb: Fix configuration documentation
...
A node plugin used in a 'pep_mapping' must explicitly be added to the
list of 'plugins'.
2016-09-06 00:08:43 +02:00
e29f47893f
mod_pubsub: Remove outdated comment
2016-09-06 00:05:54 +02:00
c770a54aac
Clean ejabberd_commands before tests
2016-09-05 17:18:27 +02:00
96a748d34f
ejabberd_oauth requiere working cache_tab, initialize it before tests
2016-09-05 16:42:05 +02:00
31592fe51f
Merge remote-tracking branch 'processone/pr/1262'
...
* processone/pr/1262:
Fixed typo in Stream Management option name
2016-08-22 22:35:17 +02:00
f1afea223b
Fixed typo in Stream Management option name
2016-08-23 02:21:09 +06:00
1bfa1c613b
Merge remote-tracking branch 'processone/pr/1261'
...
* processone/pr/1261:
Fixed #1260 Stream Management feature for the websocket connections
2016-08-22 21:22:08 +02:00
d5659735b3
Fixed #1260 Stream Management feature for the websocket connections
2016-08-23 00:59:39 +06:00
23d9fb0592
mod_muc_admin: Accept 'allow_subscription' option
...
Allow for setting the new 'allow_subscription' option using the
'change_room_option' command.
2016-08-22 01:17:32 +02:00
8dd2044a27
Merge pull request #1254 from lemenkov/remove_p1_xmlrpc
...
Remove no longer necessary p1_xmlrpc
2016-08-19 11:53:20 +02:00
e13edff6ae
Remove no longer necessary p1_xmlrpc
...
Ths module was superceded by fast_xml in commit
processone/ejabberd@dfc29ea03c . So let's remove it entirely to
avoid any confusion.
Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
2016-08-17 18:32:09 +03:00
8af85d913f
Erlang R17 has a Time limit in erlang:send_after ( #1246 )
2016-08-16 18:32:06 +02:00
20a510d877
mod_mam: Add 'store_mam_message' hook
...
The new 'store_mam_message' hook is invoked whenever a MAM message is
stored.
2016-08-15 23:28:36 +02:00
8821cf8b27
mod_offline: Add 'store_offline_message' hook
...
The new 'store_offline_message' hook is invoked whenever an offline
message is stored.
2016-08-15 22:30:08 +02:00
4d19fb518f
ejabberd_c2s: Add XEP-0198 resumption hooks
...
The new 'c2s_session_pending' and 'c2s_session_resumed' hooks are
invoked when a stream management session is pending and resumed,
respectively.
2016-08-15 21:49:58 +02:00
e7217e6320
Add functions to get/set some c2s state elements
2016-08-15 20:24:43 +02:00
5b4f347da8
Support sql backend in mod_shared_roster commands ( #1244 )
2016-08-15 15:53:35 +02:00
38666cfd58
Merge pull request #1245 from hamano/clean_redis_table
...
fix clean redis table
2016-08-15 15:12:20 +04:00
Christophe Romain