Merge remote-tracking branch 'origin/master'
This commit is contained in:
Robert
commit
a9fc02b009
@ -183,9 +183,9 @@ class GC{
|
|||||||
'4_1' => 'predmeti'
|
'4_1' => 'predmeti'
|
||||||
);
|
);
|
||||||
|
|
||||||
$reports_id = '08122020';
|
$reports_id = '11012021';
|
||||||
$report_type = '2_2';
|
$report_type = '1_1';
|
||||||
$fak_id = '3000018';
|
$fak_id = '3000043';
|
||||||
$zip_name = '';
|
$zip_name = '';
|
||||||
|
|
||||||
// Nastavimo pot do pdf-jev
|
// Nastavimo pot do pdf-jev
|
||||||
@ -206,7 +206,7 @@ class GC{
|
|||||||
//$this->executeManualUpload($zip_name, $fak_id, $report_type, $reports_id, $unzip=false);
|
//$this->executeManualUpload($zip_name, $fak_id, $report_type, $reports_id, $unzip=false);
|
||||||
|
|
||||||
// BRANJE POROCIL - IZVAJALEC
|
// BRANJE POROCIL - IZVAJALEC
|
||||||
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_190', $fakultete[$fak_id]['kratica']);
|
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_11', $fakultete[$fak_id]['kratica']);
|
||||||
|
|
||||||
// BRANJE POROCIL - FAKULTETA
|
// BRANJE POROCIL - FAKULTETA
|
||||||
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2019_2020', $fakultete[$fak_id]['kratica']);
|
//$response = $this->readFolder($zadeva_id='RezultatiAnket_'.$fak_id.'_2019_2020', $fakultete[$fak_id]['kratica']);
|
||||||
|
|||||||
@ -1530,11 +1530,19 @@ function create_inv_editor (id, focus) {
|
|||||||
id='inv_message_body';
|
id='inv_message_body';
|
||||||
|
|
||||||
if (!editor_init) {
|
if (!editor_init) {
|
||||||
CKEDITOR.replace( id );
|
CKEDITOR.replace(id, {
|
||||||
|
fullPage: true,
|
||||||
|
allowedContent: true
|
||||||
|
});
|
||||||
|
|
||||||
editor_init = true;
|
editor_init = true;
|
||||||
}else{
|
}
|
||||||
CKEDITOR.replace(id);
|
else{
|
||||||
}
|
CKEDITOR.replace(id, {
|
||||||
|
fullPage: true,
|
||||||
|
allowedContent: true
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function mailSourceMesageChange(what) {
|
function mailSourceMesageChange(what) {
|
||||||
|
|||||||
111
composer.lock
generated
111
composer.lock
generated
@ -378,26 +378,26 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "maxmind-db/reader",
|
"name": "maxmind-db/reader",
|
||||||
"version": "v1.8.0",
|
"version": "v1.9.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git",
|
"url": "https://github.com/maxmind/MaxMind-DB-Reader-php.git",
|
||||||
"reference": "b566d429ac9aec10594b0935be8ff38302f8d5c8"
|
"reference": "9ee9ba9ee287b119e9f5a8e8dbfea0b49647cec4"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/b566d429ac9aec10594b0935be8ff38302f8d5c8",
|
"url": "https://api.github.com/repos/maxmind/MaxMind-DB-Reader-php/zipball/9ee9ba9ee287b119e9f5a8e8dbfea0b49647cec4",
|
||||||
"reference": "b566d429ac9aec10594b0935be8ff38302f8d5c8",
|
"reference": "9ee9ba9ee287b119e9f5a8e8dbfea0b49647cec4",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": ">=7.2"
|
"php": ">=7.2"
|
||||||
},
|
},
|
||||||
"conflict": {
|
"conflict": {
|
||||||
"ext-maxminddb": "<1.8.0,>=2.0.0"
|
"ext-maxminddb": "<1.9.0,>=2.0.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"friendsofphp/php-cs-fixer": "2.*",
|
"friendsofphp/php-cs-fixer": "*",
|
||||||
"php-coveralls/php-coveralls": "^2.1",
|
"php-coveralls/php-coveralls": "^2.1",
|
||||||
"phpunit/phpcov": ">=6.0.0",
|
"phpunit/phpcov": ">=6.0.0",
|
||||||
"phpunit/phpunit": ">=8.0.0,<10.0.0",
|
"phpunit/phpunit": ">=8.0.0,<10.0.0",
|
||||||
@ -434,7 +434,7 @@
|
|||||||
"geolocation",
|
"geolocation",
|
||||||
"maxmind"
|
"maxmind"
|
||||||
],
|
],
|
||||||
"time": "2020-10-01 17:30:21"
|
"time": "2021-01-07 21:15:29"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "maxmind/web-service-common",
|
"name": "maxmind/web-service-common",
|
||||||
@ -751,6 +751,7 @@
|
|||||||
"homepage": "https://github.com/paypal/paypalhttp_php/contributors"
|
"homepage": "https://github.com/paypal/paypalhttp_php/contributors"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
"abandoned": true,
|
||||||
"time": "2019-11-06 21:27:12"
|
"time": "2019-11-06 21:27:12"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -1019,16 +1020,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "stripe/stripe-php",
|
"name": "stripe/stripe-php",
|
||||||
"version": "v7.66.1",
|
"version": "v7.67.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/stripe/stripe-php.git",
|
"url": "https://github.com/stripe/stripe-php.git",
|
||||||
"reference": "a2ebaa272a8797b21e81afaf8d5ba0953ff15e13"
|
"reference": "935d2c67912007f6d17b6c08a62050252c509129"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/a2ebaa272a8797b21e81afaf8d5ba0953ff15e13",
|
"url": "https://api.github.com/repos/stripe/stripe-php/zipball/935d2c67912007f6d17b6c08a62050252c509129",
|
||||||
"reference": "a2ebaa272a8797b21e81afaf8d5ba0953ff15e13",
|
"reference": "935d2c67912007f6d17b6c08a62050252c509129",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1038,7 +1039,7 @@
|
|||||||
"php": ">=5.6.0"
|
"php": ">=5.6.0"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"friendsofphp/php-cs-fixer": "2.16.5",
|
"friendsofphp/php-cs-fixer": "2.17.1",
|
||||||
"php-coveralls/php-coveralls": "^2.1",
|
"php-coveralls/php-coveralls": "^2.1",
|
||||||
"phpunit/phpunit": "^5.7",
|
"phpunit/phpunit": "^5.7",
|
||||||
"squizlabs/php_codesniffer": "^3.3",
|
"squizlabs/php_codesniffer": "^3.3",
|
||||||
@ -1072,20 +1073,20 @@
|
|||||||
"payment processing",
|
"payment processing",
|
||||||
"stripe"
|
"stripe"
|
||||||
],
|
],
|
||||||
"time": "2020-12-01 18:44:12"
|
"time": "2020-12-09 19:00:34"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-intl-idn",
|
"name": "symfony/polyfill-intl-idn",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-intl-idn.git",
|
"url": "https://github.com/symfony/polyfill-intl-idn.git",
|
||||||
"reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117"
|
"reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117",
|
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44",
|
||||||
"reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117",
|
"reference": "0eb8293dbbcd6ef6bf81404c9ce7d95bcdf34f44",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1099,7 +1100,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
@ -1142,20 +1143,20 @@
|
|||||||
"portable",
|
"portable",
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"time": "2020-10-23 14:02:19"
|
"time": "2021-01-07 16:49:33"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-intl-normalizer",
|
"name": "symfony/polyfill-intl-normalizer",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
|
"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
|
||||||
"reference": "727d1096295d807c309fb01a851577302394c897"
|
"reference": "6e971c891537eb617a00bb07a43d182a6915faba"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897",
|
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/6e971c891537eb617a00bb07a43d182a6915faba",
|
||||||
"reference": "727d1096295d807c309fb01a851577302394c897",
|
"reference": "6e971c891537eb617a00bb07a43d182a6915faba",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1167,7 +1168,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
@ -1209,20 +1210,20 @@
|
|||||||
"portable",
|
"portable",
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"time": "2020-10-23 14:02:19"
|
"time": "2021-01-07 17:09:11"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php72",
|
"name": "symfony/polyfill-php72",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php72.git",
|
"url": "https://github.com/symfony/polyfill-php72.git",
|
||||||
"reference": "cede45fcdfabdd6043b3592e83678e42ec69e930"
|
"reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930",
|
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
|
||||||
"reference": "cede45fcdfabdd6043b3592e83678e42ec69e930",
|
"reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -1231,7 +1232,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
@ -1268,7 +1269,7 @@
|
|||||||
"portable",
|
"portable",
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"time": "2020-10-23 14:02:19"
|
"time": "2021-01-07 16:49:33"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "web-token/jwt-core",
|
"name": "web-token/jwt-core",
|
||||||
@ -2022,25 +2023,25 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "maximebf/debugbar",
|
"name": "maximebf/debugbar",
|
||||||
"version": "v1.16.3",
|
"version": "v1.16.4",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/maximebf/php-debugbar.git",
|
"url": "https://github.com/maximebf/php-debugbar.git",
|
||||||
"reference": "1a1605b8e9bacb34cc0c6278206d699772e1d372"
|
"reference": "c86c717e4bf3c6d98422da5c38bfa7b0f494b04c"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/1a1605b8e9bacb34cc0c6278206d699772e1d372",
|
"url": "https://api.github.com/repos/maximebf/php-debugbar/zipball/c86c717e4bf3c6d98422da5c38bfa7b0f494b04c",
|
||||||
"reference": "1a1605b8e9bacb34cc0c6278206d699772e1d372",
|
"reference": "c86c717e4bf3c6d98422da5c38bfa7b0f494b04c",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
"php": "^7.1",
|
"php": "^7.1|^8",
|
||||||
"psr/log": "^1.0",
|
"psr/log": "^1.0",
|
||||||
"symfony/var-dumper": "^2.6|^3|^4|^5"
|
"symfony/var-dumper": "^2.6|^3|^4|^5"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/phpunit": "^5"
|
"phpunit/phpunit": "^7.5.20 || ^9.4.2"
|
||||||
},
|
},
|
||||||
"suggest": {
|
"suggest": {
|
||||||
"kriswallsmith/assetic": "The best way to manage assets",
|
"kriswallsmith/assetic": "The best way to manage assets",
|
||||||
@ -2079,7 +2080,7 @@
|
|||||||
"debug",
|
"debug",
|
||||||
"debugbar"
|
"debugbar"
|
||||||
],
|
],
|
||||||
"time": "2020-05-06 07:06:27"
|
"time": "2020-12-07 10:48:48"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "psr/log",
|
"name": "psr/log",
|
||||||
@ -2130,16 +2131,16 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-mbstring",
|
"name": "symfony/polyfill-mbstring",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||||
"reference": "39d483bdf39be819deabf04ec872eb0b2410b531"
|
"reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/39d483bdf39be819deabf04ec872eb0b2410b531",
|
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",
|
||||||
"reference": "39d483bdf39be819deabf04ec872eb0b2410b531",
|
"reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -2151,7 +2152,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
@ -2189,20 +2190,20 @@
|
|||||||
"portable",
|
"portable",
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"time": "2020-10-23 14:02:19"
|
"time": "2021-01-07 16:49:33"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php80",
|
"name": "symfony/polyfill-php80",
|
||||||
"version": "v1.20.0",
|
"version": "v1.22.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php80.git",
|
"url": "https://github.com/symfony/polyfill-php80.git",
|
||||||
"reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de"
|
"reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/e70aa8b064c5b72d3df2abd5ab1e90464ad009de",
|
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
|
||||||
"reference": "e70aa8b064c5b72d3df2abd5ab1e90464ad009de",
|
"reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -2211,7 +2212,7 @@
|
|||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.20-dev"
|
"dev-main": "1.22-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
@ -2255,20 +2256,20 @@
|
|||||||
"portable",
|
"portable",
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"time": "2020-10-23 14:02:19"
|
"time": "2021-01-07 16:49:33"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/var-dumper",
|
"name": "symfony/var-dumper",
|
||||||
"version": "v4.4.17",
|
"version": "v4.4.18",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/var-dumper.git",
|
"url": "https://github.com/symfony/var-dumper.git",
|
||||||
"reference": "65c6f1e848cda840ef7278686c8e30a7cc353c93"
|
"reference": "4f31364bbc8177f2a6dbc125ac3851634ebe2a03"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/65c6f1e848cda840ef7278686c8e30a7cc353c93",
|
"url": "https://api.github.com/repos/symfony/var-dumper/zipball/4f31364bbc8177f2a6dbc125ac3851634ebe2a03",
|
||||||
"reference": "65c6f1e848cda840ef7278686c8e30a7cc353c93",
|
"reference": "4f31364bbc8177f2a6dbc125ac3851634ebe2a03",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
@ -2327,7 +2328,7 @@
|
|||||||
"debug",
|
"debug",
|
||||||
"dump"
|
"dump"
|
||||||
],
|
],
|
||||||
"time": "2020-11-24 09:55:37"
|
"time": "2020-12-08 16:59:59"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"aliases": [],
|
"aliases": [],
|
||||||
|
|||||||
@ -93,6 +93,9 @@ CKEDITOR.editorConfig = function (config) {
|
|||||||
};
|
};
|
||||||
config.disallowedContent = 'h1, h2, h3, h4, h5, h6';
|
config.disallowedContent = 'h1, h2, h3, h4, h5, h6';
|
||||||
|
|
||||||
|
// Full page mode (allow html, body...)
|
||||||
|
//config.fullPage = true;
|
||||||
|
|
||||||
//DEV TOOLS
|
//DEV TOOLS
|
||||||
//config.extraPlugins = 'devtools';
|
//config.extraPlugins = 'devtools';
|
||||||
|
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
FROM php:7.2-apache-buster
|
FROM php:7.4-apache-buster
|
||||||
|
|
||||||
# Apache packages
|
# Apache packages
|
||||||
RUN apt-get update -y \
|
RUN apt-get update -y \
|
||||||
@ -12,11 +12,13 @@ RUN apt-get update -y \
|
|||||||
zlib1g-dev \
|
zlib1g-dev \
|
||||||
texlive-full \
|
texlive-full \
|
||||||
latex2rtf \
|
latex2rtf \
|
||||||
|
libzip-dev \
|
||||||
|
zip \
|
||||||
&& apt-get clean \
|
&& apt-get clean \
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
# PHP configure freetype
|
# PHP configure freetype
|
||||||
RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
|
RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/
|
||||||
|
|
||||||
# PHP modules
|
# PHP modules
|
||||||
RUN /usr/local/bin/docker-php-ext-install \
|
RUN /usr/local/bin/docker-php-ext-install \
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user