Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-28 16:34:13 +01:00
Code Releases Activity
2,526 Commits 7 Branches 109 Tags 66 MiB
1c2d639179
Commit Graph

2526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Sébastien Pédron
bc51bd0dbd Merge from trunk (r1752 to r1764). 
Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1826
 2009-01-19 11:16:44 +00:00
Jean-Sébastien Pédron
8a27b5446d Fix accesses to the new #jid opaque type. 
PR:		EJABP-1

SVN Revision: 1825
 2009-01-19 10:14:55 +00:00
Jean-Sébastien Pédron
2cc2039ad8 Merge from trunk (r1734 to r1752). 
Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1737, r1740, r1745, r1747, r1748.

Additionnaly, any deprecated content was removed from jlib.hrl. This
leaves only the new RSM records.

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

PR:		EJABP-1

SVN Revision: 1824
 2009-01-19 10:14:04 +00:00
Mickaël Rémond
579e1972d5 * src/ejabberd_c2s.erl: Added comments. 
SVN Revision: 1823
 2009-01-17 16:33:35 +00:00
Badlop
43e12a3702 * src/mod_privacy.erl: Privacy list items must be processed in the 
specified order (EJAB-848)
* src/mod_privacy_odbc.erl: Likewise

SVN Revision: 1822
 2009-01-16 16:06:21 +00:00
Pablo Polvorin
04f6a2be37 Store host and room name as binary(). Use jid_to_binary() instead of jid_to_list(). 
SVN Revision: 1821
 2009-01-15 19:41:06 +00:00
Pablo Polvorin
2538001b08 Store registered nicknames, rooms and domains as binary(). 
Use document_to_iolist/1 and iolist_size/1 instead of document_to_list/1.

SVN Revision: 1820
 2009-01-15 15:21:54 +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
d041c1127d * src/tls/Makefile.win32: Windows compilation support. 
* src/tls/tls_drv.c: Likewise.
* src/tls/stdint.h: Likewise.

SVN Revision: 1816
 2009-01-13 16:33:17 +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
52930b77d8 * src/msgs/pl.po: Fix typo (thanks to Apag0r)(EJAB-844) 
SVN Revision: 1814
 2009-01-12 23:47:07 +00:00
Badlop
43a98ab69b * src/web/ejabberd_web_admin.erl: Use textareas for large input 
like ejabberd module options and listening port options. Show
result of POST more clearly. Ensure access rules are shown with
some minimum separation. Improve menu headers. (EJAB-562)
* src/web/ejabberd_web_admin.hrl: Likewise
* src/mod_offline.erl: Likewise
* src/mod_offline_odbc.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_roster_odbc.erl: Likewise
* src/mod_shared_roster.erl: Likewise

SVN Revision: 1813
 2009-01-12 21:48:34 +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
55db20d4b7 * src/web/ejabberd_web_admin.erl: New appearance of WebAdmin logo, 
fixed logo-fill.

SVN Revision: 1811
 2009-01-12 19:24:25 +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
Pablo Polvorin
e8f630b93a mod_pubsub: initial update to new hooks API (using binaries). mod_pubsub is still unusable with exmpp. 
SVN Revision: 1809
 2009-01-12 18:17:05 +00:00
Alexey Shchepin
562e6c8d39 * src/odbc/ejabberd_odbc.erl: Fixed processing of UPDATE results 
with pgsql

SVN Revision: 1808
 2009-01-12 18:15:49 +00:00
Pablo Polvorin
49210e3099 Apply commit 1212 (caps handling fix), was incorrectly overwritten on 1770. 
SVN Revision: 1807
 2009-01-12 18:15:44 +00:00
Pablo Polvorin
96c0ff44f9 Fix typo 
SVN Revision: 1806
 2009-01-12 15:51:22 +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
Christophe Romain
56bccce713 fix previous fix misplacing (EJAB-840) 
SVN Revision: 1803
 2009-01-11 06:24:42 +00:00
Christophe Romain
1ac9246a49 prevent unauthorized entity to gain none-affiliation for given entity 
SVN Revision: 1802
 2009-01-11 04:08:10 +00:00
Christophe Romain
89be1c2ede fix owners cache and fix unsubscribe permissions (EJAB-840) 
SVN Revision: 1800
 2009-01-11 02:05:41 +00:00
Christophe Romain
8090011126 fix previous partial patch (EJAB-840) 
SVN Revision: 1799
 2009-01-11 01:45:24 +00:00
Christophe Romain
c170783a49 fix owners cache and fix unsubscribe permissions (EJAB-840) 
SVN Revision: 1797
 2009-01-11 01:41:06 +00:00
Pablo Polvorin
c77f7e727b Update gen_iq_handler API, require the 'Host' argument to be in binary() format. 
Fix bug in vcard user search, odbc backend.

SVN Revision: 1796
 2009-01-10 16:10:12 +00:00
Christophe Romain
36080fb682 fix unsubscription of full jid subscribed node (EJAB-839) 
SVN Revision: 1795
 2009-01-10 13:40:38 +00:00
Christophe Romain
38dcae1fc8 fix unsubscription of full jid subscribed node (EJAB-839) 
SVN Revision: 1794
 2009-01-10 13:38:10 +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
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
Badlop
eaa1644ebd * src/mod_configure.erl: Fix access check for vhost configuration 
SVN Revision: 1787
 2009-01-09 00:39:57 +00:00
Mickaël Rémond
f0af10e600 * src/ejabberd_listener.erl: Define send timeout option to avoid blocking on socket send (EJAB-746). 
* src/ejabberd_s2s_out.erl: Likewise.

SVN Revision: 1784
 2009-01-08 20:49:16 +00:00
Christophe Romain
a1f0ad3300 apply delete-any feature 
SVN Revision: 1783
 2009-01-08 18:45:59 +00:00
Christophe Romain
d2524b20d5 minor pubsub fixes 
SVN Revision: 1782
 2009-01-08 18:44:11 +00:00
Christophe Romain
068c93e562 fix EJAB-701 and EJAB-836 
SVN Revision: 1781
 2009-01-08 17:27:47 +00:00
Pablo Polvorin
e0e58711bb XML attributes as binary(). Change Node argument to binary in the following hooks: 
disco_local_items, disco_local_features, disco_local_identity, disco_sm_items and 
disco_sm_identity.

SVN Revision: 1780
 2009-01-08 14:54:00 +00:00
Christophe Romain
967bbe7f03 fix EJAB-701 and EJAB-836 
SVN Revision: 1779
 2009-01-08 14:06:35 +00:00
Badlop
14bc7cf77f * src/mod_roster.erl: Show hyperlinks to local contacts when 
browsing roster of account in Web Admin (EJAB-480)
* src/mod_roster_odbc.erl: Likewise

SVN Revision: 1778
 2009-01-07 01:38:45 +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
a0d48c63a3 * src/msgs/ru.po: Fix typo (thanks to Dominges) 
* src/msgs/ru.msg: Likewise

SVN Revision: 1776
 2009-01-06 15:09:53 +00:00
Alexey Shchepin
b1252f837f * src/tls/tls_drv.c: Added a flag to avoid certificate validation 
* src/tls/tls.erl: Likewise
* src/ejabberd_c2s.erl: Likewise

SVN Revision: 1774
 2009-01-05 17:21:10 +00:00
Pablo Polvorin
2cbd61f268 Fix typo in mod_roster 
SVN Revision: 1773
 2009-01-05 15:41:53 +00:00
Badlop
91a7110941 * src/*.erl: Fix EDoc comments 
SVN Revision: 1771
 2009-01-03 21:29:54 +00:00
Pablo Polvorin
4827db4f56 Big #jid to binary() conversion. 
Internal tables (ejabberd_router, ejabberd_sm, ejabberd_hooks, mod_last, mod_roster) use binary() as storage.
Basic test using the ODBC backend.

SVN Revision: 1770
 2009-01-03 15:15:38 +00:00
Christophe Romain
1a44fe29b4 PubSub: Added access-whitelist and member-affiliation features (EJAB-780) 
SVN Revision: 1769
 2009-01-03 00:58:18 +00:00
Christophe Romain
01d761a901 PubSub: Added access-whitelist and member-affiliation features (EJAB-780) 
SVN Revision: 1768
 2009-01-03 00:55:05 +00:00
Christophe Romain
e032a8c54f PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix 
SVN Revision: 1767
 2009-01-03 00:29:36 +00:00
Christophe Romain
e710a24860 PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix 
SVN Revision: 1766
 2009-01-03 00:25:40 +00:00
Mickaël Rémond
1f57a380c8 * src/ejabberd_c2s.erl: Remove useless comment and port Alexey fix to 2.0.x branch. 
SVN Revision: 1764
 2008-12-29 12:06:34 +00:00
Alexey Shchepin
df478a8e90 * src/ejabberd_c2s.erl: Bugfix in "from" attribute checking 
SVN Revision: 1763
 2008-12-29 11:11:37 +00:00