Christophe Romain
6cba7bf834
Add correct package version for mix ( #577 )
2015-05-29 09:30:16 +02:00
Evgeniy Khramtsov
e8ffbbb0b4
Validate MUC room options from the configuration file
2015-05-28 11:42:17 +03:00
badlop
6a9c9616d0
Merge pull request #582 from badlop/master-badlop-578
...
An auth external module requires ext_mod to be started first (#578 )
2015-05-27 13:49:20 +02:00
Badlop
d0443bb714
An auth external module requires ext_mod to be started first ( #578 )
2015-05-27 13:10:15 +02:00
Holger Weiss
5585fb1ecf
New options: dhfile and s2s_dhfile
...
Let admins specify a file that contains custom parameters for
Diffie-Hellman key exchange.
2015-05-26 21:06:04 +02:00
Christophe Romain
b83c07251c
Fix pubsub/odbc crash on remote user unsubscribe (EJAB-1483)
2015-05-26 19:19:57 +02:00
Alexey Shchepin
b2f98099bb
Merge pull request #569 from weiss/send-element-error-checking
...
Update send_element error checking (EJAB-1739)
2015-05-26 15:59:50 +03:00
Mickael Remond
9574e71e8d
Include session record from header file instead of duplicating it
2015-05-26 10:08:46 +02:00
Paweł Chmielowski
3af507cc43
Fix merging of not yaml config files
2015-05-25 15:37:46 +02:00
Christophe Romain
e54e556e01
Fix use of publish_only affiliation with odbc backend
2015-05-22 18:47:17 +02:00
Christophe Romain
90225a4744
Minor cosmetic changes and add ping command
2015-05-22 17:28:40 +02:00
Badlop
0d322d8dab
Add fold markers to config file for Vim editors
2015-05-22 12:42:24 +02:00
Badlop
be6ac85f31
A few more... Fix epmd not in PATH ( #484 )(thanks to acediac)
2015-05-22 10:40:24 +02:00
Badlop
b07cb1ed84
Use namespace definitions when possible
2015-05-21 17:04:14 +02:00
Badlop
0c725b5fac
Document protocol support (EJABS-1620)
2015-05-21 17:04:05 +02:00
Badlop
3b24923458
Fix dialyzer warning in mod_muc_admin:206
2015-05-21 12:00:41 +02:00
badlop
b04f3a4c93
Merge pull request #573 from sezuan/fix_odbc
...
Fix some string/binary issues with non-native ODBC drivers
2015-05-21 11:31:47 +02:00
Christophe Romain
3188941af2
Add minor robustness on cluster scripts
2015-05-20 14:06:03 +02:00
Christophe Romain
fcdb519770
Add missing sm table (thanks to Rasim Kalimullin)(EJAB-1740)
2015-05-20 13:50:59 +02:00
Evgeny Khramtsov
8985a47468
Merge pull request #576 from processone/revert-570-fix_added_sm_table_to_pg
...
Revert "added sm table to pg.sql"
2015-05-20 13:59:04 +03:00
Evgeny Khramtsov
05011e6918
Revert "added sm table to pg.sql"
2015-05-20 13:57:44 +03:00
Evgeny Khramtsov
da68b9a572
Merge pull request #570 from sezuan/fix_added_sm_table_to_pg
...
added sm table to pg.sql
2015-05-20 13:46:02 +03:00
Holger Weiss
889459b45c
Fix function specification
2015-05-20 12:13:15 +02:00
Christophe Romain
1854b5e411
Remove obsolete doc and win32 files (EJAB-1738)
2015-05-20 11:43:29 +02:00
Evgeniy Khramtsov
3b267eaa61
Do not bounce normal messages sent to unavailable resource
2015-05-19 10:58:36 +03:00
Holger Weiss
fba13a0b93
Simplify XEP-0203 (Delayed Delivery) code a bit
...
Now that XEP-0091 support is removed, the XEP-0203 code can be
simplified a little further. This doesn't change the behavior.
2015-05-18 21:26:51 +02:00
Christophe Romain
8bb994dbca
Call integer_to_binary using jlib ( #554 )
2015-05-18 17:30:25 +02:00
Holger Weiss
dfbef8be8f
Remove XEP-0091 tags from test suite
2015-05-18 14:38:57 +02:00
Badlop
2af659b737
Remove deprecated XEP-0090 Entity Time and 91 Delayed Delivery (EJAB-849)
2015-05-18 12:38:25 +02:00
Matthias Rieber
16532dd643
Fixed some string()/binary() issues in ejabberd_odbc
2015-05-18 12:14:56 +02:00
Holger Weiss
555c1736b7
Revert "Fix EJABBERD_OPTS quoting for Elixir"
...
This reverts commit 2a15453d98
2015-05-18 00:48:56 +02:00
Evgeny Khramtsov
e66b45d886
Merge pull request #571 from sezuan/fix_export_term
...
fixed erl_prettypr in encode_term
2015-05-17 22:44:14 +03:00
Matthias Rieber
0800a9733c
pg - added sm table
2015-05-17 21:38:33 +02:00
Matthias Rieber
f5c9dfbc93
fixed erl_prettypr in encode_term
2015-05-17 19:37:49 +02:00
Badlop
084d0c4efe
New command get_room_options ( #567 )
2015-05-15 17:47:10 +02:00
Holger Weiss
61afd668c2
Fix indentation
2015-05-15 15:50:43 +02:00
Paweł Chmielowski
de7ff536b2
Load config snippets for modules installed with ext_mod (EJAB-1741)
2015-05-15 12:30:15 +02:00
Paweł Chmielowski
5dbe7a3c6c
Export modules_dir/0
2015-05-15 12:27:59 +02:00
Holger Weiss
6efce7f706
Cosmetic change: Simplify error checking
...
Let send_stanza_and_ack_req/2 update the #state instead of propagating
the value returned by send_element/2. This doesn't change the behavior.
2015-05-14 01:04:23 +02:00
Holger Weiss
42c7205739
Don't assume send_element/2 returns ok or error
...
Let send_text/2 and (therefore) send_element/2 return {error, Reason}
instead of error for consistency, and let send_stanza_and_ack_req/2
interpret any non-ok value as an error. (EJAB-1739)
2015-05-14 00:58:36 +02:00
Christophe Romain
dbcfd38c18
Allow run joincluster as non root when ejabberd installed as root ( #497 )
2015-05-13 15:54:28 +02:00
Christophe Romain
09f5565ca0
Merge pull request #503 from weiss/fix-quoting-for-elixir
...
Fix EJABBERD_OPTS quoting for Elixir
2015-05-13 15:46:40 +02:00
Badlop
d885435552
Fix setting 'description' with change_room_option command ( #567 )
2015-05-12 17:37:39 +02:00
Mickaël Rémond
eca3b46ee1
Merge pull request #560 from benlangfeld/feature/dev-vm
...
Point out availability of development environment
2015-05-12 09:52:12 +02:00
Badlop
f817762cc4
New max_users_presence mod_muc option (thanks to anhcoi123)( #562 )
2015-05-08 13:09:25 +02:00
Badlop
25beb46391
Fix check_password_hash argument parsing ( #559 )
2015-05-08 12:04:04 +02:00
Badlop
7ab6c4b4fd
Try to support access_commands in YAML (ejabberd-contrib#45)
2015-05-07 18:34:05 +02:00
Badlop
b0b004b26e
Revert "Add private and roster local handlers (EJAB-682)" due to #556
...
This reverts commit 2e194bd997
2015-05-07 17:07:49 +02:00
Badlop
f7d9bb7ce4
Don't announce register feature once user is authenticated ( #41 )
2015-05-07 11:41:59 +02:00
Ben Langfeld
917d48f30b
Use SASL PLAIN authzid as client identity if auth module permits it
...
This allows the authentication modules to perform SASL proxy authentication. It puts the onus on them to authorize the authcid to masquerade as the authzid. Doesn't currently implement such functionality in existing auth modules, since they cannot currently codify a relationship between the two identities. Does not permit the authzid to use a domain differently from the one of the connection.
Note: digest might not work, but I have no interest in it, being deprecated.
2015-05-06 14:12:15 -03:00
