25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-12-24 17:29:28 +01:00
xmpp.chapril.org-ejabberd/src
Eric Cestari 2ab31cb613 Merge branch '2.2.x-applepush' into 2.2.x
Without applepush
Conflicts:
	src/ejabberd_c2s.erl
	src/ejabberd_c2s.hrl
2010-12-23 15:30:14 +01:00
..
ejabberd_zlib Use driver allocators in ejabberd_zlib_drv.c for reflecting memory in erlang:memory(system) 2010-07-20 14:57:23 +10:00
eldap Use pg2 from R14B in systems with older versions (EJAB-1349) 2010-11-22 16:04:07 +01:00
mod_irc Implement the mod_irc option default_encoding, it was already documented 2010-11-02 22:40:08 +01:00
mod_muc Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
mod_proxy65 Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
mod_pubsub Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
msgs Recompile translations 2010-12-13 11:15:16 +01:00
odbc Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
pam Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
stringprep Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
stun Replace concat_binary supported until R14 with list_to_binary supported since R9 2010-03-08 12:41:11 +01:00
tls Option to reject S2S connection if untrusted certificate (EJAB-464) 2010-12-11 02:29:53 +01:00
web Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
win32 Rename erlang log file sasl.log to erlang.log (EJAB-783) 2009-08-31 08:41:56 +00:00
acinclude.m4 Rename aclocal.m4 to acinclude.m4 (thanks to Andreas Köhler) 2010-10-15 16:29:47 +02:00
acl.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
adhoc.erl Rename some JEP references to XEP 2010-04-28 20:06:27 +02:00
adhoc.hrl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
cache_tab_sup.erl Implemented dirty (non-atomic) functions; added copyright notice 2010-08-31 18:06:02 +10:00
cache_tab.erl Disable LRU caching algorithm for LDAP shared rosters 2010-11-05 17:01:18 +09:00
config.guess autodetect compilation parameters for Mac OS X Snow Leopard (EJAB-1056) 2009-10-12 12:01:54 +00:00
config.sub autodetect compilation parameters for Mac OS X Snow Leopard (EJAB-1056) 2009-10-12 12:01:54 +00:00
configure Revert "Remove some compiled files" 2010-10-18 23:17:12 +02:00
configure.ac apply flash hack patch 2010-09-08 16:51:06 +02:00
configure.bat * src/translate.erl: Search translations directory in priv_dir 2004-04-27 20:28:23 +00:00
configure.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
cyrsasl_anonymous.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
cyrsasl_digest.erl Revert "Fix cyrsasl_digest RFC-2831 2.1.2.1 (EJAB-476)" 2010-12-03 11:12:43 -03:00
cyrsasl_plain.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
cyrsasl.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
dynamic_compile.erl * src/ejabberd_loglevel.erl: Use dynamic_compile instead of 2009-05-06 14:51:51 +00:00
ejabberd_admin.erl The command Update now returns meaningful message and exit-status (EJAB-1237) 2010-07-22 16:32:55 +02:00
ejabberd_app.erl - get rid of rpc:call to avoid group leader inheritance 2010-10-20 17:26:01 +10:00
ejabberd_auth_anonymous.erl fixes anonymous sessions lookup 2010-10-09 00:44:23 +10:00
ejabberd_auth_external.erl Fix detection of mod_last at server start (EJAB-641) 2010-12-03 17:26:12 +01:00
ejabberd_auth_internal.erl [TECH-1511] debug traces reorganized 2010-09-16 15:08:53 +02:00
ejabberd_auth_ldap.erl new option ldap_tls_verify is added (EJAB-1229) 2010-05-10 19:37:37 +10:00
ejabberd_auth_odbc.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_auth_pam.erl New option pam_userinfotype to provide username or JID (EJAB-652) 2010-05-10 15:14:49 +02:00
ejabberd_auth.erl Add password entropy check (EJAB-1326) 2010-10-24 17:17:30 +10:00
ejabberd_c2s_config.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_c2s.erl Merge branch '2.2.x-applepush' into 2.2.x 2010-12-23 15:30:14 +01:00
ejabberd_c2s.hrl Merge branch '2.2.x-applepush' into 2.2.x 2010-12-23 15:30:14 +01:00
ejabberd_captcha.erl Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
ejabberd_check.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_cluster.erl - get rid of rpc:call to avoid group leader inheritance 2010-10-20 17:26:01 +10:00
ejabberd_commands.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_commands.hrl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_config.erl Use alternative of file:read_line/1 to not require R13B02 2010-02-20 19:31:36 +01:00
ejabberd_config.hrl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_ctl.erl Add support to ejabberd_ctl to handle anonymous command arguments 2010-10-15 21:53:03 +02:00
ejabberd_ctl.hrl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_frontend_socket.erl merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash 2010-07-13 12:04:30 +02:00
ejabberd_hooks.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_listener.erl Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
ejabberd_local.erl merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash 2010-07-13 12:04:30 +02:00
ejabberd_logger_h.erl Fix errors detected by Dialyzer 2010-10-15 13:17:32 +02:00
ejabberd_loglevel.erl Fix errors in EDoc comments 2010-10-28 18:48:27 +02:00
ejabberd_node_groups.erl Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
ejabberd_piefxis.erl When the Password attribute is missing in PIEFXIS file, don't check account auth. 2010-12-01 00:55:09 +01:00
ejabberd_rdbms.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_receiver.erl fixes annoying crash with controller change 2010-10-08 19:26:49 +10:00
ejabberd_router.erl merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash 2010-07-13 12:04:30 +02:00
ejabberd_s2s_in.erl Option to reject S2S connection if untrusted certificate (EJAB-464) 2010-12-11 02:29:53 +01:00
ejabberd_s2s_out.erl Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
ejabberd_s2s.erl Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
ejabberd_service.erl Discard unmatched INFO messages in ejabberd services. 2010-09-17 18:48:43 +02:00
ejabberd_sm.erl different hooks should be called for session migration and session close 2010-09-21 03:17:52 +10:00
ejabberd_socket.erl Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
ejabberd_sup.erl [TECH-1511] preliminary XMPP support via websockets 2010-09-15 17:20:54 +02:00
ejabberd_system_monitor.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_tmp_sup.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd_update.erl Only log when script errors are found 2010-05-24 13:58:10 +02:00
ejabberd_xmlrpc.erl Copy ejabberd_xmlrpc from ejabberd-modules SVN 2010-10-19 16:51:28 +02:00
ejabberd.app Update ejabberd version number to 2.1.6 2010-12-13 11:15:18 +01:00
ejabberd.cfg.example Option to reject S2S connection if untrusted certificate (EJAB-464) 2010-12-11 02:29:53 +01:00
ejabberd.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
ejabberd.hrl apply flash hack patch 2010-09-08 16:51:06 +02:00
ejabberd.init.template Prepare ejabberd.init when installing ejabberd. 2009-08-24 19:44:07 +00:00
ejabberdctl.cfg.example Bug Fix: The value of max # of erlang process specified in ejabberdctl.cfg was not used. 2010-02-05 13:30:26 +01:00
ejabberdctl.template Merge branch '2.1.x' into mergefix 2010-12-14 23:10:08 +09:00
ejd2odbc.erl fixes wrong SQL escaping when --enable-full-xml is set 2010-06-04 13:31:34 +10:00
etop_defs.hrl add missing hrl 2010-07-16 18:57:00 +02:00
etop_tr.erl Add etop command to ejabberdctl (TECH-1109) 2010-07-16 16:52:27 +02:00
expat_erl.c apply flash hack patch 2010-09-08 16:51:06 +02:00
extauth.erl Support parallel extauth script (thanks to Jesse Thompson)(EJAB-1280) 2010-07-30 20:33:03 +02:00
floodcheck.erl added antiflood and filter modules from TeamLeader 2010-09-24 16:11:59 +02:00
gen_iq_handler.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
gen_mod.erl Re-raise exceptions caught in gen_mod:start_module/3 (EJAB-1335) 2010-11-07 00:49:52 +01:00
http_p1.erl added p1 modules 2010-08-05 14:23:26 +02:00
idna.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
inetrc * src/ejabberdctl.template: Create logs_dir if doesn't exist. New 2008-01-01 10:53:05 +00:00
install-sh autodetect compilation parameters for Mac OS X Snow Leopard (EJAB-1056) 2009-10-12 12:01:54 +00:00
jd2ejd.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
jlib.erl Support negative part-hour TZ values (thanks to Alexander Zhukov)(EJAB-1301) 2010-11-29 14:36:09 +01:00
jlib.hrl apply flash hack patch 2010-09-08 16:51:06 +02:00
licence.hrl fix licence issue and (c) to 2010 2010-09-28 13:36:16 +02:00
log.hrl Copy xmlrpc-1.13 source code 2010-10-19 16:51:24 +02:00
Makefile.in apply flash hack patch 2010-09-08 16:51:06 +02:00
Makefile.win32 fix Makefile.win32 for including stun (thanks to neustradamus) 2009-09-23 21:11:21 +00:00
mod_adhoc.erl Rename some JEP references to XEP 2010-04-28 20:06:27 +02:00
mod_admin_p1.erl Fix get_sessions/2 function 2010-12-16 23:47:53 +09:00
mod_announce.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
mod_antiflood.erl fix licence issue and (c) to 2010 2010-09-28 13:36:16 +02:00
mod_autofilter.erl fix licence issue and (c) to 2010 2010-09-28 13:36:16 +02:00
mod_c2s_debug.erl Add module to dump c2s connection 2010-07-13 18:45:49 +02:00
mod_caps.erl Fix user_receive_packet hook 2010-12-16 23:54:02 +09:00
mod_configure2.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
mod_configure.erl Indicate explicitly what nodes are handled by mod_configure 2010-05-04 11:37:44 +02:00
mod_disco.erl full support for XEP-0115 v1.5 (EJAB-1223) (EJAB-1189) 2010-05-08 02:32:57 +10:00
mod_echo.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
mod_filter.erl merge from Team Leader 2.2 (r973) 2010-10-14 19:00:19 -03:00
mod_ip_blacklist.erl added p1 modules 2010-08-05 14:23:26 +02:00
mod_last_odbc.erl In mod_last*:get_last_iq/4, check for user resources first to return 0 seconds if there is one 2010-11-10 15:40:04 +01:00
mod_last.erl In mod_last*:get_last_iq/4, check for user resources first to return 0 seconds if there is one 2010-11-10 15:40:04 +01:00
mod_mnesia_mngt.erl Add module to log informations when Mnesia is overloaded, and also supports rate limitation 2010-07-13 18:46:04 +02:00
mod_offline_odbc.erl Revert "Merge ApplePush to 2.2.x" 2010-10-19 13:53:10 +03:00
mod_offline.erl Revert "Merge ApplePush to 2.2.x" 2010-10-19 13:53:10 +03:00
mod_ping.erl different hooks should be called for session migration and session close 2010-09-21 03:17:52 +10:00
mod_privacy_odbc.erl Add missing needdb check in mod_privacy, to enable blocking by group and subscription again. 2010-09-17 18:48:45 +02:00
mod_privacy.erl Add missing needdb check in mod_privacy, to enable blocking by group and subscription again. 2010-09-17 18:48:45 +02:00
mod_privacy.hrl Add module to dump c2s connection 2010-07-13 18:45:49 +02:00
mod_private_odbc.erl fixes wrong SQL escaping when --enable-full-xml is set 2010-06-04 13:31:34 +10:00
mod_private.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
mod_register.erl Fix some English strings 2010-11-19 13:44:30 +01:00
mod_roster_odbc.erl Remove print debug (thanks evgeniy) 2010-03-02 12:45:59 -03:00
mod_roster.erl Fix resending authorization problem 2010-02-24 13:14:45 +01:00
mod_roster.hrl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
mod_service_log.erl Add module to dump c2s connection 2010-07-13 18:45:49 +02:00
mod_shared_roster_ldap.erl Disable LRU caching algorithm for LDAP shared rosters 2010-11-05 17:01:18 +09:00
mod_shared_roster.erl When account is deleted, delete also member of stored shared rosters. 2010-06-24 00:02:16 +02:00
mod_sic.erl No need to handle IQ requests other than Get and Set 2010-04-22 20:19:42 +02:00
mod_stats.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
mod_support.erl fix licence issue and (c) to 2010 2010-09-28 13:36:16 +02:00
mod_time.erl Support negative part-hour TZ values (thanks to Alexander Zhukov)(EJAB-1301) 2010-11-29 14:36:09 +01:00
mod_vcard_ldap.erl use one_queue IQ discipline by default 2010-10-05 21:28:45 +10:00
mod_vcard_odbc.erl fixes wrong SQL escaping when --enable-full-xml is set 2010-06-04 13:31:34 +10:00
mod_vcard_xupdate.erl Automatic vcard avatar addition in presence (thanks to Igor Goryachev)(EJAB-208) 2010-04-27 12:33:56 +02:00
mod_vcard.erl Automatic vcard avatar addition in presence (thanks to Igor Goryachev)(EJAB-208) 2010-04-27 12:33:56 +02:00
mod_version.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
mod_xmlrpc.erl Fix get_sessions/2 function 2010-12-16 23:47:53 +09:00
p1_fsm.erl - get rid of rpc:call to avoid group leader inheritance 2010-10-20 17:26:01 +10:00
p1_mnesia.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
p1_prof.erl merge from ekhramtsov-ejabberd, which is latest 2.1.x with consistent hash 2010-07-13 12:04:30 +02:00
pg2_backport.erl Use pg2 from R14B in systems with older versions (EJAB-1349) 2010-11-22 16:04:07 +01:00
randoms.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
sha.erl Make MD2 autodetected (EJAB-1285) 2010-08-07 22:04:57 +10:00
shaper.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
tcp_serv.erl Copy xmlrpc-1.13 source code 2010-10-19 16:51:24 +02:00
translate.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
treap.erl - pass jid into feature_check_packet hook; 2010-03-17 23:40:48 +09:00
win32_dns.erl Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 2010-01-12 16:11:32 +00:00
xml_stream.erl Revert "Merge ApplePush to 2.2.x" 2010-10-19 13:53:10 +03:00
xml.c Make xml.c correctly compiles on R14A (EJAB-1288) 2010-08-07 21:06:50 +10:00
xml.erl Revert "Merge ApplePush to 2.2.x" 2010-10-19 13:53:10 +03:00
xmlrpc_decode.erl Copy xmlrpc-1.13 source code 2010-10-19 16:51:24 +02:00
xmlrpc_encode.erl Copy xmlrpc-1.13 source code 2010-10-19 16:51:24 +02:00
xmlrpc_http.erl Copy xmlrpc-1.13 source code 2010-10-19 16:51:24 +02:00
xmlrpc_util.erl Copy xmlrpc-1.13 source code 2010-10-19 16:51:24 +02:00
xmlrpc.erl Copy xmlrpc-1.13 source code 2010-10-19 16:51:24 +02:00
XmppAddr.asn1 * src/ejabberd_s2s_in.erl: Support for dNSName certificate field 2005-11-17 05:29:33 +00:00