- change 'server_date_modified' if licence was modified in Web-Backend (Licence.php touches property)
- oai_datacite.xslt and doi_datacite.xslt: descriptionType of abstract mus be camel case - npm updates - composer updates
This commit is contained in:
parent
9601389d83
commit
5585b9d04a
|
|
@ -10,7 +10,8 @@ class DatasetIdentifier extends Model
|
||||||
protected $guarded = array();
|
protected $guarded = array();
|
||||||
public $timestamps = true;
|
public $timestamps = true;
|
||||||
|
|
||||||
//See the array called $touches? This is where you put all the relationships you want to get updated_at as soon as this Model is updated
|
// See the array called $touches? This is where you put all the relationships you want to get
|
||||||
|
// updated_at as soon as this Model is updated
|
||||||
protected $touches = ['dataset'];
|
protected $touches = ['dataset'];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,10 @@ class License extends Model
|
||||||
'pod_allowed'
|
'pod_allowed'
|
||||||
];
|
];
|
||||||
|
|
||||||
|
// See the array called $touches? This is where you put all the relationships you want to get
|
||||||
|
// updated_at as soon as this Model is updated
|
||||||
|
protected $touches = ['datasets'];
|
||||||
|
|
||||||
public function datasets()
|
public function datasets()
|
||||||
{
|
{
|
||||||
return $this->belongsToMany(Dataset::class, 'link_documents_licences', 'licence_id', 'document_id');
|
return $this->belongsToMany(Dataset::class, 'link_documents_licences', 'licence_id', 'document_id');
|
||||||
|
|
|
||||||
126
composer.lock
generated
126
composer.lock
generated
|
|
@ -4137,16 +4137,16 @@
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-ctype",
|
"name": "symfony/polyfill-ctype",
|
||||||
"version": "v1.22.1",
|
"version": "v1.23.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-ctype.git",
|
"url": "https://github.com/symfony/polyfill-ctype.git",
|
||||||
"reference": "c6c942b1ac76c82448322025e084cadc56048b4e"
|
"reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e",
|
"url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
|
||||||
"reference": "c6c942b1ac76c82448322025e084cadc56048b4e",
|
"reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4158,7 +4158,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.22-dev"
|
"dev-main": "1.23-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
|
@ -4196,7 +4196,7 @@
|
||||||
"portable"
|
"portable"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1"
|
"source": "https://github.com/symfony/polyfill-ctype/tree/v1.23.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4212,20 +4212,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-01-07T16:49:33+00:00"
|
"time": "2021-02-19T12:13:01+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-iconv",
|
"name": "symfony/polyfill-iconv",
|
||||||
"version": "v1.22.1",
|
"version": "v1.23.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-iconv.git",
|
"url": "https://github.com/symfony/polyfill-iconv.git",
|
||||||
"reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342"
|
"reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342",
|
"url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/63b5bb7db83e5673936d6e3b8b3e022ff6474933",
|
||||||
"reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342",
|
"reference": "63b5bb7db83e5673936d6e3b8b3e022ff6474933",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4237,7 +4237,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.22-dev"
|
"dev-main": "1.23-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
|
@ -4276,7 +4276,7 @@
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1"
|
"source": "https://github.com/symfony/polyfill-iconv/tree/v1.23.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4292,20 +4292,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-01-22T09:19:47+00:00"
|
"time": "2021-05-27T09:27:20+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-intl-grapheme",
|
"name": "symfony/polyfill-intl-grapheme",
|
||||||
"version": "v1.22.1",
|
"version": "v1.23.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
|
"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
|
||||||
"reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170"
|
"reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/5601e09b69f26c1828b13b6bb87cb07cddba3170",
|
"url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/24b72c6baa32c746a4d0840147c9715e42bb68ab",
|
||||||
"reference": "5601e09b69f26c1828b13b6bb87cb07cddba3170",
|
"reference": "24b72c6baa32c746a4d0840147c9715e42bb68ab",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4317,7 +4317,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.22-dev"
|
"dev-main": "1.23-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
|
@ -4357,7 +4357,7 @@
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.22.1"
|
"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.23.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4373,20 +4373,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-01-22T09:19:47+00:00"
|
"time": "2021-05-27T09:17:38+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-intl-idn",
|
"name": "symfony/polyfill-intl-idn",
|
||||||
"version": "v1.22.1",
|
"version": "v1.23.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": "2d63434d922daf7da8dd863e7907e67ee3031483"
|
"reference": "65bd267525e82759e7d8c4e8ceea44f398838e65"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/2d63434d922daf7da8dd863e7907e67ee3031483",
|
"url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/65bd267525e82759e7d8c4e8ceea44f398838e65",
|
||||||
"reference": "2d63434d922daf7da8dd863e7907e67ee3031483",
|
"reference": "65bd267525e82759e7d8c4e8ceea44f398838e65",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4400,7 +4400,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.22-dev"
|
"dev-main": "1.23-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
|
@ -4444,7 +4444,7 @@
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.22.1"
|
"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.23.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4460,20 +4460,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-01-22T09:19:47+00:00"
|
"time": "2021-05-27T09:27:20+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-intl-normalizer",
|
"name": "symfony/polyfill-intl-normalizer",
|
||||||
"version": "v1.22.1",
|
"version": "v1.23.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": "43a0283138253ed1d48d352ab6d0bdb3f809f248"
|
"reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/43a0283138253ed1d48d352ab6d0bdb3f809f248",
|
"url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8590a5f561694770bdcd3f9b5c69dde6945028e8",
|
||||||
"reference": "43a0283138253ed1d48d352ab6d0bdb3f809f248",
|
"reference": "8590a5f561694770bdcd3f9b5c69dde6945028e8",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4485,7 +4485,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.22-dev"
|
"dev-main": "1.23-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
|
@ -4528,7 +4528,7 @@
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.22.1"
|
"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.23.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4544,20 +4544,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-01-22T09:19:47+00:00"
|
"time": "2021-02-19T12:13:01+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-mbstring",
|
"name": "symfony/polyfill-mbstring",
|
||||||
"version": "v1.22.1",
|
"version": "v1.23.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
"url": "https://github.com/symfony/polyfill-mbstring.git",
|
||||||
"reference": "5232de97ee3b75b0360528dae24e73db49566ab1"
|
"reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1",
|
"url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
|
||||||
"reference": "5232de97ee3b75b0360528dae24e73db49566ab1",
|
"reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4569,7 +4569,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.22-dev"
|
"dev-main": "1.23-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
|
@ -4608,7 +4608,7 @@
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1"
|
"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4624,20 +4624,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-01-22T09:19:47+00:00"
|
"time": "2021-05-27T09:27:20+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php72",
|
"name": "symfony/polyfill-php72",
|
||||||
"version": "v1.22.1",
|
"version": "v1.23.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php72.git",
|
"url": "https://github.com/symfony/polyfill-php72.git",
|
||||||
"reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9"
|
"reference": "9a142215a36a3888e30d0a9eeea9766764e96976"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
|
"url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976",
|
||||||
"reference": "cc6e6f9b39fe8075b3dabfbaf5b5f645ae1340c9",
|
"reference": "9a142215a36a3888e30d0a9eeea9766764e96976",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4646,7 +4646,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.22-dev"
|
"dev-main": "1.23-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
|
@ -4684,7 +4684,7 @@
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-php72/tree/v1.22.1"
|
"source": "https://github.com/symfony/polyfill-php72/tree/v1.23.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4700,20 +4700,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-01-07T16:49:33+00:00"
|
"time": "2021-05-27T09:17:38+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php73",
|
"name": "symfony/polyfill-php73",
|
||||||
"version": "v1.22.1",
|
"version": "v1.23.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php73.git",
|
"url": "https://github.com/symfony/polyfill-php73.git",
|
||||||
"reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2"
|
"reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
|
"url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
|
||||||
"reference": "a678b42e92f86eca04b7fa4c0f6f19d097fb69e2",
|
"reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4722,7 +4722,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.22-dev"
|
"dev-main": "1.23-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
|
@ -4763,7 +4763,7 @@
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-php73/tree/v1.22.1"
|
"source": "https://github.com/symfony/polyfill-php73/tree/v1.23.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4779,20 +4779,20 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-01-07T16:49:33+00:00"
|
"time": "2021-02-19T12:13:01+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/polyfill-php80",
|
"name": "symfony/polyfill-php80",
|
||||||
"version": "v1.22.1",
|
"version": "v1.23.0",
|
||||||
"source": {
|
"source": {
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "https://github.com/symfony/polyfill-php80.git",
|
"url": "https://github.com/symfony/polyfill-php80.git",
|
||||||
"reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91"
|
"reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0"
|
||||||
},
|
},
|
||||||
"dist": {
|
"dist": {
|
||||||
"type": "zip",
|
"type": "zip",
|
||||||
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/dc3063ba22c2a1fd2f45ed856374d79114998f91",
|
"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/eca0bf41ed421bed1b57c4958bab16aa86b757d0",
|
||||||
"reference": "dc3063ba22c2a1fd2f45ed856374d79114998f91",
|
"reference": "eca0bf41ed421bed1b57c4958bab16aa86b757d0",
|
||||||
"shasum": ""
|
"shasum": ""
|
||||||
},
|
},
|
||||||
"require": {
|
"require": {
|
||||||
|
|
@ -4801,7 +4801,7 @@
|
||||||
"type": "library",
|
"type": "library",
|
||||||
"extra": {
|
"extra": {
|
||||||
"branch-alias": {
|
"branch-alias": {
|
||||||
"dev-main": "1.22-dev"
|
"dev-main": "1.23-dev"
|
||||||
},
|
},
|
||||||
"thanks": {
|
"thanks": {
|
||||||
"name": "symfony/polyfill",
|
"name": "symfony/polyfill",
|
||||||
|
|
@ -4846,7 +4846,7 @@
|
||||||
"shim"
|
"shim"
|
||||||
],
|
],
|
||||||
"support": {
|
"support": {
|
||||||
"source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1"
|
"source": "https://github.com/symfony/polyfill-php80/tree/v1.23.0"
|
||||||
},
|
},
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
|
|
@ -4862,7 +4862,7 @@
|
||||||
"type": "tidelift"
|
"type": "tidelift"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"time": "2021-01-07T16:49:33+00:00"
|
"time": "2021-02-19T12:13:01+00:00"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "symfony/process",
|
"name": "symfony/process",
|
||||||
|
|
|
||||||
47051
package-lock.json
generated
47051
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
11
package.json
11
package.json
|
|
@ -10,23 +10,18 @@
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@babel/plugin-proposal-class-properties": "^7.10.4",
|
"@babel/plugin-proposal-class-properties": "^7.10.4",
|
||||||
"@babel/plugin-proposal-decorators": "^7.10.5",
|
"@babel/plugin-proposal-decorators": "^7.10.5",
|
||||||
"bootstrap": "^4.0.0",
|
|
||||||
"bootstrap-sass": "^3.4.1",
|
"bootstrap-sass": "^3.4.1",
|
||||||
"cross-env": "^7.0.2",
|
"cross-env": "^7.0.2",
|
||||||
"jquery": "^3.2",
|
|
||||||
"laravel-mix": "^6.0.19",
|
"laravel-mix": "^6.0.19",
|
||||||
"npm-font-open-sans": "^1.1.0",
|
"npm-font-open-sans": "^1.1.0",
|
||||||
"popper.js": "^1.12",
|
|
||||||
"postcss-loader": "^5.2.0",
|
"postcss-loader": "^5.2.0",
|
||||||
"purecss-sass": "^2.0.3",
|
"purecss-sass": "^2.0.3",
|
||||||
"resolve-url-loader": "^2.3.1",
|
"resolve-url-loader": "^4.0.0",
|
||||||
"sass": "^1.20.1",
|
"sass": "^1.26.10",
|
||||||
"sass-loader": "^8.0.0",
|
"sass-loader": "^11.1.0",
|
||||||
"ts-loader": "^9.1.2",
|
"ts-loader": "^9.1.2",
|
||||||
"typescript": "^4.0.2",
|
"typescript": "^4.0.2",
|
||||||
"vue": "^2.5.17",
|
|
||||||
"vue-loader": "^15.9.5",
|
"vue-loader": "^15.9.5",
|
||||||
"vue-template-compiler": "^2.6.10",
|
|
||||||
"webpack": "^5.37.0",
|
"webpack": "^5.37.0",
|
||||||
"webpack-cli": "^4.7.0"
|
"webpack-cli": "^4.7.0"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@
|
||||||
-->
|
-->
|
||||||
<xsl:stylesheet version="1.0"
|
<xsl:stylesheet version="1.0"
|
||||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||||
|
xmlns:str="http://exslt.org/strings"
|
||||||
xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
|
xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
|
@ -196,13 +197,33 @@
|
||||||
</xsl:attribute>
|
</xsl:attribute>
|
||||||
<xsl:if test="@Type != ''">
|
<xsl:if test="@Type != ''">
|
||||||
<xsl:attribute name="descriptionType">
|
<xsl:attribute name="descriptionType">
|
||||||
<xsl:value-of select="@Type" />
|
<xsl:call-template name="CamelCaseWord">
|
||||||
|
<xsl:with-param name="text" select="@Type"/>
|
||||||
|
</xsl:call-template>
|
||||||
</xsl:attribute>
|
</xsl:attribute>
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
<xsl:value-of select="@Value" />
|
<xsl:value-of select="@Value" />
|
||||||
</description>
|
</description>
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
|
<xsl:template name="CamelCaseWord">
|
||||||
|
<xsl:param name="text"/>
|
||||||
|
<xsl:param name="firstLower" select="true()"/>
|
||||||
|
<xsl:variable name="Upper">ABCDEFGHIJKLMNOPQRSTUVQXYZ</xsl:variable>
|
||||||
|
<xsl:variable name="Lower">abcdefghijklmnopqrstuvwxyz</xsl:variable>
|
||||||
|
<xsl:for-each select="str:split($text,'_')">
|
||||||
|
<xsl:choose>
|
||||||
|
<xsl:when test="position()=1 and $firstLower = true()">
|
||||||
|
<xsl:value-of select="substring(node(),1,1)"/>
|
||||||
|
</xsl:when>
|
||||||
|
<xsl:otherwise>
|
||||||
|
<xsl:value-of select="translate(substring(node(),1,1),$Lower,$Upper)"/>
|
||||||
|
</xsl:otherwise>
|
||||||
|
</xsl:choose>
|
||||||
|
<xsl:value-of select="substring(node(),2,string-length(node()))"/>
|
||||||
|
</xsl:for-each>
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
<xsl:template match="TitleMain" mode="oai_datacite"
|
<xsl:template match="TitleMain" mode="oai_datacite"
|
||||||
xmlns="http://datacite.org/schema/kernel-4">
|
xmlns="http://datacite.org/schema/kernel-4">
|
||||||
<title>
|
<title>
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@
|
||||||
-->
|
-->
|
||||||
<xsl:stylesheet version="1.0"
|
<xsl:stylesheet version="1.0"
|
||||||
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
|
||||||
|
xmlns:str="http://exslt.org/strings"
|
||||||
xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
|
xmlns:oai_dc="http://www.openarchives.org/OAI/2.0/oai_dc/"
|
||||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
|
@ -45,7 +46,7 @@
|
||||||
<datacentreSymbol>RDR.GBA</datacentreSymbol> -->
|
<datacentreSymbol>RDR.GBA</datacentreSymbol> -->
|
||||||
<xsl:choose>
|
<xsl:choose>
|
||||||
<xsl:when test="Identifier">
|
<xsl:when test="Identifier">
|
||||||
<xsl:apply-templates name="Identifier" mode="oai_datacite" />
|
<xsl:apply-templates name="Identifier" mode="oai_datacite" />
|
||||||
</xsl:when>
|
</xsl:when>
|
||||||
<xsl:otherwise>
|
<xsl:otherwise>
|
||||||
<identifier>
|
<identifier>
|
||||||
|
|
@ -198,17 +199,38 @@
|
||||||
</xsl:attribute>
|
</xsl:attribute>
|
||||||
<xsl:if test="@Type != ''">
|
<xsl:if test="@Type != ''">
|
||||||
<xsl:attribute name="descriptionType">
|
<xsl:attribute name="descriptionType">
|
||||||
<xsl:value-of select="@Type" />
|
<xsl:call-template name="CamelCaseWord">
|
||||||
|
<xsl:with-param name="text" select="@Type"/>
|
||||||
|
</xsl:call-template>
|
||||||
</xsl:attribute>
|
</xsl:attribute>
|
||||||
</xsl:if>
|
</xsl:if>
|
||||||
<xsl:value-of select="@Value" />
|
<xsl:value-of select="@Value" />
|
||||||
</description>
|
</description>
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
|
|
||||||
|
<xsl:template name="CamelCaseWord">
|
||||||
|
<xsl:param name="text"/>
|
||||||
|
<xsl:param name="firstLower" select="true()"/>
|
||||||
|
<xsl:variable name="Upper">ABCDEFGHIJKLMNOPQRSTUVQXYZ</xsl:variable>
|
||||||
|
<xsl:variable name="Lower">abcdefghijklmnopqrstuvwxyz</xsl:variable>
|
||||||
|
<xsl:for-each select="str:split($text,'_')">
|
||||||
|
<xsl:choose>
|
||||||
|
<xsl:when test="position()=1 and $firstLower = true()">
|
||||||
|
<xsl:value-of select="substring(node(),1,1)"/>
|
||||||
|
</xsl:when>
|
||||||
|
<xsl:otherwise>
|
||||||
|
<xsl:value-of select="translate(substring(node(),1,1),$Lower,$Upper)"/>
|
||||||
|
</xsl:otherwise>
|
||||||
|
</xsl:choose>
|
||||||
|
<xsl:value-of select="substring(node(),2,string-length(node()))"/>
|
||||||
|
</xsl:for-each>
|
||||||
|
</xsl:template>
|
||||||
|
|
||||||
<xsl:template match="Identifier" mode="oai_datacite"
|
<xsl:template match="Identifier" mode="oai_datacite"
|
||||||
xmlns="http://datacite.org/schema/kernel-4">
|
xmlns="http://datacite.org/schema/kernel-4">
|
||||||
<identifier identifierType="DOI">
|
<identifier identifierType="DOI">
|
||||||
<xsl:value-of select="@Value" />
|
<xsl:value-of select="@Value" />
|
||||||
</identifier>
|
</identifier>
|
||||||
</xsl:template>
|
</xsl:template>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
const mix = require('laravel-mix');
|
let mix = require('laravel-mix');
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
| Mix Asset Management
|
| Mix Asset Management siehe https://laravel.com/docs/5.5/mix
|
||||||
|--------------------------------------------------------------------------
|
|--------------------------------------------------------------------------
|
||||||
|
|
|
|
||||||
| Mix provides a clean, fluent API for defining some Webpack build steps
|
| Mix provides a clean, fluent API for defining some Webpack build steps
|
||||||
|
|
@ -10,6 +10,54 @@ const mix = require('laravel-mix');
|
||||||
| file for the application as well as bundling up all the JS files.
|
| file for the application as well as bundling up all the JS files.
|
||||||
|
|
|
|
||||||
*/
|
*/
|
||||||
|
// mix.setPublicPath('../');
|
||||||
|
|
||||||
mix.js('resources/js/app.js', 'public/js')
|
// .sass('resources/assets/sass/app1.scss', 'public/css')
|
||||||
.sass('resources/sass/app.scss', 'public/css');
|
|
||||||
|
mix.js('resources/js/datasetPublish.js', 'public/backend/publish').vue()
|
||||||
|
.js('resources/js/search/main.ts', 'public/js/search').vue()
|
||||||
|
.js('resources/js/landingpage/main.ts', 'public/js/landingpage').vue()
|
||||||
|
.js('resources/js/app.js', 'public/js').vue()
|
||||||
|
.js('resources/js/lib.js', 'public/js')
|
||||||
|
.js('resources/js/releaseDataset.js', 'public/backend/publish').vue()
|
||||||
|
.js('resources/js/mainEditDataset.js', 'public/backend/publish').vue()
|
||||||
|
.js('resources/js/approveDataset.js', 'public/backend/publish').vue()
|
||||||
|
.js('resources/js/ckeditor.js', 'public/backend/')
|
||||||
|
.sass('resources/sass/app1.scss', 'public/css') //, { implementation: require('node-sass')})
|
||||||
|
//.sass('node_modules/purecss/build/pure.css', 'public/css', { implementation: require('node-sass') })
|
||||||
|
.sass('resources/sass/font-awesome.scss', 'public/css') //, { implementation: require('node-sass') })
|
||||||
|
.js('resources/js/scripts.js', 'public/js')
|
||||||
|
.scripts([
|
||||||
|
'node_modules/datatables.net/js/jquery.dataTables.js',
|
||||||
|
'node_modules/datatables.net-buttons/js/dataTables.buttons.js',
|
||||||
|
'node_modules/datatables.net-buttons/js/buttons.flash.js',
|
||||||
|
'node_modules/datatables.net-buttons/js/buttons.html5.js',
|
||||||
|
'node_modules/datatables.net-buttons/js/buttons.print.js',
|
||||||
|
], 'public/js/dataTable.js')
|
||||||
|
// .sourceMaps()
|
||||||
|
.webpackConfig({
|
||||||
|
module: {
|
||||||
|
rules: [
|
||||||
|
// We're registering the TypeScript loader here. It should only
|
||||||
|
// apply when we're dealing with a `.ts` or `.tsx` file.
|
||||||
|
{
|
||||||
|
test: /\.tsx?$/,
|
||||||
|
loader: 'ts-loader',
|
||||||
|
options: { appendTsSuffixTo: [/\.vue$/] },
|
||||||
|
exclude: /node_modules/,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
resolve: {
|
||||||
|
// We need to register the `.ts` extension so Webpack can resolve
|
||||||
|
// TypeScript modules without explicitly providing an extension.
|
||||||
|
// The other extensions in this list are identical to the Mix
|
||||||
|
// defaults.
|
||||||
|
extensions: ['*', '.js', '.jsx', '.vue', '.ts', '.tsx'],
|
||||||
|
},
|
||||||
|
});
|
||||||
|
// .options({
|
||||||
|
// //publicPath: '../'
|
||||||
|
// processCssUrls: false
|
||||||
|
// });
|
||||||
|
// mix.copy('node_modules/bootstrap-sass/assets/fonts/bootstrap', 'public/fonts/bootstrap');
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user