Paweł Chmielowski
|
7d99484859
|
Make KEEPALIVE_QUERY list as this is what sql_query/3 expects
|
2015-10-15 10:07:24 +02:00 |
|
Sonny Scroggin
|
35c33a8a29
|
Improve line lengths; use spaces in between commas.
|
2015-10-14 22:52:27 -05:00 |
|
Sonny Scroggin
|
98c172aed6
|
mix.lock should be commited to ensure consistent builds.
|
2015-10-14 22:50:28 -05:00 |
|
Sonny Scroggin
|
25f95d6954
|
This dependency was removed in 83dd79a
|
2015-10-14 22:49:47 -05:00 |
|
Alexey Shchepin
|
4fce1a17d7
|
Fix cyrsasl_oauth:mech_new call
|
2015-10-12 20:53:52 +03:00 |
|
Christophe Romain
|
1578f17eff
|
Remove obsolete sasl init
|
2015-10-12 10:41:07 +02:00 |
|
Evgeniy Khramtsov
|
87273619a6
|
Advertise MAM (XEP-0313) v0.4 support in room disco
|
2015-10-11 19:43:24 +03:00 |
|
Paweł Chmielowski
|
b5ac0db895
|
Be able to merge old style configs with {listen,...}
|
2015-10-08 13:07:00 +02:00 |
|
Paweł Chmielowski
|
6d25db6600
|
Handler module shouldn't be used for differentiating listeners when merging configs
|
2015-10-07 16:45:07 +02:00 |
|
Christophe Romain
|
880114a909
|
Enforce get_allowed_items_call
|
2015-10-07 16:40:37 +02:00 |
|
Christophe Romain
|
653105a44f
|
Fix acl issue from cleanup
|
2015-10-07 15:12:15 +02:00 |
|
Christophe Romain
|
f938c2a5e2
|
Revert "Avoid crypto:hmac/3 call for R15B compatibility"
This reverts commit 31e356c126 .
|
2015-10-07 14:18:56 +02:00 |
|
Christophe Romain
|
6a23cad454
|
Revert "Fix compilation on Erlang R15B"
This reverts commit a5d6044448 .
|
2015-10-07 14:18:47 +02:00 |
|
Christophe Romain
|
6aeb9dcb38
|
cosmetic cleanup
|
2015-10-07 14:18:38 +02:00 |
|
Christophe Romain
|
83dd79a6a7
|
Remove unused dependency
|
2015-10-06 11:06:04 +02:00 |
|
Evgeniy Khramtsov
|
6378c673df
|
Avoid MAM dups when routing to multiple resources
|
2015-10-02 16:09:55 +02:00 |
|
Evgeniy Khramtsov
|
c7750689e8
|
Fix force_update_presence
|
2015-10-02 16:06:47 +02:00 |
|
Mickael Remond
|
41d65f8fe2
|
We want oauth2 to be supported as default in Elixir environment
|
2015-10-02 10:40:55 +02:00 |
|
Paweł Chmielowski
|
24fa95fd60
|
Fix problem with --auth in ejabberd_ctl:process2/2
|
2015-10-01 21:09:03 +02:00 |
|
Paweł Chmielowski
|
67d3b50598
|
Switch macros resolving in config files to be global instead of per file
|
2015-10-01 14:34:48 +02:00 |
|
Mickaël Rémond
|
df39fec5d0
|
Merge pull request #753 from scrogson/add_links
Add License and Links for display on hex.pm
|
2015-09-29 22:37:15 +02:00 |
|
Mickaël Rémond
|
152d80827a
|
Merge pull request #755 from scrogson/fix_ejabberd_directory_name
Use lowecase directory name for lib/ejabberd
|
2015-09-29 22:36:02 +02:00 |
|
Sonny Scroggin
|
9c82f160e5
|
Use lowecase directory name for lib/ejabberd
|
2015-09-29 14:08:39 -05:00 |
|
Evgeny Khramtsov
|
189267c1a1
|
Merge pull request #754 from scrogson/gitignore
Ignore mnesiadb and _build
|
2015-09-29 21:27:49 +03:00 |
|
Sonny Scroggin
|
59b6a46f82
|
Ignore mnesiadb and _build
|
2015-09-29 13:21:35 -05:00 |
|
Sonny Scroggin
|
6b81a1ed90
|
clean up whitespace
|
2015-09-29 13:19:35 -05:00 |
|
Sonny Scroggin
|
b63c51c245
|
Add additional package information for hex.pm
|
2015-09-29 13:18:49 -05:00 |
|
Paweł Chmielowski
|
704844fd2a
|
Temporary switch to fork of oauth2 that compiles with r18
|
2015-09-29 15:34:02 +02:00 |
|
Christophe Romain
|
3fc1d8ca9a
|
Set version 15.09 for mix
|
2015-09-29 14:21:57 +02:00 |
|
Badlop
|
d08f73da47
|
Recompile translations
|
2015-09-29 08:19:44 +02:00 |
|
Alexey Shchepin
|
cf975da8f2
|
Update several commands for recent ejabberd_commands changes
|
2015-09-28 15:29:25 +03:00 |
|
Paweł Chmielowski
|
846b520edc
|
oauth uses jiffy so fetch it unconditionally
|
2015-09-28 10:08:27 +02:00 |
|
Alexey Shchepin
|
88a206400a
|
Add oauth_access option
|
2015-09-25 19:48:53 +03:00 |
|
Badlop
|
1781a58929
|
Strip Nick element in message stanzas sent to a room (#686)
|
2015-09-25 17:00:00 +02:00 |
|
Paweł Chmielowski
|
e2cc45933f
|
Enable oauth unconditionally
|
2015-09-25 16:39:47 +02:00 |
|
Christophe Romain
|
5eab6e315e
|
Revert "Remove "--enable-json" flag"
This reverts commit 5bb137940c .
This is needed for mod_http_api
|
2015-09-25 16:09:46 +02:00 |
|
Christophe Romain
|
a1129dc96b
|
Add OAuth support (thanks to Aleksey)
|
2015-09-25 15:49:07 +02:00 |
|
Christophe Romain
|
7cf904f4cf
|
Merge pull request #742 from joudinet/master
Allow root to run join_cluster and leave_cluster
|
2015-09-25 14:20:37 +02:00 |
|
Badlop
|
deccf91280
|
Fix calling problem introduced when reducing bashisms (#748)
|
2015-09-25 13:35:03 +02:00 |
|
badlop
|
825f4fcc35
|
Merge pull request #748 from joudinet/bashisms
Remove bashisms in {join,leave}cluster scripts
|
2015-09-24 19:26:03 +02:00 |
|
Badlop
|
ee456cc2af
|
Fix regression introduced when code was binarized (EJAB-641)
|
2015-09-24 17:21:14 +02:00 |
|
Johan Oudinet
|
1f4d8fd4d7
|
Remove bashisms in {join,leave}cluster scripts
So they can run in any POSIX shell, not bash only.
|
2015-09-24 15:32:06 +02:00 |
|
Holger Weiss
|
484fd1f51f
|
Log TLS errors as [debug] messages only
Closes #652 and closes #679.
|
2015-09-24 12:00:59 +02:00 |
|
Evgeniy Khramtsov
|
89b3471742
|
Add <stanza-id/> (XEP-0359) to archived messages
|
2015-09-22 21:15:34 +03:00 |
|
Johan Oudinet
|
c360326cdb
|
Allow root to run join_cluster and leave_cluster
Prefix the call to joincluster and leavecluster in ejabberdctl by
$EXEC_CMD. Avoid using sh -c in these scripts.
Should fix #676.
|
2015-09-22 17:07:39 +02:00 |
|
Paweł Chmielowski
|
3300c8d994
|
Set disable caching headers in http-bind responses (EJAB-1643)
|
2015-09-22 15:42:57 +02:00 |
|
Paweł Chmielowski
|
e289344972
|
Nameprep host name passed to http-bind before using in (EJAB-1658)
|
2015-09-22 15:42:57 +02:00 |
|
Christophe Romain
|
23a1aceac0
|
Improve external module configuration management (EJAB-1746)
|
2015-09-22 12:49:55 +02:00 |
|
Evgeniy Khramtsov
|
70b1dc479c
|
Add MAM (XEP-0313) v0.4 support
|
2015-09-22 12:23:36 +03:00 |
|
Christophe Romain
|
e57c1896f7
|
Avoid wrong failing cases on make install (#468)
|
2015-09-21 17:51:13 +02:00 |
|