summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #160 from runcom/protocol_optionsAlexey Shchepin2014-04-155-10/+63
|\
| * Add option to specify openssl optionsAntonio Murdaca2014-04-085-10/+63
* | Merge pull request #167 from weiss/fix-modules-docbadlop2014-04-151-2/+1
|\ \
| * | Remove outdated comment from guideHolger Weiss2014-04-151-2/+1
* | | Merge pull request #168 from weiss/carbons-docbadlop2014-04-151-0/+2
|\ \ \ | |/ / |/| |
| * | Mention mod_carboncopy in documentationHolger Weiss2014-04-151-0/+2
|/ /
* | Merge pull request #165 from weiss/fix-access-docbadlop2014-04-121-1/+1
|\ \
| * | Fix description of access rules syntaxHolger Weiss2014-04-111-1/+1
* | | Merge pull request #146 from jamielinux/masterbadlop2014-04-11133-532/+401
|\ \ \ | |/ / |/| |
| * | Update FSF addressJamie Nguyen2014-02-22133-532/+401
* | | Pretty print accepted transport addressEvgeniy Khramtsov2014-04-111-3/+4
| |/ |/|
* | Update Hebrew translation (thanks to Isratine Citizen)Badlop2014-04-071-324/+350
* | Merge pull request #159 from weiss/update-gitignorebadlop2014-04-071-2/+3
|\ \
| * | Let Git ignore the "ebin" directoryHolger Weiss2014-04-061-2/+1
| * | Let Git ignore files generated by "make install"Holger Weiss2014-04-061-0/+2
* | | Merge pull request #158 from weiss/fix-lang-typebadlop2014-04-071-1/+1
|\ \ \
| * | | Fix a type errorHolger Weiss2014-04-061-1/+1
| |/ /
* | | Merge pull request #157 from weiss/fix-mod-updatebadlop2014-04-071-1/+1
|\ \ \
| * | | Fix badarg issue on module update web siteHolger Weiss2014-04-051-1/+1
| |/ /
* | | Merge pull request #156 from hamano/develbadlop2014-04-071-3/+9
|\ \ \ | |/ / |/| |
| * | mod_register_web: check same acl as mod_register.HAMANO Tsukasa2014-04-041-3/+9
|/ /
* | Fix user_resources command, and ejabberd_xmlrpc parsing auth details in callBadlop2014-03-312-3/+7
* | New Bash completion script for ejabberdctl, experimental (EJAB-1042)Badlop2014-03-262-0/+102
* | Small change in ejabberd_ctl output format to support bash completionBadlop2014-03-261-2/+2
* | Provide meaningful text to user when admin kicks session (EJAB-1455)Badlop2014-03-262-8/+10
* | Fix service_info options processingEvgeniy Khramtsov2014-03-251-2/+2
* | Remove annyoing warningsEvgeniy Khramtsov2014-03-252-5/+0
* | Fix ACLs syntax change (thanks to jokker23)(issue #140)Badlop2014-03-242-1/+3
* | Merge pull request #149 from iulianlaz/carboncopy-fix-msg-back-to-original-se...badlop2014-03-161-1/+13
|\ \
| * | #148 Carbon copy sends message back to original sender solvediulianlaz2014-03-061-1/+13
* | | Update copyright dates to 2014 (EJAB-1679)Badlop2014-03-13158-216/+216
* | | Provide header with latin-1 encoding in translations to work with Erlang/OTP R17Badlop2014-03-121-1/+2
|/ /
* | Merge branch 'master' of github.com:processone/ejabberdEvgeniy Khramtsov2014-02-2812-26/+150
|\ \
| * | Support XEP-0321: Remote Roster Management (EJAB-1381)Badlop2014-02-262-6/+109
| * | Convert DB details to string when calling odbc:connect/2 (EJAB-1681)Badlop2014-02-261-1/+1
| * | Don't provide current password in webinterface (github issue #137)Badlop2014-02-261-3/+1
| * | Merge pull request #145 from weiss/fix-configure-flagbadlop2014-02-241-1/+1
| |\ \
| | * | Fix --{enable,disable}-transient_supervisors flagHolger Weiss2014-02-211-1/+1
| | |/
| * | Merge pull request #144 from weiss/fix-supervisor-startbadlop2014-02-241-1/+1
| |\ \ | | |/ | |/|
| | * Add missing parenthesisHolger Weiss2014-02-211-1/+1
| |/
| * When occupant changes nick, include status 110 in stanzas sent to himBadlop2014-02-141-2/+10
| * Fixing mod_carboncopy sends carbons of carbons (fixes #107)Badlop2014-01-231-1/+1
| * Merge pull request #134 from mrjameshamilton/patch-1badlop2014-01-231-1/+1
| |\
| | * Fixed parameter order in call to restore_room/3mrjameshamilton2014-01-231-1/+1
| |/
| * Clear SASL state after finishing authAlexey Shchepin2014-01-211-0/+3
| * Fix for the previous commitAlexey Shchepin2014-01-211-2/+2
| * Use 'to' field only in the first client stream initializationAlexey Shchepin2014-01-201-1/+6
| * Add some ejabberd_xmlrpc documentation, and link to full detailsBadlop2014-01-021-2/+8
| * Fix auth verification in ejabberd_xmlrpc (thanks to Vicis)Badlop2014-01-021-1/+3
| * Fix example configuration option 'add' to 'append_host_config'Badlop2014-01-021-5/+4