Commit 59569071 by Thomas Citharel

Merge branch '1.1.4-bugfix' into 'master'

1.1.4 bugfix

See merge request !301
parents 8ce671e4 30e77a77
Pipeline #47689 passed with stages
in 1 minute 26 seconds
......@@ -106,5 +106,6 @@ $config = [
'default_poll_duration' => 180, // default values for the new poll duration (number of days).
/* create_classic_poll.php */
'user_can_add_img_or_link' => true, // user can add link or URL when creating his poll.
'markdown_editor_by_default' => true, // The markdown editor for the description is enabled by default
'markdown_editor_by_default' => true, // The markdown editor for the description is enabled by default
'provide_fork_awesome' => true, // Whether the build-in fork-awesome should be provided
];
......@@ -18,7 +18,7 @@
*/
// FRAMADATE version
const VERSION = '1.1.3';
const VERSION = '1.1.4';
// PHP Needed version
const PHP_NEEDED_VERSION = '5.6';
......
......@@ -30,6 +30,7 @@ $smarty->assign('SERVER_URL', Utils::get_server_name());
$smarty->assign('SCRIPT_NAME', $_SERVER['SCRIPT_NAME']);
$smarty->assign('TITLE_IMAGE', IMAGE_TITRE);
$smarty->assign('use_nav_js', strstr($_SERVER['SERVER_NAME'], 'framadate.org'));
$smarty->assign('provide_fork_awesome', $config['provide_fork_awesome']);
$smarty->assign('locale', $locale);
$smarty->assign('langs', $ALLOWED_LANGUAGES);
$smarty->assign('date_format', $date_format);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -33,7 +33,8 @@ MDEWrapper.prototype.enable = function() {
status: true,
previewRender: myPreviewRender,
spellChecker: false,
promptURLs: true
promptURLs: true,
autoDownloadFontAwesome: false
});
if (this.enableButton) {
this.enableButton.addClass('active');
......@@ -59,4 +60,4 @@ MDEWrapper.prototype.disable = function() {
MDEWrapper.prototype.isEnabled = function() {
return this.simplemde != null;
}
\ No newline at end of file
}
......@@ -20,6 +20,9 @@
<link rel="stylesheet" href="{'css/style.css'|resource}">
<link rel="stylesheet" href="{'css/frama.css'|resource}">
<link rel="stylesheet" href="{'css/print.css'|resource}" media="print">
{if $provide_fork_awesome}
<link rel="stylesheet" href="{'css/fork-awesome.min.css'|resource}">
{/if}
<script type="text/javascript" src="{'js/jquery-1.12.4.min.js'|resource}"></script>
<script type="text/javascript" src="{'js/bootstrap.min.js'|resource}"></script>
<script type="text/javascript" src="{'js/bootstrap-datepicker.js'|resource}"></script>
......
Markdown is supported
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