Evgeny Khramtsov
2cb0f92fe6
Merge pull request #293 from weiss/fix-comment
...
Fix a comment in ejabberd_hooks
2014-08-27 12:48:58 +04:00
Evgeny Khramtsov
2ae7d0a122
Merge pull request #292 from weiss/fix-xep-reference
...
Fix an XEP reference in the guide
2014-08-27 12:48:34 +04:00
Holger Weiss
f1ad6f017b
Fix a comment in ejabberd_hooks
2014-08-26 01:04:15 +02:00
Holger Weiss
c658984531
Fix an XEP reference in the guide
2014-08-26 01:01:11 +02:00
Evgeny Khramtsov
191eeed7c9
Merge pull request #287 from vesvalo/master
...
Fix return value of mod_shared_roster:delete_group.
2014-08-21 16:32:31 +04:00
vesvalo
01a3c1c2e1
Fix return value of mod_shared_roster:delete_group. Current one is not compatible with mod_admin_extra.
2014-08-21 15:13:43 +04:00
Evgeny Khramtsov
8e3a49d369
Merge pull request #286 from vesvalo/fix_pep_odbc_publishing
...
fix 404 on pep first publishing with odbc
2014-08-21 13:29:55 +04:00
vesvalo
c48b7f272b
fix 404 on pep first publishing with odbc
2014-08-21 11:23:58 +04:00
Evgeny Khramtsov
4a9417c501
Merge pull request #284 from weiss/infinity-vs-unlimited
...
Guide: For consistency, use 'infinity' everywhere
2014-08-21 01:26:22 +04:00
Holger Weiss
72049e5323
Guide: For consistency, use 'infinity' everywhere
2014-08-20 20:43:38 +02:00
Evgeny Khramtsov
33e0bf1c19
Merge pull request #283 from weiss/allow-unlimited-ack-queue
...
Support "max_ack_queue: infinity"
2014-08-20 17:47:04 +04:00
Evgeny Khramtsov
5ed7f10153
Merge pull request #282 from weiss/fix-muc-option-docs
...
Fix MUC option docs: "infinity", not "infinite"
2014-08-20 17:44:06 +04:00
Holger Weiss
2802b6cee2
Allow for "max_ack_queue: infinity", as documented
2014-08-20 12:53:26 +02:00
Holger Weiss
44828c54fe
Fix MUC option docs: "infinity", not "infinite"
2014-08-20 12:26:03 +02:00
Evgeny Khramtsov
ae0d31a8c9
Merge pull request #280 from weiss/store-persistent-muc-on-init
...
Store peristent MUC room during creation
2014-08-19 13:28:15 +04:00
Holger Weiss
7274dafe10
Store persistent MUC room during creation
...
Make sure persistent rooms are stored to the database. Without this
change, a room got lost if the 'persistent' flag was handed over to
mod_muc:create_room/5 and the server was then restartet before any
activity took place in that room.
2014-08-19 11:12:51 +02:00
Evgeny Khramtsov
bc2e26fecd
Merge pull request #277 from weiss/xep-0198
...
XEP-0198: Create shorter session resume IDs
2014-08-15 19:15:32 +04:00
Holger Weiss
2d4c39cd54
XEP-0198: Create shorter resume IDs
...
Omit the user and server name from the 'previd' value.
2014-08-15 10:56:59 +02:00
Evgeny Khramtsov
9484b11383
Merge pull request #276 from weiss/xep-0198
...
XEP-0198: Don't crash if the resume ID is incorrect
2014-08-15 10:49:59 +04:00
Holger Weiss
848e1497d1
XEP-0198: Gracefully handle broken 'previd'
...
Produce a proper error message instead of crashing when the 'previd'
value of a <resume/> request has an unexpected format.
2014-08-15 01:54:41 +02:00
Holger Weiss
2daf95e93f
XEP-0198: Gracefully handle wrong credentials
...
Produce a proper error message instead of crashing when the JID encoded
in the 'previd' value of a <resume/> request is different from the
authenticated JID.
2014-08-15 01:53:47 +02:00
Evgeny Khramtsov
1b1d9b5a73
Merge pull request #269 from Iperity/master
...
Fix migration of pubsub nodes. Was deleting and re-creating all nodes on...
2014-08-15 03:20:36 +04:00
Evgeny Khramtsov
5836eb5bc2
Merge pull request #268 from benlangfeld/fix/ldap_filter_dnattributes_new_ejabberd
...
Set dnAttributes on when it's requested by a filter
2014-08-15 03:19:18 +04:00
Evgeniy Khramtsov
5c88f6423a
Fix the deprecation warning to reflect YAML format
2014-08-12 14:26:15 +04:00
Evgeniy Khramtsov
56d61c2784
Do not call functions from ejabberd_riak directly
2014-08-12 14:25:54 +04:00
Evgeny Khramtsov
0917209711
Merge pull request #273 from gamenet/master
...
odb_queries patch return value of functions update and update_t in case of sql insert
2014-08-08 16:03:03 +04:00
vesvalo
8c22b154c9
Merge pull request #2 from vesvalo/master
...
fix mod_offline to store only chat messages with body xml element
2014-08-08 14:05:35 +04:00
vesvalo
436f0832c1
fix mod_offline to store only chat messages with body xml element
2014-08-08 13:57:27 +04:00
Nikolay Bondarenko
5d0de39127
Merge pull request #1 from vesvalo/master
...
Fix odbc update_t and update insert case return value
2014-08-08 13:39:44 +04:00
vesvalo
92f89e3d45
Fix odbc update_t and update insert case return value
2014-08-08 13:26:16 +04:00
Evgeny Khramtsov
f91caf7108
Merge pull request #270 from weiss/log-s2s-in-auth
...
Log authentication method for incoming s2s connections
2014-08-05 16:51:51 +04:00
Holger Weiss
38c016a041
Log auth method for incoming s2s connections
...
Generate an [info] message that logs whether an incoming s2s connection
is authenticated using the SASL EXTERNAL mechanism or via Server
Dialback. While at it, also mention whether TLS is enabled.
2014-08-05 14:10:32 +02:00
Nathan Bruning
4f63cb21c2
Fix migration of pubsub nodes. Was deleting and re-creating all nodes on each startup.
2014-08-03 21:03:16 +02:00
Evgeny Khramtsov
2e70c59471
Merge pull request #267 from weiss/replace-echo-calls
...
doc/Makefile: Replace non-portable echo(1) calls
2014-08-01 19:25:01 +04:00
Alexey Shchepin
f00725dffb
mod_offline now uses gen_server
2014-07-31 14:26:09 +04:00
Christophe Romain
4205108f30
typo fix on roster subscription (EJAB-1711)
2014-07-31 11:50:22 +02:00
Ben Langfeld
651de2ca8e
Set dnAttributes on when it's requested by a filter
2014-07-29 15:22:54 -03:00
Holger Weiss
e79290fb56
doc/Makefile: Replace non-portable echo(1) calls
...
The echo(1) behavior is system-dependent, the printf(1) behavior is not.
2014-07-28 22:54:09 +02:00
Evgeniy Khramtsov
db3c469d4d
Reorganize mod_announce test in order to avoid race
2014-07-28 13:42:50 +04:00
Evgeny Khramtsov
7d93463d31
Merge pull request #266 from weiss/remove-http
...
Remove "--enable-http" flag
2014-07-28 11:08:13 +04:00
Evgeny Khramtsov
5d79dff4f3
Merge pull request #265 from weiss/mention-starttls-required
...
Mention "starttls_required" option in sample configuration file
2014-07-28 11:06:59 +04:00
Evgeny Khramtsov
58fd56e6a2
Merge pull request #264 from weiss/su-without-p
...
ejabberdctl: Omit su(1)'s "-p" flag
2014-07-28 11:06:27 +04:00
Holger Weiss
f1e6365ee1
Remove "--enable-http" flag
...
Specifying the "--enable-http" flag on the ./configure command line had
no effect.
2014-07-27 12:51:25 +02:00
Holger Weiss
4a02df8b6d
Mention "starttls_required" option in ejabberd.yml
...
Closes #258 .
2014-07-27 12:44:34 +02:00
Holger Weiss
bee9ffd91e
Apply minor improvement to ejabberd.yml comment
2014-07-27 11:54:30 +02:00
Holger Weiss
3e232952ea
ejabberdctl: Omit su(1)'s "-p" flag
...
On Linux, su(1)'s "-p" flag makes sure the following environment
variables are preserved: $HOME, $SHELL, $USER, and $LOGNAME. The flag
isn't portable, and since we don't set HOME=$SPOOLDIR anymore, there's
no reason to preserve these variables anyway.
Without "-p", we also don't need to set HOME=$INSTALLUSER_HOME, as su(1)
now does that for us.
2014-07-27 11:21:55 +02:00
Evgeniy Khramtsov
c0001184fd
Merge branch 'master' of github.com:processone/ejabberd
2014-07-27 13:06:46 +04:00
Evgeniy Khramtsov
abeaac1c11
Add tests for mod_announce
2014-07-27 13:06:20 +04:00
Evgeny Khramtsov
6427d9398a
Merge pull request #263 from weiss/fix-ejabberdctl-issues
...
Fix ejabberdctl issues
2014-07-24 20:56:32 +04:00
Evgeny Khramtsov
677b358a9a
Merge pull request #262 from weiss/update-gitignore
...
Let Git ignore the "configure" script
2014-07-24 20:55:50 +04:00
