Commit 88b296c9 authored by sikeda's avatar sikeda
Browse files

[-dev] Degrading by merge.

git-svn-id: https://subversion.renater.fr/sympa/branches/sympa-6.2-branch@10138 05aa8bb8-cd2b-0410-b1d7-8918dfa770ce
parent 26995b06
......@@ -321,6 +321,15 @@ AC_ARG_WITH(
[scriptdir="$withval"]
)
AC_ARG_WITH(
staticdir,
AS_HELP_STRING(
[--with-staticdir=DIR],
[static data @<:@PREFIX/static_content@:>@]
),
[staticdir="$withval"]
)
CONFIG=$confdir/sympa.conf
AC_SUBST(CONFIG)
WWSCONFIG=$confdir/wwsympa.conf
......
......@@ -112,6 +112,7 @@ nobase_default_DATA = list_task_models/expire.yearly.task \
scenari/review.private \
scenari/review.public \
scenari/send.closed \
scenari/send.confidential \
scenari/send.editorkey \
scenari/send.editorkeyonly \
scenari/send.editorkeyonlyauth \
......
......@@ -255,7 +255,6 @@ our %comm = ('home' => 'do_home',
'help' => 'do_help',
'edit_list_request' => 'do_edit_list_request',
'edit_list' => 'do_edit_list',
'edit_list_request' => 'do_edit_list_request',
'create_list_request' => 'do_create_list_request',
'create_list' => 'do_create_list',
'get_pending_lists' => 'do_get_pending_lists',
......@@ -870,8 +869,8 @@ our %in_regexp = (
##Logs
'target_type' => '[\w\-\.\:]*',
'target' => &tools::get_regexp('email'),
'date_from' => '[\d\/]+',
'date_to' => '[\d\/]+',
'date_from' => '[\d\/\-]+',
'date_to' => '[\d\/\-]+',
'ip' => &tools::get_regexp('host'),
## colors
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment