Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
latoilescoute-dev
scoodle
Commits
9829c826
Commit
9829c826
authored
Apr 11, 2018
by
Thomas Citharel
Browse files
Merge branch 'develop' into 'master'
Version 1.1.1 See merge request framasoft/framadate!292
parents
f931516f
32492cf1
Changes
2
Hide whitespace changes
Inline
Side-by-side
app/inc/constants.php
View file @
9829c826
...
...
@@ -18,7 +18,7 @@
*/
// FRAMADATE version
const
VERSION
=
'1.1.
0
'
;
const
VERSION
=
'1.1.
1
'
;
// PHP Needed version
const
PHP_NEEDED_VERSION
=
'5.6'
;
...
...
tpl/mail/remember_edit_link.tpl
View file @
9829c826
<h1>
{
$poll
->
title
|
html
|
string_format
:
__
(
'EditLink'
,
'Edit link for poll "%s"'
)
}
</h1>
<p>
{__('EditLink', 'Here is the link for editing your vote:')}
<a
href=
"
{
poll_url
id
=
$poll
->
admin_id
vote_id
=
$editedVoteUniqueId
}
"
>
{
$poll
->
title
|
html
}
</a>
</p>
\ No newline at end of file
<a
href=
"
{
poll_url
id
=
$poll_id
vote_id
=
$editedVoteUniqueId
}
"
>
{
$poll
->
title
|
html
}
</a>
</p>
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment