From: Sem Date: Fri, 20 Jul 2012 05:09:38 +0000 (+0200) Subject: Merge branch 'lorea-preprod' X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=07b599a683760d2542014bb04a681463420a3565;p=lorea%2Felgg.git Merge branch 'lorea-preprod' Conflicts: .gitmodules --- 07b599a683760d2542014bb04a681463420a3565 diff --cc .gitmodules index 31347f96a,1741dec91..da687ced6 --- a/.gitmodules +++ b/.gitmodules @@@ -76,9 -76,6 +76,9 @@@ [submodule "mod/simple_faq"] path = mod/simple_faq url = git://gitorious.org/lorea/simple_faq.git + [submodule "mod/river_privacy"] + path = mod/river_privacy + url = git://gitorious.org/lorea/river_privacy.git +[submodule "mod/habitorio_theme"] + path = mod/habitorio_theme + url = git://gitorious.org/lorea/habitorio_theme.git - [submodule "mod/purity_theme"] - path = mod/purity_theme - url = git://gitorious.org/lorea/purity_theme.git diff --cc mod/infinite_scroll index 96bdef76f,0b5e83735..d02673c94 --- a/mod/infinite_scroll +++ b/mod/infinite_scroll @@@ -1,1 -1,1 +1,1 @@@ - Subproject commit 96bdef76f1e3c27e392373b8152d471c88f46b8f -Subproject commit 0b5e837358e3bc0e23261b414509383a0eb617f8 ++Subproject commit d02673c94cace52bea4d1debd6a2c594a6ccfbaf diff --cc mod/videolist index d2b3600e4,d2b3600e4..b214b13fd --- a/mod/videolist +++ b/mod/videolist @@@ -1,1 -1,1 +1,1 @@@ --Subproject commit d2b3600e49bfac698042e39e6b6ac79124b1080e ++Subproject commit b214b13fd4ef49ec2d8c6db486f30d6d9d8841ec diff --cc views/default/forms/register.php index 75ecd3450,75ecd3450..c0ee66f76 --- a/views/default/forms/register.php +++ b/views/default/forms/register.php @@@ -6,6 -6,6 +6,8 @@@ * @subpackage Core */ ++elgg_load_js('elgg.register'); ++ $password = $password2 = ''; $username = get_input('u'); $email = get_input('e');