8 Commits

Author	SHA1	Message	Date
Badlop	890b1c4f60	Merge 1834 from trunk. ... * src/mod_privacy.erl: Only run roster_get_jid_info if privacy list has subscription or group (thanks to George Hazan)(EJAB-851). Sort items in privacy list by order before storing (EJAB-848) * src/mod_privacy.hrl: Likewise * src/mod_privacy_odbc.erl: Likewise SVN Revision: 1947	2009-03-03 19:26:24 +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	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
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	22f928122f	* Applied copyright patch 3. ... SVN Revision: 1113	2007-12-24 13:57:53 +00:00
Mickaël Rémond	ad16c0f4a4	* src/mod_last.erl: Adapted to mod_privacy changes. ... * src/mod_privacy.erl: Refactoring to extract records in include file. * src/mod_privacy.hrl: Likewise. SVN Revision: 825	2007-07-26 09:13:31 +00:00