Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-24 22:25:47 +02:00
Code Releases Activity
3,332 Commits 7 Branches 106 Tags 81 MiB
v3.0.0-alpha-4
Commit Graph

317 Commits

Author SHA1 Message Date
Christophe Romain
f8886ee36c fix NodeName issue from r2880 (thanks to Karim Gemayel) 
SVN Revision: 2883
 2010-01-12 13:30:49 +00:00
Christophe Romain
67af2908f9 fix headers (EJAB-1091), (EJAB-1092), (EJAB-1093) (thanks to Karim Gemayel) 
SVN Revision: 2881
 2010-01-12 12:34:02 +00:00
Badlop
a89b400c04 Add +export_all to EFLAGS if: make debug=true (thanks to Marcin Owsiany)(EJAB-1134) 
SVN Revision: 2843
 2009-12-29 19:15:59 +00:00
Badlop
7434234c27 pep_mapping not working due to Node type mismatch (EJAB-1135) 
SVN Revision: 2816
 2009-12-21 15:20:27 +00:00
Pablo Polvorin
573ff2564b Remove usage of #jid record introduced in 2787. 
Replace explicit references to #jid with exmpp_jid API calls.

SVN Revision: 2794
 2009-12-08 18:59:00 +00:00
Christophe Romain
913684e5a5 prevent sending duplicated last items if several resources online (EJAB-1116) 
SVN Revision: 2787
 2009-12-06 23:21:03 +00:00
Badlop
40e06b55c0 Typo in mod_pubsub_odbc breaks Service Discovery and more (EJAB-1115) 
SVN Revision: 2785
 2009-12-04 18:36:07 +00:00
Badlop
182f4b008b Call ejabberd_router:route/3 instead of sending a message (EJAB-1114) 
SVN Revision: 2783
 2009-12-04 16:32:20 +00:00
Badlop
c3df4f3eb0 Small relax the limitation in the mod_pubsub_odbc host option. 
SVN Revision: 2780
 2009-12-04 16:07:43 +00:00
Badlop
bc355eebaa Fix call to get_module_proc with binary. 
SVN Revision: 2765
 2009-11-30 13:08:37 +00:00
Christophe Romain
bde4b7b057 minor bug fixes related to the use/conversion of/to exmpp (thanks to Karim Gemayel) 
SVN Revision: 2733
 2009-11-06 14:36:41 +00:00
Christophe Romain
a1e9b55ead minor bug fixes related to the use/conversion of/to exmpp (thanks to Karim Gemayel) 
SVN Revision: 2732
 2009-11-06 14:34:23 +00:00
Christophe Romain
1c4cc57e3f fix root node deletion match 
SVN Revision: 2730
 2009-11-05 17:36:54 +00:00
Badlop
26cd3a78d2 Fix ProcessOne name in comments. 
SVN Revision: 2728
 2009-11-04 20:19:38 +00:00
Badlop
ff338a0a62 Fix disco on root node, add commands to disco (thanks to Brian Cully)(EJAB-1094) 
SVN Revision: 2726
 2009-11-04 20:17:08 +00:00
Badlop
5138a9709e Send authorization messages outside of get-pending transaction (thanks to Brian Cully)(EJAB-1090) 
SVN Revision: 2725
 2009-11-04 20:16:05 +00:00
Badlop
ae93cf2c28 Send authorization messages outside of get-pending transaction (thanks to Brian Cully)(EJAB-1090) 
SVN Revision: 2720
 2009-11-04 17:40:39 +00:00
Badlop
1c2d639179 Fix small typo (thanks to MiCHi) 
SVN Revision: 2716
 2009-10-29 12:41:51 +00:00
Christophe Romain
2078f9ae95 typo fix on mod_pubsub and improve ejabberd_sm:get_session_pid api 
SVN Revision: 2715
 2009-10-27 14:40:01 +00:00
Christophe Romain
1fea1e3f4e minor bugfix, thanks to brian Cully (EJAB-1089) 
SVN Revision: 2714
 2009-10-27 14:30:00 +00:00
Christophe Romain
b2bd51d3e3 fix disco bugs, thanks to Brian Cully (EJAB-1088) 
SVN Revision: 2712
 2009-10-27 14:24:33 +00:00
Badlop
3872907f38 Fix EDoc errors 
SVN Revision: 2705
 2009-10-23 15:14:25 +00:00
Badlop
98f79f0c47 Add devdoc support to Makefiles 
SVN Revision: 2704
 2009-10-23 15:14:08 +00:00
Christophe Romain
cd09381efd update pubsub patch 
SVN Revision: 2691
 2009-10-21 08:31:51 +00:00
Pablo Polvorin
306cff729c Merge with trunk #2687 (EJAB-667) (untested) 
SVN Revision: 2690
 2009-10-20 22:09:43 +00:00
Badlop
f1b9f1fb63 Fix EDoc compilation errors. 
SVN Revision: 2667
 2009-10-13 21:36:32 +00:00
Christophe Romain
861cc87272 prevent remove_user from blocking gen_server, and allow plugin to change broadcasted payload on publish 
SVN Revision: 2665
 2009-10-13 16:42:13 +00:00
Christophe Romain
2565a670b1 fix get_item issue on authorize access model (thanks to brian cully) (EJAB-1060) 
SVN Revision: 2661
 2009-10-12 15:25:00 +00:00
Christophe Romain
c3303ce364 return invalid-options on badly formed subscription options 
SVN Revision: 2657
 2009-10-12 10:23:51 +00:00
Christophe Romain
2042ab090d Default pubsub messages to headline if nothing is configured (thanks to Brian Cully) (EJAB-1061) 
SVN Revision: 2655
 2009-10-12 09:06:37 +00:00
Badlop
503defac73 Fix regression for authorize node subscription (thanks to Brian Cully)(EJAB-1060) 
SVN Revision: 2652
 2009-10-09 12:01:30 +00:00
Christophe Romain
65926460b2 allow max_items_node use on pep 
SVN Revision: 2643
 2009-10-06 15:22:02 +00:00
Christophe Romain
53edf861e0 do not create hometree base when hometree not configured as plugin 
SVN Revision: 2635
 2009-09-25 13:14:59 +00:00
Christophe Romain
b168cd7cf2 fix EJAB-1044 and EJAB-1055 
SVN Revision: 2628
 2009-09-24 19:47:01 +00:00
Christophe Romain
e5a26b388f rename pep_sendlast_offline option to ignore_pep_from_offline (EJAB-1047) 
SVN Revision: 2623
 2009-09-23 22:00:53 +00:00
Christophe Romain
b3955fca3a fix EJAB-1048 and EJAB-819, thanks to badlop 
SVN Revision: 2616
 2009-09-23 16:32:06 +00:00
Christophe Romain
6bdf4aa960 improve configure parsing in iq_pubsub (sync with ejabberd 2.1.0) 
SVN Revision: 2605
 2009-09-20 08:14:24 +00:00
Christophe Romain
36676f0719 fix missing member affiliation on odbc plugin 
SVN Revision: 2604
 2009-09-18 13:44:12 +00:00
Christophe Romain
376741c9a1 fix delete item to allow owner being able to remove all publisher items, and also fix EJAB-1036 
SVN Revision: 2591
 2009-09-09 21:49:23 +00:00
Christophe Romain
75dbcd5c68 fix minor timestamp shift between item creation and modification 
SVN Revision: 2586
 2009-09-04 23:34:05 +00:00
Christophe Romain
fa23b83dbb improve previous patch 
SVN Revision: 2579
 2009-09-01 13:23:19 +00:00
Badlop
81f4644622 Fix missing tag when configuring subscription option (thanks to Clochix) 
SVN Revision: 2577
 2009-09-01 08:19:14 +00:00
Christophe Romain
3940a6bab3 secure calls to ets:lookup 
SVN Revision: 2564
 2009-08-28 16:28:22 +00:00
Christophe Romain
de78508f45 fix send last item issue 
SVN Revision: 2561
 2009-08-28 00:09:21 +00:00
Christophe Romain
fab29f4cf0 port all recent fixes from trunk related to odbc subscriptions 
SVN Revision: 2559
 2009-08-27 23:09:20 +00:00
Christophe Romain
f5091aa1ae pubsub now is sync with last trunk 
SVN Revision: 2546
 2009-08-27 08:48:21 +00:00
Christophe Romain
bb08207569 fix node_public portage 
SVN Revision: 2545
 2009-08-27 08:34:16 +00:00
Christophe Romain
71e0d7d8e2 port commit from r2527 to odbc plugin 
SVN Revision: 2544
 2009-08-27 08:26:22 +00:00
Christophe Romain
3b27670d4d update win32 makefile 
SVN Revision: 2542
 2009-08-27 07:55:45 +00:00
Pablo Polvorin
944dd1cc7f Port pubsub odbc backend to exmpp. 
Warning: A work in progress, isn't working yet!

SVN Revision: 2541
 2009-08-26 20:27:57 +00:00
Pablo Polvorin
f7c5a4a15b backport trunk commit r2530 
SVN Revision: 2538
 2009-08-25 20:33:01 +00:00
Pablo Polvorin
4d5bfe2ee8 Fix pubsub_publish_item_ hook call parameter and jid conversion on node_hometree. 
published messages are delivered to subscribers (flat nodes).

SVN Revision: 2537
 2009-08-25 20:03:28 +00:00
Pablo Polvorin
a1a6469ed0 Updated to trunk r2532, fix subscription managment (by owner) 
SVN Revision: 2536
 2009-08-25 19:54:44 +00:00
Pablo Polvorin
fcf66c2e75 Fix affiliation managment 
Node owner can add/remove affiliations

SVN Revision: 2535
 2009-08-25 17:42:25 +00:00
Pablo Polvorin
b4f0bb65c6 Fix disco#items on pubsub nodes 
SVN Revision: 2534
 2009-08-25 17:23:43 +00:00
Pablo Polvorin
938a4007b3 Initial port of pubsub changes(up to r2444) to exmpp branch. 
pubsub odbc isn't ported yet.  
Not tested (only basic node creation and configuration), should still have losts of bugs to discover.

SVN Revision: 2533
 2009-08-25 17:14:30 +00:00
Badlop
5e05ad03bb Support XEP-0157: Contact Addresses for XMPP Services (EJAB-235) 
SVN Revision: 2369
 2009-07-17 20:47:40 +00:00
Badlop
332de67fe2 Fix some calls to exmpp 
SVN Revision: 2138
 2009-06-01 21:04:16 +00:00
Karim Gemayel
9abe47f350 API renaming : jid_to_binary -> to_binary 
SVN Revision: 2134
 2009-06-01 16:59:08 +00:00
Karim Gemayel
15bc238297 API renaming : jid_to_list -> to_list 
SVN Revision: 2131
 2009-06-01 16:52:14 +00:00
Karim Gemayel
29c0e17ca2 API renaming : lresource -> prep_resource 
SVN Revision: 2127
 2009-06-01 16:42:07 +00:00
Karim Gemayel
d51d9e9fff API renaming : lnode_as_list -> prep_node_as_list 
SVN Revision: 2126
 2009-06-01 16:40:51 +00:00
Karim Gemayel
d5f2c41f26 API renaming : lnode -> prep_node 
SVN Revision: 2125
 2009-06-01 16:39:36 +00:00
Karim Gemayel
7eb395b87d API renaming : ldomain_as_list -> prep_domain_as_list 
SVN Revision: 2124
 2009-06-01 16:38:28 +00:00
Karim Gemayel
526dc54173 API renaming : parse_jid -> parse 
SVN Revision: 2122
 2009-06-01 16:35:55 +00:00
Karim Gemayel
447d3818f5 API renaming : make_jid -> make 
SVN Revision: 2119
 2009-06-01 16:26:00 +00:00
Christophe Romain
7c45f8f053 fix nodetree virtual to allow node subscription 
SVN Revision: 2117
 2009-05-29 00:44:07 +00:00
Christophe Romain
497d4d26bb make flat the default node plugin 
SVN Revision: 2116
 2009-05-29 00:27:26 +00:00
Christophe Romain
db6a8c2e05 fix ets table name change 
SVN Revision: 2115
 2009-05-29 00:13:21 +00:00
Christophe Romain
a16230c9ca 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: 2114
 2009-05-28 23:21:50 +00:00
Christophe Romain
45a8a0fb53 make get_items able to sort items in publish order (EJAB-824) 
SVN Revision: 2105
 2009-05-26 22:50:11 +00:00
Christophe Romain
aa210166c4 improve get_entity_* to work regardless of nodetree (EJAB-937) 
SVN Revision: 2104
 2009-05-26 21:50:13 +00:00
Christophe Romain
2e26b6bf8b PubSub: improve get_entity_* API 
SVN Revision: 2091
 2009-05-19 22:29:28 +00:00
Christophe Romain
c12b1870b7 Fix bad transaction returncode in unsubscribe presence handler 
SVN Revision: 2074
 2009-05-12 21:00:05 +00:00
Christophe Romain
fd36726357 Prevent race condition when calling get_caps while note_caps has not been handled yet (EJAB-934) 
SVN Revision: 2072
 2009-05-11 17:27:55 +00:00
Christophe Romain
8dc1bb0659 handle Example 90 of XEP-0060 (EJAB-909), and make use of nodeAttr 
SVN Revision: 2069
 2009-05-08 01:28:17 +00:00
Christophe Romain
38413dc236 Allow to get subscriptions on a given node (EJAB-712), and presence based fixes 
SVN Revision: 2067
 2009-05-08 00:02:08 +00:00
Christophe Romain
e40e4298ca several pubsub fixes and improvements. also fixes EJAB-913 and EJAB-871 
SVN Revision: 2061
 2009-05-07 00:54:44 +00:00
Christophe Romain
ced30acb20 backport pubsub/pep/caps optimizations from trunk 
SVN Revision: 2052
 2009-04-30 23:17:38 +00:00
Christophe Romain
fd5e312ed9 minor cosmetic fix 
SVN Revision: 2040
 2009-04-24 21:34:59 +00:00
Christophe Romain
6710d66a58 fix minor pubsub init glitch, and allow ejabberd_odbc to execute bloc of queries without transaction 
SVN Revision: 2039
 2009-04-24 10:32:41 +00:00
Christophe Romain
1d44abfc8a improve send last published items spawning 
SVN Revision: 2037
 2009-04-22 23:01:51 +00:00
Christophe Romain
08cbaf8ccf Better handling of presence hook and caps clean 
SVN Revision: 2015
 2009-04-10 13:21:37 +00:00
Badlop
854b448536 * src/mod_pubsub/mod_pubsub.erl: Announce PubSub features in the 
server JID only if PEP is enabled (EJAB-905)

SVN Revision: 2010
 2009-04-08 19:30:24 +00:00
Badlop
d13be09524 * src/mod_pubsub/mod_pubsub.erl: Quickfix compilation errors. 
SVN Revision: 2008
 2009-04-08 18:58:11 +00:00
Christophe Romain
3e756f5d1c implement roster acces model (EJAB-780) 
SVN Revision: 1997
 2009-03-20 00:08:38 +00:00
Christophe Romain
2c4effe6ce typo fix on roster access_model 
SVN Revision: 1985
 2009-03-10 12:09:31 +00:00
Christophe Romain
5ed381fc58 Fix PEP with other domains and s2s (EJAB-825) 
SVN Revision: 1982
 2009-03-10 11:13:46 +00:00
Christophe Romain
ab2dc5877f Allow node creation without configure item 
SVN Revision: 1964
 2009-03-04 01:14:13 +00:00
Christophe Romain
592c98fd7a update pubsub version 
SVN Revision: 1961
 2009-03-04 01:04:51 +00:00
Christophe Romain
facf17e689 Add roster subscriptions handling and make PEP events sent to all resources 
SVN Revision: 1958
 2009-03-03 23:26:07 +00:00
Badlop
19d27258d9 * src/mod_pubsub/node_default.erl: Fix that non-subscriber could 
fetch items from Authorize node (thanks to Brian Cully)(EJAB-873)

SVN Revision: 1930
 2009-02-27 23:56:46 +00:00
Pablo Polvorin
58e4b98d61 Fix small bug introduced in revision 1924. 
SVN Revision: 1929
 2009-02-27 21:09:44 +00:00
Christophe Romain
f4a952032a cosmetic changes 
SVN Revision: 1924
 2009-02-27 03:19:53 +00:00
Badlop
34f6de0c84 * src/mod_pubsub/mod_pubsub.erl: Fix incorrect implementation of 
Pubsub payload requirements (thanks to Andy Skelton)(EJAB-823)

SVN Revision: 1921
 2009-02-25 21:17:14 +00:00
Christophe Romain
edc0a9ac87 fix nodetree plugin resolver, and backport last changes from trunk 
SVN Revision: 1890
 2009-02-19 11:29:01 +00:00
Jean-Sébastien Pédron
842ebfcca0 A lot of bug fixes regarding attribute values type: 
o  Fix some bugs by getting attributes as list() instead of binary().
o  Instead creating #xmlattr directly, use the new ?XMLATTR macro; it'll
take care of the anything-to-binary() conversion.
o  Fix a bug where recipient and sender were used as binary() instead of
list(), which is required by the rest of the S2S code.
o  Fix a bug where binary_to_list/1 was called on a list().

Now concerning JIDs :
o  Now that #jid{} isn't part of the API of Exmppp anymore, replace
remaining direct usages by calls to exmpp_jid.
o  Replace exmpp_jid:make_bare_jid() by exmpp_jid:make_jid().
o  Replace exmpp_jid:*_to_jid/1 by exmpp_jid:parse_jid/1.

PR:		EJABP-1

SVN Revision: 1841
 2009-01-21 13:34:26 +00:00
Jean-Sébastien Pédron
2f1397c50e Use string() version of UserName and UserHost. 
PR:		EJABP-1

SVN Revision: 1839
 2009-01-21 13:30:18 +00:00
Jean-Sébastien Pédron
fc77b48344 Merge from trunk (r1804 to r1829). 
The merge party is over, you may now double-check that everything is in
place.

PR:		EJABP-1

SVN Revision: 1830
 2009-01-19 15:27:07 +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
Jean-Sébastien Pédron
25009ff9f4 Merge from trunk (r1764 to r1787). 
Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1827
 2009-01-19 11:59:40 +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
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
Pablo Polvorin
96c0ff44f9 Fix typo 
SVN Revision: 1806
 2009-01-12 15:51:22 +00:00
Christophe Romain
56bccce713 fix previous fix misplacing (EJAB-840) 
SVN Revision: 1803
 2009-01-11 06:24:42 +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
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
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
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
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
e032a8c54f PubSub cleanup, EJAB-827 fix, EJAB-701 partial fix 
SVN Revision: 1767
 2009-01-03 00:29:36 +00:00
Christophe Romain
214ef31053 Improve handling of PEP sent to external contacts (EJAB-825) 
SVN Revision: 1751
 2008-12-23 13:58:38 +00:00
Christophe Romain
978adbbd94 Fix send_last_published_item issue when running on clustered table (EJAB-793) 
SVN Revision: 1741
 2008-12-20 00:01:26 +00:00
Christophe Romain
e6535dcc67 Check option of the nodetree instead of checking configuration 
SVN Revision: 1738
 2008-12-18 13:46:30 +00:00
Jean-Sébastien Pédron
69805f36fa Merge from trunk (r1730 to r1734). 
PR:		EJABP-1

SVN Revision: 1735
 2008-12-17 13:52:44 +00:00
Jean-Sébastien Pédron
6a3436b1c4 Merge from trunk (r1709 to r1730). 
Ejabberd should be usable again.

PR:		EJABP-1

SVN Revision: 1731
 2008-12-16 13:16:56 +00:00
Jean-Sébastien Pédron
62f9f6e6c5 Convert to exmpp the parts in mod_pubsub recently merged from trunk. 
Warning: Ejabberd is unusable because the rest of trunk hasn't been
merged yet!

PR:		EJABP-1

SVN Revision: 1730
 2008-12-16 10:31:08 +00:00
Christophe Romain
96aaba738b fix get_item_name deadlock on transaction 
SVN Revision: 1729
 2008-12-15 19:58:53 +00:00
Christophe Romain
e1575e3177 fix typo bug injected in r1712 
SVN Revision: 1725
 2008-12-09 22:42:34 +00:00
Christophe Romain
3d28a7837d minor bugfix 
SVN Revision: 1723
 2008-12-09 22:09:30 +00:00
Christophe Romain
9f2fda6060 merge to lattest trunk r1716 
SVN Revision: 1720
 2008-12-09 00:32:36 +00:00
Jean-Sébastien Pédron
82b97b9639 Finish the conversion of mod_pubsub to Exmpp. 
PR:		EJABP-1

SVN Revision: 1709
 2008-12-08 11:21:32 +00:00
Jean-Sébastien Pédron
d01c24bd23 Fix acl:match_rule/3 call. It takes a #jid record, not a short JID. 
PR:		EJABP-1

SVN Revision: 1708
 2008-12-08 11:20:21 +00:00
Jean-Sébastien Pédron
163d185776 First pass of Exmpp conversion for mod_pubsub. 
CAUTION:
o  Several modules aren't converted yet.
o  Existent Mnesia tables written to disc are not updated.
o  There must be bugs, mostly because of the mix between #jid record
and short JIDs.
PR:		EJABP-1

SVN Revision: 1705
 2008-12-05 15:13:09 +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
ab2b70f189 Merge from trunk (r1613 to 1649). 
PR:		EJABP-1

SVN Revision: 1650
 2008-10-13 10:11:19 +00:00
Jean-Sébastien Pédron
67a87af459 Merge from trunk (r1563 to r1613). 
PR:		EJABP-1

SVN Revision: 1614
 2008-10-08 12:02: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
07b1210b50 Merge revisions from 1444 to revision 1457 from trunk. 
SVN Revision: 1458
 2008-07-17 15:33:50 +00:00
Jean-Sébastien Pédron
574dbbfd08 Merge revisions from 1434 to revision 1444 from trunk. 
SVN Revision: 1445
 2008-07-15 08:45:05 +00:00
Jean-Sébastien Pédron
332fb55e3a MFC: 
Merge revisions from 1362 to revision 1434 from trunk.

SVN Revision: 1435
 2008-07-11 12:48:27 +00:00
Christophe Romain
fe82bf3e81 temporary roster_groups_allowed (EJAB-655) 
SVN Revision: 1359
 2008-06-18 16:35:03 +00:00
Christophe Romain
638d789ae6 pubsub get_default bugfix (EJAB-656) 
SVN Revision: 1358
 2008-06-18 16:19:18 +00:00
Christophe Romain
edf1ed5c87 remove unused served_hosts option 
SVN Revision: 1306
 2008-04-28 13:02:07 +00:00
Christophe Romain
367610dd38 pubsub identity and database update bugfix 
SVN Revision: 1285
 2008-04-10 14:11:06 +00:00
Christophe Romain
37fc28ef49 add condition inclusion of pep in disco identity (EJAB-564) 
SVN Revision: 1268
 2008-04-02 09:06:28 +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
ab1610021d * src/Makefile.in: Support for parallel compilation with 'make -j' 
in multi core CPUs: fix compilation dependencies; compile
behaviors before other source code. (thanks to Jonathan Schleifer)
* src/mod_pubsub/Makefile.in: Likewise
* src/eldap/Makefile.in: Likewise

SVN Revision: 1258
 2008-03-26 09:27:46 +00:00
Christophe Romain
1247a98cf2 Pubsub subscription is now wrapped in pubsub tags (EJAB-580) 
SVN Revision: 1244
 2008-03-21 16:05:32 +00:00
Christophe Romain
7f6cdc6cfe use if event instead of x when xmlns is pubsub#event (EJAB-518) 
SVN Revision: 1181
 2008-02-11 15:21:24 +00:00
Mickaël Rémond
2fa599c40f * src/mod_pubsub/node.template: Fixed typo 
SVN Revision: 1177
 2008-02-07 08:07:20 +00:00
Mickaël Rémond
ac204f0849 * src/mod_pubsub/node_buddy.erl: Fixed typo 
* src/mod_pubsub/node_club.erl: Likewise
* src/mod_pubsub/node_dispatch.erl: Likewise
* src/mod_pubsub/node_pep.erl: Likewise
* src/mod_pubsub/node_private.erl: Likewise

SVN Revision: 1174
 2008-02-06 18:19:25 +00:00
Mickaël Rémond
4e096f1590 * src/mod_pubsub/gen_pubsub_node.erl: API improvement: Added a way to generate custom item name 
* src/mod_pubsub/node_dispatch.erl: Likewise
* src/mod_pubsub/node_buddy.erl: Likewise
* src/mod_pubsub/node_private.erl: Likewise
* src/mod_pubsub/node_club.erl: Likewise
* src/mod_pubsub/node_public.erl: Likewise
* src/mod_pubsub/node_default.erl: Likewise
* src/mod_pubsub/node_pep.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Small API improvements and refactoring

SVN Revision: 1173
 2008-02-06 18:04:23 +00:00
Mickaël Rémond
65981598ed * src/mod_pubsub/nodetree_virtual.erl: Fixed error report at startup. 
SVN Revision: 1169
 2008-02-02 14:24:01 +00:00
Mickaël Rémond
fff45aca21 * src/mod_pubsub/mod_pubsub.erl: Added the from field in the 
get_subnodes pubsub plugin API function. This is usefull to write
plugins to generate the pubsub hierarchy dynamically, based on who
is doing the browsing request.
* src/mod_pubsub/gen_pubsub_nodetree.erl: Likewise
* src/mod_pubsub/nodetree_default.erl: Likewise
* src/mod_pubsub/nodetree_virtual.erl: Likewise

SVN Revision: 1168
 2008-02-02 14:15:37 +00:00
Christophe Romain
c8e580987d pubsub dirty_sync typo fix on node configuration transaction 
SVN Revision: 1159
 2008-01-25 10:17:59 +00:00