Merge branch '1.1.4-bugfix' into 'master'

1.1.4 bugfix

See merge request framasoft/framadate!301
This commit is contained in:
Thomas Citharel 2018-04-15 12:23:57 +02:00
commit 59569071e8
13 changed files with 5138 additions and 4 deletions

View File

@ -107,4 +107,5 @@ $config = [
/* 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
'provide_fork_awesome' => true, // Whether the build-in fork-awesome should be provided
];

View File

@ -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';

View File

@ -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);

2431
css/fork-awesome.css Normal file

File diff suppressed because it is too large Load Diff

4
css/fork-awesome.min.css vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

File diff suppressed because it is too large Load Diff

After

Width:  |  Height:  |  Size: 443 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -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');

View 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>