25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Commit Graph

19 Commits

Author SHA1 Message Date
Badlop
5afe7cfafb * src/translate.erl: Support additional files (EJAB-925)
* contrib/extract_translations/extract_translations.erl: Likewise
* contrib/extract_translations/prepare-translation.sh: Likewise

SVN Revision: 2044
2009-04-27 20:55:35 +00:00
Pablo Polvorin
7c10f3422a src/web/ejabberd_web_admin.erl, src/web/ejabberd_web_admin.hrl:
Many exmpp related fixes. Fix a bug when displaying users lists, 
if we can't access the 'offline_msg' mnesia table (using mod_offline_odbc).
This fix should be temporal, we should find a better way to manage this
situation.

src/web/ejabberd_http.erl: Language must be in binary() format.

src/translate.erl: Remove a debug call to io:format/2.

src/ejabberd_sm.erl, src/mod_configure.erl, src/mod_disco.erl:
ejabberd_sm:get_user_resources/2 returns resources as binary().

src/ejabberd_sm.erl: Bugfix in get_user_info/3.

SVN Revision: 1886
2009-02-18 18:03:11 +00:00
Jean-Sébastien Pédron
ff500d8297 Merge from trunk (r1787 to r1804).
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.

Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1766, r1768, r1781, r1783, r1794, r1797, r1799, r1802.

Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1829
2009-01-19 14:47:33 +00:00
Pablo Polvorin
e2ee44617c translate.erl: Bugfix, ?MYLANG macro returns a list().
SVN Revision: 1828
2009-01-19 13:44:43 +00:00
Pablo Polvorin
98f51dc91f Adapt to new exmpp API where get_id/1, get_lang/1, get_initiating_entity/1, get_receiving_entity/1 and get_type/1 returns binary().
SVN Revision: 1791
2009-01-09 19:18:46 +00:00
Jean-Sébastien Pédron
9e96043255 Merge from trunk (r1649 to r1692).
PR:		EJABP-1

SVN Revision: 1695
2008-12-01 15:53:30 +00:00
Jean-Sébastien Pédron
4eaa8e19c9 Merge from trunk (r1457 to r1563).
SVN Revision: 1564
2008-09-16 14:39:57 +00:00
Jean-Sébastien Pédron
44d3e844a3 Accept 'undefined' as a language and treat it as the empty string.
SVN Revision: 1522
2008-08-14 13:32:31 +00:00
Badlop
2d2fcc8210 * doc/guide.tex: Updated copyright dates to 2008
* src/*: Likewise

SVN Revision: 1153
2008-01-15 17:02:57 +00:00
Mickaël Rémond
cd82cadd10 * applied copyright patch 2.
SVN Revision: 1112
2007-12-24 12:58:05 +00:00
Alexey Shchepin
34de660c44 * src/web/ejabberd_http.erl: Fixed processing of POST body for
HTTP Polling

* src/web/ejabberd_http.erl: Support for "Connection" HTTP header
(thanks to Sergei Golovan)

* src/translate.erl: Much better handling of xml:lang (thanks to
Sergei Golovan)

SVN Revision: 271
2004-09-30 21:54:39 +00:00
Alexey Shchepin
d2eab0d535 * doc/guide.tex: Updated
* src/msgs/fr.msg: Updated (thanks to Sergei Golovan)

* src/mod_irc/mod_irc.erl: Added handler for disco items requests
(thanks to Sergei Golovan)

* src/mod_vcard.erl: Added option for JUD disabling (thanks to
Sergei Golovan)

* src/mod_configure2.erl: Fixed module stopping (thanks to Sergei
Golovan)
* src/mod_last.erl: Likewise
* src/mod_privacy.erl: Likewise
* src/mod_register.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_vcard.erl: Likewise

* src/jd2ejd.erl: Added emergency catches (thanks to Sergei
Golovan)
* src/mod_last.erl: Likewise

* src/ejabberd_sm.erl: Removed needless call to
mod_disco:unregister_feature (thanks to Sergei Golovan)

* src/ejabberd_local.erl: Better support for mod_disco (thanks to
Sergei Golovan)
* src/mod_disco.erl: Likewise

* src/translate.erl: Suport for "default language" option (thanks
to Sergei Golovan)
* src/ejabberd_config.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd.hrl: Added 'MYLANG' macros

* src/ejabberd.cfg.example: Updated (thanks to Sergei Golovan)

* doc/guide.tex: Updated (thanks to Sergei Golovan)

* src/win32/ejabberd.cfg: Updated (thanks to Sergei Golovan)

SVN Revision: 241
2004-07-09 22:34:26 +00:00
Alexey Shchepin
78a673f526 * src/mod_muc/mod_muc.erl: Added access rules for using serveice
and creating rooms (thanks to Sergei Golovan)

* src/win32/ejabberd.nsi: Updated (thanks to Sergei Golovan)
* src/win32/CheckUserH.ini: Likewise

* src/translate.erl: Search translations in priv_dir instead of
lib_dir (thanks to Sergei Golovan)

* src/msgs/ru.msg: Updated (thanks to Sergei Golovan)

* src/ejabberd.cfg.example: Updated (thanks to Sergei Golovan)

* src/**/Makefile.in: Updated (thanks to Sergei Golovan)
* src/**/Makefile.win32: Likewise

2004-05-16  Alexey Shchepin  <alexey@sevcom.net>

* src/web/ejabberd_web_admin.erl: Updated

SVN Revision: 235
2004-05-17 20:36:41 +00:00
Alexey Shchepin
b542249f11 * src/ejabberd.erl: Added searching of files in code:priv_lib
(thanks to Sergei Golovan)
* src/translate.erl: Likewise

* src/ejabberd_app.erl: Added "log_path" configuration parameter
(thanks to Sergei Golovan)

* src/**/Makefile.win32: Updated (thanks to Sergei Golovan)

* src/**/*.c: Updated (thanks to Sergei Golovan)

* src/configure.erl: Added writing of version to Makefile.inc
(thanks to Sergei Golovan)

* doc/guide.tex: Updated link to expat (thanks to Sergei Golovan)

SVN Revision: 223
2004-04-15 19:55:38 +00:00
Alexey Shchepin
91aeaae9a5 * src/ejabberd_app.erl: Now possible to specify path to log file
via "EJABBERD_LOG_PATH" environment variable

* src/translate.erl: Now possible to specify path to "msgs"
directory via "EJABBERD_MSGS_PATH" environment variable

* src/ejabberd.erl: Added get_so_path/0 function
* src/ejabberd_app.erl: Use ejabberd:get_so_path/0 to load .so
* src/mod_irc/iconv.erl: Likewise
* src/stringprep/stringprep.erl: Likewise

SVN Revision: 192
2003-12-28 20:59:21 +00:00
Alexey Shchepin
ca5d88c368 * (all): Reorganized supervision tree
SVN Revision: 125
2003-07-20 20:35:35 +00:00
Alexey Shchepin
23e1914e94 *** empty log message ***
SVN Revision: 41
2003-01-16 20:24:53 +00:00
Alexey Shchepin
cadb92e440 *** empty log message ***
SVN Revision: 31
2003-01-06 20:05:48 +00:00
Alexey Shchepin
a4d2a5557e *** empty log message ***
SVN Revision: 30
2003-01-06 19:57:05 +00:00