aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1249 from weiss:push-requirements16.09Christophe Romain2016-09-133-25/+87
|\
| * Merge branch 'push-requirements' of https://github.com/weiss/ejabberd into ↵Christophe Romain2016-09-133-25/+87
|/| | | | | | | weiss-push-requirements
| * mod_mam: Add 'store_mam_message' hookHolger Weiss2016-08-151-5/+17
| | | | | | | | | | The new 'store_mam_message' hook is invoked whenever a MAM message is stored.
| * mod_offline: Add 'store_offline_message' hookHolger Weiss2016-08-151-8/+16
| | | | | | | | | | The new 'store_offline_message' hook is invoked whenever an offline message is stored.
| * ejabberd_c2s: Add XEP-0198 resumption hooksHolger Weiss2016-08-151-12/+24
| | | | | | | | | | | | The new 'c2s_session_pending' and 'c2s_session_resumed' hooks are invoked when a stream management session is pending and resumed, respectively.
| * Add functions to get/set some c2s state elementsHolger Weiss2016-08-151-0/+30
| |
* | Allow to create room with custom configChristophe Romain2016-09-131-13/+37
| |
* | Expand parsing of json input to be able to handle update_roster commandPaweł Chmielowski2016-09-131-0/+19
| |
* | Add X-Admin and basic auth header to CORS allowed headers in http_apiPaweł Chmielowski2016-09-121-1/+1
| |
* | Properly process OPTIONS header in http_api for all pathsPaweł Chmielowski2016-09-121-1/+3
| |
* | Fix nick-to-jid mapping for MUC subscribersEvgeniy Khramtsov2016-09-122-12/+34
| |
* | Support multiple room invitations (#1285)Badlop2016-09-091-23/+40
| |
* | Fix subscribed rooms list retreivementEvgeniy Khramtsov2016-09-091-1/+2
| |
* | XEP-0198: Cancel timer when waiting for resumptionHolger Weiss2016-09-091-1/+7
| | | | | | | | | | If an ACK timer is active while going into the 'wait_for_resume' state, cancel that timer.
* | Revert "Don't log an [error] message if Elixir is missing"Holger Weiss2016-09-081-1/+1
| | | | | | | | | | This reverts commit 41386d718dbc5f6e846baaac568ba1cae5eb7ec4. The issue was fixed with commit 4bd45bada70fc233bb87bc7ab099fc2407cea30b.
* | Don't log an [error] message if Elixir is missingHolger Weiss2016-09-081-1/+1
| | | | | | | | | | | | The Elixir support is still optional. Closes #1250.
* | Fix typo on previous commit (#1284)Christophe Romain2016-09-081-1/+1
| |
* | Start elixir config code only if elixir was enabled in configure scriptPaweł Chmielowski2016-09-083-14/+39
| |
* | Full jid entity subscriptions should include bare jid records (#1284)Christophe Romain2016-09-081-2/+3
| |
* | Fix message routing from subscribersEvgeniy Khramtsov2016-09-081-6/+13
| |
* | Merge pull request #1287 from weiss/ack-timeoutPaweł Chmielowski2016-09-083-12/+58
|\ \ | | | | | | New stream management option: ack_timeout
| * | New stream management option: ack_timeoutHolger Weiss2016-09-073-12/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Support for Elixir configuration file #1208gabrielgatu2016-09-0828-12/+1914
| | | | | | | | | | | | Contribution for Google Summer of code 2016 by Gabriel Gatu
* | | Support for publishing to hex.pm with latest Elixir mixMickael Remond2016-09-082-1/+4
| | |
* | | Fix compilation with Elixir 1.3 / R19Mickael Remond2016-09-082-7/+6
| | |
* | | TypoPaweł Chmielowski2016-09-081-1/+1
| | |
* | | Properly normalize resource_regexp acl rulePaweł Chmielowski2016-09-081-0/+2
|/ / | | | | | | This fixes issue #1288.
* | Enforce pathtype use with config path (#1264)Christophe Romain2016-09-071-1/+3
| |
* | Merge pull request #1253 from Amuhar/xep0356Christophe Romain2016-09-079-27/+1091
| |
* | Create room on configuration request as per XEP-0045, 10.1.3Evgeniy Khramtsov2016-09-071-4/+19
| |
* | Link MUC subscription to bare JIDEvgeniy Khramtsov2016-09-072-198/+148
| |
* | Add SQL support for microblogging node pluginHolger Weiss2016-09-071-0/+151
| |
* | Handle <subscriptions/> request to list MUC subscribersEvgeniy Khramtsov2016-09-061-4/+21
| |
* | Do not update muc_online_users table on MUC/Sub operationsEvgeniy Khramtsov2016-09-061-1/+3
| |
* | Add get_subscribers command to list MUC subscribersEvgeniy Khramtsov2016-09-062-1/+23
| |
* | node_mb: Call node_pep instead of node_hometreeHolger Weiss2016-09-061-1/+1
| |
* | node_mb: Fix configuration documentationHolger Weiss2016-09-061-0/+1
| | | | | | | | | | A node plugin used in a 'pep_mapping' must explicitly be added to the list of 'plugins'.
* | mod_pubsub: Remove outdated commentHolger Weiss2016-09-061-2/+0
| |
* | Clean ejabberd_commands before testsPaweł Chmielowski2016-09-051-0/+1
| |
* | ejabberd_oauth requiere working cache_tab, initialize it before testsPaweł Chmielowski2016-09-051-1/+4
| |
* | Merge remote-tracking branch 'processone/pr/1262'Holger Weiss2016-08-221-1/+1
|\ \ | | | | | | | | | | | | * processone/pr/1262: Fixed typo in Stream Management option name
| * | Fixed typo in Stream Management option nameIgor Manturov Jr2016-08-231-1/+1
|/ /
* | Merge remote-tracking branch 'processone/pr/1261'Holger Weiss2016-08-221-1/+1
|\ \ | | | | | | | | | | | | * processone/pr/1261: Fixed #1260 Stream Management feature for the websocket connections
| * | Fixed #1260 Stream Management feature for the websocket connectionsIgor Manturov Jr2016-08-231-1/+1
|/ /
* | mod_muc_admin: Accept 'allow_subscription' optionHolger Weiss2016-08-221-0/+1
| | | | | | | | | | Allow for setting the new 'allow_subscription' option using the 'change_room_option' command.
* | Merge pull request #1254 from lemenkov/remove_p1_xmlrpcbadlop2016-08-193-4/+1
|\ \ | | | | | | Remove no longer necessary p1_xmlrpc
| * | Remove no longer necessary p1_xmlrpcPeter Lemenkov2016-08-173-4/+1
|/ / | | | | | | | | | | | | | | Ths module was superceded by fast_xml in commit processone/ejabberd@dfc29ea03ca91e1eb5387d93612e2ac4b4b496da. So let's remove it entirely to avoid any confusion. Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
* / Erlang R17 has a Time limit in erlang:send_after (#1246)Badlop2016-08-161-1/+1
|/
* Support sql backend in mod_shared_roster commands (#1244)Badlop2016-08-151-4/+4
|
* Merge pull request #1245 from hamano/clean_redis_tableEvgeny Khramtsov2016-08-151-2/+5
|\ | | | | fix clean redis table