Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-20 17:27:00 +01:00
Code Releases Activity
2,921 Commits 7 Branches 110 Tags 68 MiB
b82eeeeec9
Commit Graph

530 Commits

Author SHA1 Message Date
Badlop
402a8c0d35 Prepare 2.1.1 release 
SVN Revision: 2808
 2009-12-14 14:15:45 +00:00
Badlop
b9e57a341d Added to ejabberdctl an experimental variable EJABBERD_BYPASS_WARNINGS 
SVN Revision: 2804
 2009-12-11 19:42:59 +00:00
Badlop
3250c24ff1 This is ejabberd 2.1.x branch, not 2.1.0 tag. 
SVN Revision: 2796
 2009-12-09 10:09:35 +00:00
Badlop
88b6849e69 Fix erl -setcookie argument in cluster setup (thanks to Jan Koum) 
SVN Revision: 2795
 2009-12-09 10:09:19 +00:00
Badlop
5a006b977d Small relax the limitation in the mod_pubsub_odbc host option. 
SVN Revision: 2781
 2009-12-04 16:08:31 +00:00
Badlop
3658da3ae8 Explain limitation in the mod_pubsub_odbc host option. 
SVN Revision: 2777
 2009-12-03 22:53:56 +00:00
Badlop
ea4f379bd5 Fix explanation of option content_types. Reorder options. 
SVN Revision: 2755
 2009-11-23 19:11:37 +00:00
Badlop
7fd3d67ff3 Change captcha.sh to not depend on bash (thanks to Konstantin Khomoutov)(EJAB-1105) 
SVN Revision: 2749
 2009-11-23 12:43:15 +00:00
Badlop
1716b090f9 Option to define custom HTTP headers in mod_http_fileserver (EJAB-612) 
SVN Revision: 2747
 2009-11-23 12:00:46 +00:00
Badlop
e5e777694d Explain that the example captcha.sh requires Bash because uses RANDOM feature. 
SVN Revision: 2745
 2009-11-17 15:49:05 +00:00
Badlop
26c572b7e7 The default value of option ldap_filter is: undefined. 
SVN Revision: 2741
 2009-11-13 20:16:41 +00:00
Badlop
24323e8b3b Extend explanation of ldap_encrypt tls (thanks to Konstantin Khomoutov) 
SVN Revision: 2723
 2009-11-04 20:12:54 +00:00
Badlop
4aec8dda48 Extend explanation of mod_pubsub "default" rename to "hometree". 
SVN Revision: 2718
 2009-11-04 09:42:54 +00:00
Badlop
0906a68c27 Mention in Release Notes the three changes in SQL databases (EJAB-1078) 
SVN Revision: 2707
 2009-10-23 17:32:12 +00:00
Badlop
5e3fdbeeed Mention the change in nodename slash separation in release notes. 
SVN Revision: 2689
 2009-10-20 15:39:57 +00:00
Badlop
f2a37597cf In default config, only local accounts can create rooms and pubsub nodes. 
SVN Revision: 2683
 2009-10-19 17:02:37 +00:00
Badlop
66cd86e726 Support ejabberd_listener option 'backlog' to increase TCP backlog (thanks to Janusz Dziemidowicz)(EJAB-1063) 
SVN Revision: 2678
 2009-10-19 13:23:46 +00:00
Badlop
47d86f5ad1 Fix word Sensible with Sensitive (thanks to Marcin Owsiany)(EJAB-1071) 
SVN Revision: 2675
 2009-10-19 10:48:55 +00:00
Badlop
4039f4a14f Document new option max_fsm_queue. 
SVN Revision: 2648
 2009-10-08 14:29:42 +00:00
Mickaël Rémond
e780126c9e Describe how to compile ejabberd on Mac OS X Snow Leopard with Erlang R13B-2 
SVN Revision: 2636
 2009-09-27 14:30:01 +00:00
Badlop
dc474cf9d5 Recompile guide and translation files. 
SVN Revision: 2625
 2009-09-24 13:37:32 +00:00
Christophe Romain
330d6f7b6e rename pep_sendlast_offline option to ignore_pep_from_offline (EJAB-1047) 
SVN Revision: 2621
 2009-09-23 21:54:58 +00:00
Christophe Romain
8107b2b7dc fix EJAB-819 thanks to badlop 
SVN Revision: 2615
 2009-09-23 15:56:06 +00:00
Badlop
3c3cd099de Replace several mentions of Jabber to XMPP (thanks to Nicolas Vérité) 
SVN Revision: 2613
 2009-09-23 15:28:53 +00:00
Badlop
d6f63ceec5 Document more ejabberd commands in the Guide (EJAB-1041) 
SVN Revision: 2608
 2009-09-21 10:03:37 +00:00
Badlop
8d47a20d63 Added new translation to Greek language (thanks to James Iakovos Mandelis) 
SVN Revision: 2607
 2009-09-21 07:39:23 +00:00
Badlop
eab6c09e0c Mention the mod_pubsub plugin default rename to flat 
SVN Revision: 2606
 2009-09-21 07:39:07 +00:00
Christophe Romain
ae70faef94 change version do 2.1.0 
SVN Revision: 2597
 2009-09-11 08:16:25 +00:00
Badlop
4b8d7dd19b Mention in the 2.1.0 release notes the HTTP-Bind optimization 
SVN Revision: 2595
 2009-09-10 22:38:17 +00:00
Badlop
4d3708b637 Include in release notes Zlib+STARTTLS support 
SVN Revision: 2573
 2009-08-31 16:41:20 +00:00
Badlop
fd57ec5872 Support zlib compression after STARTTLS (thanks to Aleksey Shchepin)(EJAB-499) 
SVN Revision: 2571
 2009-08-31 16:29:25 +00:00
Badlop
a5c5808911 Remove the word "END" of release_notes file because it seems unnecessary. 
SVN Revision: 2570
 2009-08-31 14:54:35 +00:00
Badlop
19dead97a3 Rename erlang log file sasl.log to erlang.log (EJAB-783) 
SVN Revision: 2567
 2009-08-31 08:41:56 +00:00
Badlop
64976e18b3 Add command to update PubSub table of ejabberd trunk SVN. 
If you use ejabberd trunk SVN, run this command:
ejabberdctl rename_default_nodeplugin

SVN Revision: 2531
 2009-08-25 15:23:23 +00:00
Badlop
1b81a2e3d6 Write PID file, path is configurable in ejabberdctl.cfg (EJAB-1023) 
SVN Revision: 2526
 2009-08-24 21:21:04 +00:00
Badlop
342ea2753c Document that the admin can install ejabberd.init script (EJAB-755) 
SVN Revision: 2522
 2009-08-24 19:44:21 +00:00
Badlop
4be5c0c90c Show example config to disable account create/delete, and allow password change. 
SVN Revision: 2512
 2009-08-20 21:43:55 +00:00
Badlop
ea06dc92bc Explain how client can specify Pubsub plugin when creating node (thanks to Christophe Romain) 
SVN Revision: 2504
 2009-08-19 16:34:13 +00:00
Badlop
df30831421 Update Pubsub's nodetree documentation (thanks to Christophe Romain) 
SVN Revision: 2503
 2009-08-19 15:44:29 +00:00
Badlop
0ec33b0868 Recompile guide.html 
SVN Revision: 2499
 2009-08-18 16:58:08 +00:00
Christophe Romain
fd16591a2a added mod_pubsub_odbc documentation 
SVN Revision: 2498
 2009-08-18 10:14:49 +00:00
Badlop
695ff58c55 Describe the options syntax, not only the name (EJAB-998) 
SVN Revision: 2472
 2009-08-12 14:15:59 +00:00
Badlop
208ec6c076 Update URLs of IETF and XMPP protocol documents 
SVN Revision: 2455
 2009-08-11 11:41:15 +00:00
Badlop
3eaf796cca More documentation for STUN server. 
* Add stun listener to example config file, disabled.
* Improve enumeration of listeners options
* Mention STUN in release notes
* Mention new STUN listener in release notes
* Mention new network protocol syntax in release notes

SVN Revision: 2454
 2009-08-11 11:22:57 +00:00
Evgeniy Khramtsov
0c2222745f STUN support is now documented 
SVN Revision: 2453
 2009-08-11 10:13:03 +00:00
Badlop
dd2be928af Added preliminary Release Notes for ejabberd 2.1.0 
SVN Revision: 2445
 2009-08-07 14:43:40 +00:00
Badlop
6b6cb345ba To use import/export XEP-0227 feature, exmpp 0.9.1 or higher is required. 
SVN Revision: 2441
 2009-08-07 10:22:11 +00:00
Badlop
54ff94e3e3 ejabberdctl commands use _ instead of -. For backwards compatibility - is still supported. 
SVN Revision: 2440
 2009-08-07 10:22:06 +00:00
Badlop
f9a8b9ff31 Add support for XEP-227 import/export, requires exmpp to use it (EJAB-993) 
SVN Revision: 2439
 2009-08-07 09:52:45 +00:00
Badlop
0ad45b1a93 Document options for Roster Versioning (EJAB-964) 
SVN Revision: 2430
 2009-08-06 21:06:20 +00:00
Badlop
720fd7605d Document the new option s2s_dns_options, expressed in seconds (EJAB-994) 
SVN Revision: 2417
 2009-08-03 15:03:50 +00:00
Badlop
ea96fe3fd1 Document mod_ping in the ejabberd Guide (EJAB-974)(EJAB-173) 
SVN Revision: 2403
 2009-07-30 11:45:54 +00:00
Badlop
5346a7df02 Allow content types to be configured in ejabberd.cfg (EJAB-975)(thanks to Brian Cully) 
SVN Revision: 2376
 2009-07-21 17:31:09 +00:00
Badlop
9df5639974 Support XEP-0157: Contact Addresses for XMPP Services (EJAB-235) 
SVN Revision: 2368
 2009-07-17 20:45:44 +00:00
Badlop
a7eb5a77eb Add -hidden flag when calling Debug or Ctl 
SVN Revision: 2354
 2009-07-06 14:08:57 +00:00
Badlop
49688feaf2 Add XEP82 Date Time, update XEP202 Entity Time and XEP203 Delayed Delivery (EJAB-234) 
SVN Revision: 2345
 2009-06-30 16:51:25 +00:00
Badlop
edb5211f5f Improve explanation about SSL for port 5223 and its option 'tls'. 
SVN Revision: 2339
 2009-06-25 18:02:23 +00:00
Badlop
2159829168 Add note about PAM configuration for pam_winbind (thanks to Jon Bendtsen) 
SVN Revision: 2337
 2009-06-25 17:07:15 +00:00
Badlop
2594c7d687 Add permanent section about HTTP Bind module to the Guide. Example config. 
SVN Revision: 2260
 2009-06-16 17:48:38 +00:00
Badlop
c34999cc96 Add permanent section about mod_http_fileserver to the Guide. Example config. 
SVN Revision: 2182
 2009-06-16 13:46:03 +00:00
Badlop
83ffe1989a Ad-hoc commands to join IRC channel, set nickname and encoding (thanks to Magnus Henoch)(EJAB-302) 
SVN Revision: 2164
 2009-06-15 18:56:52 +00:00
Badlop
e0370d89b4 Add option to restrict max offline messages by Access and ACL (EJAB-951) 
New option for mod_offline: access_max_user_messages.
The old option user_max_messages is no longer supported.

SVN Revision: 2162
 2009-06-15 17:43:18 +00:00
Christophe Romain
039d5b8367 pubsub: added configuration option in guide.tex, added last item cache, use default node type if given type is not configured, make node_flat the default node plugin. caps: improve cache handling 
SVN Revision: 2112
 2009-05-28 22:30:43 +00:00
Badlop
31aa201ee8 Support LDAPS with TLS (EJAB-109)(thanks to Thomas Baden, Andy Harb, Sergei Golovan, Anton Podavalov) 
SVN Revision: 2098
 2009-05-25 17:15:48 +00:00
Badlop
08ba5346db Document how to convert Mnesia node name 
SVN Revision: 2081
 2009-05-15 22:39:30 +00:00
Badlop
8af1c41a3e Erlang/OTP R13 can be used, but its support is still experimental 
SVN Revision: 2077
 2009-05-15 13:38:14 +00:00
Badlop
b59ecb83e8 * src/mod_muc/mod_muc.erl: Limit number of characters in Room ID, 
Name and Description (EJAB-899)
* src/mod_muc/mod_muc_room.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 2034
 2009-04-22 12:05:10 +00:00
Badlop
38f5b8f093 * doc/guide.tex: Add section to document how to setup CAPTCHA 
support (EJAB-895)
* doc/guide.html: Likewise

SVN Revision: 2027
 2009-04-22 10:20:13 +00:00
Badlop
621fab55e2 * doc/guide.tex: Document new ejabberdctl option. New section that 
documents AccessCommands. (EJAB-910)
* doc/guide.html: Likewise

SVN Revision: 2025
 2009-04-17 13:53:20 +00:00
Badlop
f954d6829b * doc/guide.tex: Explain that the recommended Erlang/OTP version 
is R12B-5, and R13 is not supported yet.
* doc/guide.html: Likewise
* README: Likewise

SVN Revision: 2021
 2009-04-14 18:31:29 +00:00
Badlop
ad0565cf7c * doc/release_notes_2.0.5.txt: Added file for new release 
SVN Revision: 2002
 2009-04-01 10:37:18 +00:00
Badlop
a72023c03e * doc/release_notes_2.0.4.txt: Added file for new release 
SVN Revision: 1987
 2009-03-10 16:25:20 +00:00
Badlop
d28efabb79 * src/tls/tls_drv.c: Fix to support OpenSSL older than 
0.9.8f (EJAB-877)(thanks to Jonathan Schleifer)
* doc/guide.tex: It is again supported OpenSSL older than 0.9.8f
* doc/guide.html: Likewise

SVN Revision: 1979
 2009-03-09 19:17:53 +00:00
Badlop
5cc3985b73 * doc/guide.tex: Require OpenSSL 0.9.8f or higher (EJAB-877) 
* doc/guide.html: Likewise

SVN Revision: 1967
 2009-03-05 19:48:24 +00:00
Badlop
c5c97a8edf * doc/guide.tex: No mention to the release date in ejabberd Guide 
or release notes. The date of an ejabberd release is determined by
the date of the corresponding release announcement.

SVN Revision: 1922
 2009-02-26 23:10:28 +00:00
Badlop
d0f1300a84 * src/web/ejabberd_http_poll.erl: Allow configuration of session 
timeout, using new global option http_poll_timeout (EJAB-135)
* doc/guide.tex: Document new option
* doc/guide.html: Likewise

SVN Revision: 1876
 2009-02-14 09:03:26 +00:00
Badlop
3524172856 * src/ejabberd_system_monitor.erl: Allow parametrizable watchdog 
threshold: option watchdog_large_heap or chatting with the
watchdog bot (EJAB-545)
* src/ejabberd_config.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1872
 2009-02-13 19:27:56 +00:00
Badlop
96c1307ebf * doc/Makefile: In Clean do not remove html. In new Distclean, remove also html. 
SVN Revision: 1862
 2009-02-03 10:58:16 +00:00
Badlop
2f45d7ecc1 * doc/Makefile: When cleaning, remove contributed_modules.tex 
SVN Revision: 1861
 2009-02-03 10:47:38 +00:00
Badlop
dd49b98580 * doc/guide.tex: Provide only an example of language option 
* doc/guide.html: Likewise

SVN Revision: 1858
 2009-01-31 12:26:27 +00:00
Badlop
8fa76b9015 * doc/guide.tex: mod_muc can run in several nodes of cluster 
* doc/guide.html: Likewise

SVN Revision: 1854
 2009-01-27 11:20:55 +00:00
Badlop
d0273f4630 * doc/api/process-one.css: Add some style to HTML elements 
* src/ejabberd_listener.erl: Fix EDoc errors
* src/web/ejabberd_web_admin.erl: Likewise

SVN Revision: 1843
 2009-01-21 19:49:26 +00:00
Badlop
d6fa5c2903 * doc/guide.tex: Explain that account creation is only supported 
by internal and odbc authentication methods
* doc/guide.html: Likewise

SVN Revision: 1836
 2009-01-20 22:38:29 +00:00
Badlop
3e2048ace9 * src/Makefile.in: The path to the installed copy of ejabberd 
Guide is set in the environment variable
EJABBERD_DOC_PATH (EJAB-837).
* src/web/ejabberd_web_admin.erl: Likewise
* src/ejabberdctl.template: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1835
 2009-01-20 19:42:08 +00:00
Badlop
47ff640292 * doc/release_notes_2.0.3.txt: Minor changes 
SVN Revision: 1818
 2009-01-13 18:05:06 +00:00
Mickaël Rémond
1c7b41f02e * doc/guide.tex: Update Erlang version in Windows compilation documentation. 
SVN Revision: 1815
 2009-01-13 14:50:31 +00:00
Badlop
ba2eb35590 * src/ejabberd_listener.erl: New way to configure IP address and 
IP version of listener. Support for definition of IP address in
string format, and implicit definition of IP
version (EJAB-388). Support for defining several listeners: all
with same port number but different IP addresses (EJAB-389)(thanks
to Fabrice Colliot and Sergei Golovan). Better report in WebAdmin
of problem when starting a listener. The old configuration method
of ip tuple and inet6 is fully supported for backwards
compatibility, but is not documented in the Guide anymore.
* src/ejabberd_config.erl: Likewise
* src/mod_proxy65/mod_proxy65_stream.erl: Likewise
* src/mod_proxy65/mod_proxy65_service.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise
* doc/guide.tex: Document the new way to configure IP address and
IP version of listener, undocument options ip and inet6
* doc/guide.html: Likewise

SVN Revision: 1812
 2009-01-12 20:03:02 +00:00
Badlop
b3328c08a6 * doc/guide.tex: Fix some English strings: JID -> Jabber ID; 
jabberd 1.4 -> jabberd14; commited -> committed
* src/*/*.erl: Likewise
* src/msgs/*.msg: Likewise
* src/msgs/*.po: Likewise

SVN Revision: 1810
 2009-01-12 18:41:46 +00:00
Badlop
f09509502e * doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842) 
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text

SVN Revision: 1804
 2009-01-12 14:44:42 +00:00
Badlop
91897882d2 * doc/guide.tex: Improve explanation of backup commands (EJAB-832) 
* doc/guide.html: Likewise

SVN Revision: 1792
 2009-01-09 22:59:37 +00:00
Badlop
9f80ec4fb6 * src/web/ejabberd_web_admin.erl: WebAdmin serves Guide and links 
to related sections; the path to guide.html can be configured with
option doc_path (EJAB-837)
* src/web/ejabberd_web_admin.hrl: Likewise
* src/mod_shared_roster.erl: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1777
 2009-01-07 00:55:02 +00:00
Badlop
682909e0fc * src/ejabberd_config.erl: Option outgoing_s2s_options to define 
s2s outgoing behaviour: IPv4, IPv6 and timeout (thanks to Stephan
Maka)(EJAB-665)
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_socket.erl: Likewise
* src/ejabberd.cfg.example: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1756
 2008-12-26 11:45:08 +00:00
Badlop
7808dc11af * src/acl.erl: New ACL: shared_group (thanks to Maxim Ryazanov) 
* doc/guide.tex: Likewise

* src/mod_shared_roster.erl: Push new group members when
registered or manually added to group: EJAB-730 EJAB-731 EJAB-732
EJAB-767 EJAB-794. When user is added to group, push it to other
members, and other members to it. When user is removed from group,
push deletion to other members, and other members to it. When user
is registered, push him to members of group @all@. When user is
deleted, push deletion to members of group @all@. Document several
functions in mod_shared_roster.

* src/ejabberd_auth.erl: Rename hook user_registered to
register_user, for name consistency with the widely used hook
remove_user. Run hook register_user in ejabberd_auth, so it's run
when account is created with any method. Run hook remove_user in
ejabberd_auth, so it's run when account is deleted with any
method.
* src/ejabberd_auth_internal.erl: Likewise
* src/ejabberd_auth_ldap.erl: Likewise
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_auth_pam.erl: Likewise
* src/mod_register.erl: Likewise

SVN Revision: 1752
 2008-12-23 19:15:33 +00:00
Badlop
867ce5be32 * doc/guide.tex: Fix capitalization of some section titles 
* doc/guide.tex: Mention as optional Requirements: mysql, pgsql
and pam

* src/ejabberd_admin.erl: Command reopen-log must also rotate
sasl.log (thanks to Alexander Tsvyashchenko)(EJAB-711)
* src/ejabberd_logger_h.erl: Export the function rotate_log/1
* doc/guide.tex: Improve explanation of log files rotation

* doc/guide.tex: Improve explanation of watchdog admins
option: only useful for developers (EJAB-816)
* src/ejabberd.cfg.example: Likewise

* doc/guide.tex: Say 'higher' instead of 'newer' in requirements
* README: Likewise

* doc/guide.tex: Simplify example mod_muc configuration

SVN Revision: 1732
 2008-12-16 17:36:34 +00:00
Badlop
60ae1b47c5 * doc/guide.tex: New subsection Database Connection 
* doc/guide.html: Likewise

SVN Revision: 1697
 2008-12-01 17:45:01 +00:00
Badlop
add568169e * doc/guide.tex: Improve legibility of mod_irc example config 
SVN Revision: 1677
 2008-11-12 00:21:47 +00:00
Badlop
9a66082998 * doc/guide.tex: Explain the new ejabberdctl command 'help' 
* doc/guide.html: Likewise

SVN Revision: 1641
 2008-10-12 13:32:36 +00:00
Badlop
10ab4e6782 * doc/guide.html: Regenerated 
* doc/guide.tex: Fix a problem in SVN merge from trunk

SVN Revision: 1605
 2008-10-06 15:01:06 +00:00
Jérôme Sautret
2f8127d343 * src/ejabberd_rdbms.erl: fix SQL database reconnection 
issues (EJAB-764) and add odbc_start_interval configuration
directive (default to 30 seconds).
* src/odbc/ejabberd_odbc.erl: likewise.
* src/odbc/ejabberd_odbc_sup.erl: likewise.
* doc/guide.tex: likewise.

SVN Revision: 1600
 2008-10-06 14:18:46 +00:00
Badlop
16a508cdb9 * src/*/Makefile.win32: Provide explicit beam filenames because 
nmake does not accept wildcards (thanks to Attila
Vangel)(EJAB-543)

SVN Revision: 1588
 2008-09-30 16:12:05 +00:00
Badlop
7ff346f612 * doc/guide.tex: Fix explanation of mod_muc's anonymous 
option. Make clear that an ejabberd_service can only serve a
single external component. Provide Mnesia directory when setting
clustering (thanks to Matthew Reilly)

SVN Revision: 1563
 2008-09-15 18:38:52 +00:00
Badlop
df39f93b80 * doc/guide.tex: Fix mod_proxy configuration example 
* doc/guide.html: Likewise

SVN Revision: 1560
 2008-09-02 17:31:10 +00:00
Badlop
7ed3ebfaa9 Fix release date of ejabberd 2.0.2 to 28 August 2008 
SVN Revision: 1557
 2008-08-30 11:17:03 +00:00
Badlop
dfc62ca5be * doc/release_notes_2.0.2.txt: Update for final release 
* doc/guide.tex: Windows binary installer requires MSVC++ 5
* doc/guide.html: Likewise

SVN Revision: 1548
 2008-08-26 14:26:56 +00:00
Badlop
38205691f4 * doc/guide.tex: Fix names of chatroom to room, user to occupant 
* doc/guide.html: Likewise

SVN Revision: 1532
 2008-08-21 15:13:25 +00:00
Badlop
e37723f4a2 * src/mod_muc/mod_muc_log.erl: MUC log files options: plaintext 
format; filename with only room name (EJAB-596)
* doc/guide.tex: Document both options
* doc/guide.html: Likewise

SVN Revision: 1531
 2008-08-18 19:08:30 +00:00
Badlop
2be5cb9b50 Minor fixes in text about ejabberd localization 
SVN Revision: 1528
 2008-08-18 09:17:58 +00:00
Badlop
61a639d5d9 * contrib/extract_translations/extract_translations.erl: Use 
Gettext PO for translators, export to ejabberd MSG (EJAB-468)
* contrib/extract_translations/prepare-translation.sh: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
* src/Makefile.in: New option 'make translations'
* src/msgs/ejabberd.pot: Template translation file
* src/msgs/*.po: Generated from old MSG files
* src/msgs/*.msg: Automatic exported from PO files

SVN Revision: 1527
 2008-08-17 16:35:58 +00:00
Badlop
73a8d9e373 * doc/guide.tex: Explain that LDAP is read-only storage (thanks to 
Evgeniy Khramtsov)
* doc/guide.html: Likewise

SVN Revision: 1521
 2008-08-13 11:00:21 +00:00
Badlop
bc8fd0607b * doc/release_notes_2.0.2.txt: Added for ejabberd 2.0.2-beta1 
SVN Revision: 1503
 2008-08-01 10:31:39 +00:00
Badlop
c3bda4aaee * doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708) 
* doc/guide.html: Likewise
* doc/api/overview.edoc: Likewise
* src/*/*.erl: Likewise
* src/*/*.hrl: Likewise
* src/*/*.c: Likewise
* src/odbc/*.sql: Likewise

SVN Revision: 1499
 2008-07-31 11:18:49 +00:00
Badlop
a323504a32 * doc/guide.tex: Document how to get error message when ejabberd 
crash dumps at start (EJAB-660)
* doc/guide.html: Likewise

SVN Revision: 1494
 2008-07-28 16:55:01 +00:00
Badlop
46e83cce55 * doc/guide.tex: Include example PAM configuration file 
ejabberd.pam (thanks to Evgeniy Khramtsov)(EJAB-704)
* doc/guide.html: Likewise

SVN Revision: 1489
 2008-07-24 18:21:40 +00:00
Badlop
211966b42e * doc/guide.tex: Document room options allow_visitor_nickchange 
and allow_visitor_status (EJAB-624)
* doc/guide.html: Likewise

SVN Revision: 1482
 2008-07-24 11:11:19 +00:00
Badlop
6c0f497281 * doc/guide.tex: Improve explanation of option 'hosts' in 
ejabberd_service
* doc/guide.html: Likewise

SVN Revision: 1446
 2008-07-15 21:03:48 +00:00
Badlop
3f87768c8c * doc/guide.tex: Update what permissions does enable-user grant 
* doc/guide.html: Likewise

* src/configure.ac: Don't explicitely put root privileges when a
user is not explicitely enabled
* src/configure: Likewise
* src/Makefile.in: Likewise

SVN Revision: 1443
 2008-07-14 10:06:13 +00:00
Badlop
f25316c1e7 * src/configure.ac: Update installation permissions (EJAB-402) 
* src/configure: Likewise

* src/Makefile.in: The mnesia, ebin and priv dirs are now
installed in different locations. Install header files and
documentation (EJAB-696)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

* include/*.hrl: Place for all ejabberd header files (EJAB-696)
* src/*/*.erl: Update references to header files
* src/*/Makefile.in: Include the include/ dir

SVN Revision: 1441
 2008-07-13 19:10:01 +00:00
Badlop
6134205383 Install ejabberdctl in /sbin as usual because it is a daemon, not a user program. 
SVN Revision: 1440
 2008-07-12 23:08:01 +00:00
Badlop
871d1dfad6 * src/configure.ac: Allow to execute ejabberd with a normal 
system user (thanks to Viq)(EJAB-402)
* src/configure: Likewise
* src/ejabberdctl.template: Likewise
* src/Makefile.in: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1439
 2008-07-12 22:02:16 +00:00
Badlop
983022438e * src/configure.ac: Improve legibility 
* src/aclocal.m4: Likewise
* src/configure: Likewise

* src/ejabberdctl.template: Remove garbage variable. Document node
option

* doc/guide.tex: Add references to sections.
* doc/guide.html: Likewise

SVN Revision: 1438
 2008-07-12 21:32:45 +00:00
Badlop
e7b42f9499 * src/mod_register.erl: Revert support for io_lib newline, since 
there is a standard character that representes newline (EJAB-501)
* doc/guide.tex: Update documentation to explain newline character
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise

SVN Revision: 1436
 2008-07-11 13:35:08 +00:00
Badlop
1f004c56ac * src/mod_register.erl: Support for io_lib newline character in 
the body of welcome_message (EJAB-501)
* doc/guide.tex: Document the newline character
* src/ejabberd.cfg.example: Example usage of newline character

SVN Revision: 1425
 2008-07-09 17:53:56 +00:00
Badlop
70d2682c6a * doc/guide.tex: mod_muc_log XMPP URI supports the updated version 
RFC 5122 (EJAB-631)
* doc/guide.html: Likewise

SVN Revision: 1423
 2008-07-09 14:07:27 +00:00
Badlop
9626c41817 * src/Makefile.in: Spool, config and log dirs: writtable by owner, 
readable by group, nothing by others (EJAB-686)
* doc/guide.tex: New section Securing sensible files
* doc/guide.html: Likewise

SVN Revision: 1413
 2008-07-07 14:52:47 +00:00
Badlop
19a1ddfa44 * doc/guide.tex: Solaris Makefile install: use ginstall (thanks to 
Jonathan Auer)(EJAB-649)
* doc/guide.html: Likewise

SVN Revision: 1412
 2008-07-07 08:47:47 +00:00
Badlop
7a3069b68d * doc/guide.tex: Explain that S2S outgoing first tries IPv4 and if 
that fails then tries IPv6
* doc/guide.html: Likewise

SVN Revision: 1372
 2008-06-21 00:12:06 +00:00
Badlop
5fdcb52306 * src/ejabberd.app: The ejabberd version number is defined in the 
OTP application resource file, in the key 'vsn' (EJAB-657)
* src/ejabberd.hrl: The macro VERSION now consults the ejabberd
application key vsn
* src/configure.erl: Load the ejabberd application description
* doc/Makefile: Read ejabberd version from ejabberd.app vsn
* doc/api/Makefile: Likewise

SVN Revision: 1361
 2008-06-18 21:33:48 +00:00
Badlop
cbf63d06a8 * src/mod_muc/mod_muc_room.erl: Allow admins to send messages to 
rooms even if not joined (EJAB-645)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1356
 2008-06-13 18:55:26 +00:00
Badlop
44e0a17d80 * doc/guide.tex: Title in HTML is shorter. Update several external URIs. 
SVN Revision: 1354
 2008-06-13 15:25:57 +00:00
Badlop
8f7d9de0b6 * doc/guide.tex: Document ldap_local_filter (EJAB-179) 
SVN Revision: 1353
 2008-06-13 10:13:44 +00:00
Badlop
d27f41a9e8 * doc/guide.tex: Table of listener modules converted to 
description. Table of modules overview simplified, and module
names link to their sections.
* doc/guide.html: Regenerated with all the latest changes

SVN Revision: 1352
 2008-06-12 23:52:13 +00:00
Badlop
795263b5d4 * doc/guide.tex: Fix indentation of verbatim text 
SVN Revision: 1351
 2008-06-12 23:01:09 +00:00
Badlop
a8140bca89 * doc/guide.tex: 
Changes in CSS: verbatim text is indented and has grey background;
descriptions are indented; table borders are softer.

SVN Revision: 1350
 2008-06-12 22:00:51 +00:00
Badlop
9507a0001d * doc/guide.tex: Permanent reference URL for sections (EJAB-651) 
SVN Revision: 1349
 2008-06-12 21:54:30 +00:00
Badlop
be8d1902d0 * doc/guide.tex: Small fixes (thanks to Christoph Anton Mitterer) 
* doc/introduction.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1347
 2008-06-08 16:52:25 +00:00
Badlop
95462d3f25 * doc/guide.tex: Document ejabberdctl status code (EJAB-633) 
* doc/guide.html: Likewise

SVN Revision: 1346
 2008-06-05 12:04:43 +00:00
Christophe Romain
3c1efb8c4d add release_notes_2.0.1 
SVN Revision: 1338
 2008-05-19 22:35:01 +00:00
Badlop
9bdaa45981 * doc/guide.html: Update 
SVN Revision: 1335
 2008-05-19 09:45:44 +00:00
Badlop
30f54a6bfc * src/configure.ac: R12 support: remove compilation 
warning (EJAB-630)
* src/configure: Likewise
* doc/guide.tex: Likewise

SVN Revision: 1334
 2008-05-19 09:20:35 +00:00
Badlop
b503e02b09 * doc/guide.tex: Describe how to disable registration 
limitation (EJAB-614)

SVN Revision: 1333
 2008-05-19 09:13:19 +00:00
Badlop
e5879f4349 * src/ejabberd.cfg.example: Small improvements in explanations 
* doc/guide.tex: Document MUC room options (EJAB-619)

SVN Revision: 1310
 2008-04-29 16:44:12 +00:00
Badlop
1cbfc60570 * doc/guide.tex: Document the option max_s2s_connections 
SVN Revision: 1307
 2008-04-28 18:07:23 +00:00
Badlop
0b5720906c * doc/guide.tex: Document option registration_timeout (EJAB-614) 
SVN Revision: 1302
 2008-04-25 22:45:45 +00:00
Badlop
c88a4650ba * src/ejabberd_c2s.erl: Added forbidden_session_hook 
* src/acl.erl: New access types: resource, resource_regexp and
resource_glob
* doc/guide.tex: Likewise

SVN Revision: 1301
 2008-04-25 09:25:31 +00:00
Badlop
ee6aae8211 * src/ejabberd_s2s_out.erl: Fix long timeout when reconnecting s2s 
after a remote server crash (EJAB-540)
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s.erl: Likewise
* doc/guide.tex: Likewise

SVN Revision: 1296
 2008-04-18 12:19:45 +00:00
Badlop
981a4a9cd8 * doc/guide.tex: Clarification: PEP is enabled in default config 
SVN Revision: 1295
 2008-04-16 15:44:58 +00:00
Mickaël Rémond
1b13449194 * doc/guide.tex: Documented the IQ discipline {queue, N}. 
* doc/guide.html: Likewise.

SVN Revision: 1278
 2008-04-07 13:18:42 +00:00
Badlop
2498bdaad9 * doc/guide.tex: Fix default_room_opts with default_room_options 
* doc/guide.html: Likewise

SVN Revision: 1277
 2008-04-05 10:53:32 +00:00
Badlop
1649dec58e * src/ejabberd_config.erl: Add support to include additional 
configuration files. Add support for macro definition and
usage. (EJAB-593)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1273
 2008-04-02 16:31:15 +00:00
Badlop
39b35cf54b * doc/guide.tex: Updated command line parameters, epmd section 
* doc/guide.html: Likewise

SVN Revision: 1267
 2008-04-01 12:00:34 +00:00
Badlop
5fd627b85b * doc/api/Makefile: Report the correct ejabberd version. When 
cleaning, remove also erlang.png

* src/mod_muc/mod_muc_room.erl: Update source code to prevent
warning messages from EDoc
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_pubsub/node_default.erl: Likewise
* src/mod_pubsub/nodetree_default.erl: Likewise
* src/mod_pubsub/nodetree_virtual.erl: Likewise
* src/mod_pubsub/pubsub.hrl: Likewise

SVN Revision: 1265
 2008-04-01 10:11:39 +00:00
Badlop
2510d71ae6 * doc/webadmmain.png: Updated to ejabberd 2.0.0 
* doc/webadmmainru.png: Likewise

* doc/disco.png: Removed because not used

* doc/guide.tex: Fix Latex reference to webadmin section. Update
explanation of screenshots. Update xmpp addresses of Mickael
Remond and Sander Devrieze.
* doc/guide.html: Likewise

* doc/Makefile: Remove the Hevea deprecated option -noiso
* doc/guide.html: Likewise
* doc/dev.html: Likewise
* doc/features.html: Likewise

SVN Revision: 1261
 2008-03-31 10:36:41 +00:00
Badlop
e13908c26c * doc/guide.tex: Fix epam location (thanks to Evgeniy Khramtsov) 
* doc/guide.html: Likewise

SVN Revision: 1259
 2008-03-27 00:28:44 +00:00
Badlop
ea510f9d48 * doc/guide.tex: mod_vcard_ldap replace NICK with NICKNAME (thanks 
to Andreas Ntaflos)
* doc/guide.html: Likewise

SVN Revision: 1254
 2008-03-24 18:57:41 +00:00
Badlop
30739179ee * doc/guide.tex: Document service_check_from (EJAB-576) 
* doc/guide.html: Likewise

SVN Revision: 1248
 2008-03-22 00:33:28 +00:00
Badlop
efec28ada7 * doc/guide.tex: Document s2s_default_policy and 
s2s_host (EJAB-575)
* doc/guide.html: Likewise

SVN Revision: 1246
 2008-03-21 16:17:37 +00:00
Badlop
694baba127 * doc/guide.tex: Improve explanation of how to start ejabberd when 
binary installer. Don't recommend R12 in Windows compilation.
Describe what happens if maxrate shaper is exceeded.
* doc/guide.html: Likewise

SVN Revision: 1238
 2008-03-20 19:24:27 +00:00
Badlop
40442b9c99 * doc/guide.tex: Describe option Matches in mod_vcard_ldap (thanks 
to Evgeniy Khramtsov)(EJAB-530).  Fix typo in the description of
ldap_server option.
* doc/guide.html: Likewise

SVN Revision: 1229
 2008-03-13 10:59:57 +00:00
Badlop
735b34e7b7 * doc/guide.tex: Improve documentation of host_config 
add (EJAB-544)
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise
* src/ejabberd_config.erl: Likewise

SVN Revision: 1219
 2008-03-04 10:36:57 +00:00
Badlop
a65273690d * doc/guide.tex: mod_announce recommends, but doesn't require 
mod_adhoc (thanks to Anastasia Gornostaeva)
* doc/guide.html: Likewise
* src/ejabberd.cfg.example: Likewise

SVN Revision: 1218
 2008-03-04 09:07:43 +00:00
Badlop
2ef35b89ca * doc/release_notes_2.0.0.txt: Small fixes and update date 
SVN Revision: 1207
 2008-02-21 09:54:19 +00:00
Badlop
ac99c7fc7d * doc/release_notes_2.0.0.txt: Updated version number and date 
SVN Revision: 1205
 2008-02-20 16:08:13 +00:00
Badlop
0316caafd3 * doc/guide.tex: Mentioned the problems about Windows service 
* doc/guide.html: Likewise

SVN Revision: 1204
 2008-02-20 16:05:26 +00:00
Badlop
a021731c09 * doc/release_notes_2.0.0.txt: Describe in the Release Notes the 
upgrade instructions (EJAB-522)

SVN Revision: 1195
 2008-02-15 19:18:36 +00:00
Badlop
8ff5599d3a * src/ejabberd.cfg.example: Document options to SQL keep alive 
interval and pool size (EJAB-206)
* doc/guide.tex: Likewise
* doc/guide.html: Likewise

SVN Revision: 1178
 2008-02-08 18:28:36 +00:00
Badlop
ba419eae59 * src/ejabberd.hrl: Updated version to 2.1.0-alpha 
* doc/dev.html: Likewise
* doc/features.html: Likewise
* doc/guide.html: Likewise
* doc/version.tex: Likewise

SVN Revision: 1172
 2008-02-04 16:44:42 +00:00
Badlop
fb6c0d4771 * doc/guide.tex: Removed the option served_hosts in mod_pubsub 
because it does not work correctly yet (EJAB-504)
* doc/guide.html: Likewise

SVN Revision: 1167
 2008-01-30 17:51:09 +00:00
Badlop
a34feb9b1a * doc/introduction.tex: Updated list of languages 
* doc/release_notes_2.0.0.txt: Likewise

SVN Revision: 1162
 2008-01-25 15:28:30 +00:00
Badlop
cca5d7fcbe * src/msgs/eo.msg: New Esperanto translation (thanks to Andreas 
van Cranenburgh)

* src/msgs/no.msg: New Norwegian translation (thanks to Stian
B. Barmen)

* doc/Makefile: Fixed small problem with contributed_modules.tex

SVN Revision: 1160
 2008-01-25 10:23:12 +00:00
Badlop
f361633f36 * doc/guide.tex: Updated the names of log files. 
* doc/guide.html: Likewise

* src/mod_muc/mod_muc_room.erl: Added log messages for room
destroy

* src/mod_caps.erl: Small beautify of log error messages

SVN Revision: 1155
 2008-01-16 10:08:17 +00:00
Badlop
864d2056a7 * doc/guide.tex: Improved the documentation of Binary 
installer. Updated the requirements, specifically: Erlang R10B-9
is required as minimum, and R12 is not yet supported. Added
section Upgrading ejabberd. Improved documentation about Erlang
runtime system environment variables and command-line parameters.
* doc/guide.html: Likewise

* doc/release_notes_2.0.0.txt: Updated to RC1
* doc/version.tex: Likewise
* src/ejabberd.hrl: Likewise

* doc/introduction.tex: Updated to 22 languages

* doc/Makefile: Ensure that Bash is used

SVN Revision: 1154
 2008-01-15 17:53:40 +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
Christophe Romain
74d52708b0 fix version.tex generation bug 
SVN Revision: 1139
 2008-01-08 13:29:50 +00:00
Badlop
1a1f9d1488 * src/web/ejabberd_web_admin.erl: Uniformize the name of 
ejabberd's web admin to: 'Web Admin' (EjAB-472)
* doc/guide.tex: Likewise
* doc/introduction.tex: Likewise

* src/web/ejabberd_web_admin.erl: Uniformize ejabberd name in the
text using the Latex command

SVN Revision: 1137
 2008-01-01 18:20:57 +00:00
Badlop
b23d82bc1e * src/ejabberdctl.template: Create logs_dir if doesn't exist. New 
parameters --config, --ctl-config, --logs, --spool. Crash dump
renamed to erl_crash_DATETIME.dump.

* src/ejabberdctl.template: Backport improvements from binary
installer (EJAB-488): options are simple values; enable Kernel
Poll by default, set SMP to auto, set max ports to 32000, max
processes to 250000.
* src/ejabberdctl.cfg.example: Likewise

* src/ejabberd.inetrc: Renamed ejabberd.inetrc to inetrc
* src/inetrc: Likewise
* src/Makefile.in: Likewise
* doc/guide.tex: Likewise

SVN Revision: 1133
 2008-01-01 10:53:05 +00:00
Mickaël Rémond
24d2fc10f0 * doc/release_notes_2.0.0.txt: minor fix. 
SVN Revision: 1120
 2007-12-24 15:14:37 +00:00
Mickaël Rémond
29095be0d4 * doc/release_notes_2.0.0.txt: Small fix. 
SVN Revision: 1119
 2007-12-24 15:01:00 +00:00
Mickaël Rémond
24f20c0dbb * doc/release_notes_2.0.0.txt: Small fixes. 
SVN Revision: 1115
 2007-12-24 14:09:55 +00:00
Mickaël Rémond
8c4042848e * doc/release_notes_2.0.0.txt: Fix on number of supported languages. 
SVN Revision: 1108
 2007-12-24 10:58:31 +00:00
Mickaël Rémond
24665d630b * doc/release_notes_2.0.0.txt: ejabberd 2.0.0 beta 1 release notes. 
SVN Revision: 1107
 2007-12-24 10:26:55 +00:00
Mickaël Rémond
5afeed7399 * doc/release_notes_2.0.0.txt: Fixes and update. 
SVN Revision: 1106
 2007-12-24 10:26:53 +00:00
Badlop
818091390d * doc/introduction.tex: Small updates 
* doc/guide.tex: Small fixes in Install. Added http_bind to
Listening Ports.

SVN Revision: 1102
 2007-12-22 16:36:48 +00:00
Mickaël Rémond
5ee03c1514 * doc/release_nodes_2.0.0.txt: release notes draft (still a work in progress). 
SVN Revision: 1093
 2007-12-21 18:15:45 +00:00
Christophe Romain
027adc6c38 Explain how to launch installer and improve ejabberdctl usage example (EJAB-420) 
SVN Revision: 1084
 2007-12-20 09:29:30 +00:00
Badlop
073e9979c4 * doc/guide.tex: Document mod_privacy_odbc 
SVN Revision: 1079
 2007-12-18 18:11:10 +00:00
Badlop
2cfa983325 * doc/Makefile: Support for conditional inclusion of documentation 
from contributed modules
* doc/guide.tex: Likewise

SVN Revision: 1078
 2007-12-18 18:04:12 +00:00
Badlop
09a30422f5 * doc/guide.tex: Remove 'ssl' option from documentation and 
configuration load (EJAB-461)
* src/ejabberd_listener.erl: Likewise

* src/msgs/cs.msg: Small typo (thanks to Lukas Polivka alias
Spike411)

* src/ejabberd.cfg.example: Small change in order of options

SVN Revision: 1073
 2007-12-17 11:03:22 +00:00
Badlop
6586293142 * doc/guide.tex: Small improvement in mod_shared_roster 
SVN Revision: 1062
 2007-12-10 16:00:31 +00:00
Badlop
dfa74082f8 * src/configure: Regenerated 
* doc/dev.html: Likewise
* doc/features.html: Likewise
* doc/guide.html: Likewise
* doc/version.tex: Likewise

* doc/introduction.tex: Updated number of translated languages

SVN Revision: 1042
 2007-12-06 19:47:49 +00:00
Badlop
b07f857fdc * doc/Makefile: Remove bashism (now really committed) 
SVN Revision: 1035
 2007-12-06 15:31:17 +00:00
Badlop
386f432977 * doc/Makefile: Remove bashism 
* doc/guide.tex: Document how to change computer
hostname (EJAB-320)

SVN Revision: 1034
 2007-12-06 15:26:53 +00:00
Badlop
6c0e4820d8 * doc/guide.tex: Add mod_caps and improve mod_pubsub documentation 
* src/ejabberd.cfg.example: Added mod_caps enabled by default

SVN Revision: 1032
 2007-12-06 11:13:29 +00:00
Christophe Romain
c90579146c enable pep by default and add pubsub plugin examples 
SVN Revision: 1031
 2007-12-06 09:29:28 +00:00
Badlop
749a4305b4 * doc/guide.tex: Document the Debug Console (EJAB-395) 
SVN Revision: 1030
 2007-12-06 00:31:09 +00:00
Badlop
353a61ce1c * doc/guide.tex: Improvements in sections: Start, Creating Initial 
Account, Module Overview, Managing an ejabberd server, and
Debugging

SVN Revision: 1028
 2007-12-05 23:46:50 +00:00
Badlop
720b57a235 * doc/guide.tex: Added explanations about epmd, cookie and node 
name (EJAB-251)

SVN Revision: 1027
 2007-12-05 18:53:09 +00:00
Mickaël Rémond
384f4c9196 * src/mod_muc.erl: Added option to limit the number of room a user is 
allowed to connect to (EJAB-445).
* src/mod_muc_room.erl: Likewise.
* doc/guide.tex: Likewise.

SVN Revision: 1016
 2007-12-03 10:50:36 +00:00
Mickaël Rémond
796089b8bc * doc/*.html: Rebuild. 
SVN Revision: 1012
 2007-12-01 16:43:10 +00:00
Mickaël Rémond
b84f85ba8a * doc/Makefile: echo seems to interpret \n and \v under MacOSX 
Leopard. I fixed the problem but let me know if it breaks build
chain in other contexts.

SVN Revision: 1011
 2007-12-01 16:43:04 +00:00
Mickaël Rémond
71c7879b48 * doc/guide.tex: Updated Windows compilation instructions. 
* src/configure.erl: Likewise.
* doc/ejabberd.hrl: Preparing ejabberd 2.0.0 beta release.
* doc/version.tex: Likewise.

SVN Revision: 1009
 2007-12-01 16:06:24 +00:00