mirror of
https://github.com/grocy/grocy.git
synced 2025-04-28 17:23:56 +00:00
Prepared next release
This commit is contained in:
Bernd Bestel
parent
659d60b235
commit
cd0ca4a67c
@ -1,7 +1,9 @@
|
||||
- Some small UI fixes & improvements
|
||||
- Recipe ingredient notes were not displayed
|
||||
- Edit/delete buttons on equipment page had no icons
|
||||
- Improved the overview pages "button column" (e. g. hide more rarely used options behind a context/dropdown menu)
|
||||
- Edit/delete buttons on the equipment page had no icons
|
||||
- Improved the overview pages "action buttons column" (e. g. hide more rarely used actions behind a context/dropdown menu)
|
||||
- Some JS files were not loaded correctly on case sensitive file systems
|
||||
- The changelog is now included as markdown files (in `/changelog` directory, one file per release with a filename in format `<ReleaseNumber>_<Version>_<ReleaseDateIso>.md`) and shown in the about dialog
|
||||
- Please review your `CURRENCY` setting in `data/config.php`, see also `config-dist.php` - this should be the ISO 4217 code of the currency to properly work with the JS `toLocaleString` function
|
||||
- New translation: (thanks all the translators)
|
||||
- Russian (demo available at https://demo-ru.grocy.info)
|
||||
@ -85,5 +85,6 @@ return array(
|
||||
'Topping' => 'Topping',
|
||||
'French' => 'Fransk',
|
||||
'Turkish' => 'Turkish',
|
||||
'Spanish' => 'Spanish'
|
||||
'Spanish' => 'Spanish',
|
||||
'Russian' => 'Russian'
|
||||
);
|
||||
|
||||
@ -85,5 +85,6 @@ return array(
|
||||
'Topping' => 'Belag',
|
||||
'French' => 'Französisch',
|
||||
'Turkish' => 'Türkisch',
|
||||
'Spanish' => 'Spanisch'
|
||||
'Spanish' => 'Spanisch',
|
||||
'Russian' => 'Russisch'
|
||||
);
|
||||
|
||||
@ -345,5 +345,13 @@ return array(
|
||||
'You have to select a location' => 'Ein Standort muss ausgewählt werden',
|
||||
'List' => 'Liste',
|
||||
'Gallery' => 'Galerie',
|
||||
'The current picture will be deleted when you save the recipe' => 'Das aktuelle Bild wird beim Speichern des Rezepts gelöscht '
|
||||
'The current picture will be deleted when you save the recipe' => 'Das aktuelle Bild wird beim Speichern des Rezepts gelöscht ',
|
||||
'Show product details' => 'Produktdetails anzeigen',
|
||||
'Stock journal for this product' => 'Bestandsjournal für dieses Produkt',
|
||||
'Show chore details' => 'Hausarbeitdetails anzeigen',
|
||||
'Journal for this chore' => 'Journal für dieses Hausarbeit',
|
||||
'Show battery details' => 'Batteriedetails anzeigen',
|
||||
'Journal for this battery' => 'Journal für diese Batterie',
|
||||
'System info' => 'Systeminformationen',
|
||||
'Changelog' => 'Änderungsprotokoll'
|
||||
);
|
||||
|
||||
@ -85,5 +85,6 @@ return array(
|
||||
'Topping' => 'Topping',
|
||||
'French' => 'French',
|
||||
'Turkish' => 'Turkish',
|
||||
'Spanish' => 'Spanish'
|
||||
'Spanish' => 'Spanish',
|
||||
'Russian' => 'Russian'
|
||||
);
|
||||
|
||||
@ -85,5 +85,6 @@ return array(
|
||||
'Topping' => 'Parte superior',
|
||||
'French' => 'Francés',
|
||||
'Turkish' => 'Turkish',
|
||||
'Spanish' => 'Spanish'
|
||||
'Spanish' => 'Spanish',
|
||||
'Russian' => 'Russian'
|
||||
);
|
||||
|
||||
@ -345,5 +345,13 @@ return array(
|
||||
'You have to select a location' => 'You have to select a location',
|
||||
'List' => 'List',
|
||||
'Gallery' => 'Gallery',
|
||||
'The current picture will be deleted when you save the recipe' => 'The current picture will be deleted when you save the recipe'
|
||||
'The current picture will be deleted when you save the recipe' => 'The current picture will be deleted when you save the recipe',
|
||||
'Show product details' => 'Show product details',
|
||||
'Stock journal for this product' => 'Stock journal for this product',
|
||||
'Show chore details' => 'Show chore details',
|
||||
'Journal for this chore' => 'Journal for this chore',
|
||||
'Show battery details' => 'Show battery details',
|
||||
'Journal for this battery' => 'Journal for this battery',
|
||||
'System info' => 'System info',
|
||||
'Changelog' => 'Changelog'
|
||||
);
|
||||
|
||||
@ -85,5 +85,6 @@ return array(
|
||||
'Topping' => 'Garniture',
|
||||
'French' => 'Français',
|
||||
'Turkish' => 'Turkish',
|
||||
'Spanish' => 'Spanish'
|
||||
'Spanish' => 'Spanish',
|
||||
'Russian' => 'Russian'
|
||||
);
|
||||
|
||||
@ -345,5 +345,13 @@ return array(
|
||||
'You have to select a location' => 'You have to select a location',
|
||||
'List' => 'List',
|
||||
'Gallery' => 'Gallery',
|
||||
'The current picture will be deleted when you save the recipe' => 'The current picture will be deleted when you save the recipe'
|
||||
'The current picture will be deleted when you save the recipe' => 'The current picture will be deleted when you save the recipe',
|
||||
'Show product details' => 'Show product details',
|
||||
'Stock journal for this product' => 'Stock journal for this product',
|
||||
'Show chore details' => 'Show chore details',
|
||||
'Journal for this chore' => 'Journal for this chore',
|
||||
'Show battery details' => 'Show battery details',
|
||||
'Journal for this battery' => 'Journal for this battery',
|
||||
'System info' => 'System info',
|
||||
'Changelog' => 'Changelog'
|
||||
);
|
||||
|
||||
@ -85,5 +85,6 @@ return array(
|
||||
'Topping' => 'Guarnizione',
|
||||
'French' => 'Francese',
|
||||
'Turkish' => 'Turkish',
|
||||
'Spanish' => 'Spanish'
|
||||
'Spanish' => 'Spanish',
|
||||
'Russian' => 'Russian'
|
||||
);
|
||||
|
||||
@ -85,5 +85,6 @@ return array(
|
||||
'Topping' => 'Topping',
|
||||
'French' => 'Fransk',
|
||||
'Turkish' => 'Turkish',
|
||||
'Spanish' => 'Spanish'
|
||||
'Spanish' => 'Spanish',
|
||||
'Russian' => 'Russian'
|
||||
);
|
||||
|
||||
@ -345,5 +345,13 @@ return array(
|
||||
'You have to select a location' => 'You have to select a location',
|
||||
'List' => 'List',
|
||||
'Gallery' => 'Gallery',
|
||||
'The current picture will be deleted when you save the recipe' => 'The current picture will be deleted when you save the recipe'
|
||||
'The current picture will be deleted when you save the recipe' => 'The current picture will be deleted when you save the recipe',
|
||||
'Show product details' => 'Show product details',
|
||||
'Stock journal for this product' => 'Stock journal for this product',
|
||||
'Show chore details' => 'Show chore details',
|
||||
'Journal for this chore' => 'Journal for this chore',
|
||||
'Show battery details' => 'Show battery details',
|
||||
'Journal for this battery' => 'Journal for this battery',
|
||||
'System info' => 'System info',
|
||||
'Changelog' => 'Changelog'
|
||||
);
|
||||
|
||||
@ -1,10 +1,10 @@
|
||||
<?php
|
||||
|
||||
return array(
|
||||
'timeago_locale' => 'en',
|
||||
'timeago_nan' => 'NaN years ago',
|
||||
'moment_locale' => 'x',
|
||||
'datatables_localization' => '{"sEmptyTable":"No data available in table","sInfo":"Showing _START_ to _END_ of _TOTAL_ entries","sInfoEmpty":"Showing 0 to 0 of 0 entries","sInfoFiltered":"(filtered from _MAX_ total entries)","sInfoPostFix":"","sInfoThousands":",","sLengthMenu":"Show _MENU_ entries","sLoadingRecords":"Loading...","sProcessing":"Processing...","sSearch":"Search:","sZeroRecords":"No matching records found","oPaginate":{"sFirst":"First","sLast":"Last","sNext":"Next","sPrevious":"Previous"},"oAria":{"sSortAscending":": activate to sort column ascending","sSortDescending":": activate to sort column descending"}}',
|
||||
'summernote_locale' => 'x',
|
||||
'fullcalendar_locale' => 'x'
|
||||
'timeago_locale' => 'ru',
|
||||
'timeago_nan' => 'NaN год',
|
||||
'moment_locale' => 'ru',
|
||||
'datatables_localization' => '{}',
|
||||
'summernote_locale' => 'ru-RU',
|
||||
'fullcalendar_locale' => 'ru'
|
||||
);
|
||||
|
||||
@ -4,7 +4,7 @@ return array(
|
||||
'Stock overview' => 'Обзор склада',
|
||||
'#1 products expiring within the next #2 days' => 'У #1 продуктов заканчивается срок годности через #2 дня (дней)',
|
||||
'#1 products are already expired' => 'У #1 продуктов закончился срок годности',
|
||||
'#1 products are below defined min. stock amount' => '#1 продуктов имеются в количестве меньше минимально заданного',
|
||||
'#1 products are below defined min. stock amount' => '#1 продуктов имеются меньше мин. заданного кол-ва',
|
||||
'Product' => 'Продукт',
|
||||
'Amount' => 'Количество',
|
||||
'Next best before date' => 'Следующий срок годности',
|
||||
@ -51,7 +51,7 @@ return array(
|
||||
'Add' => 'Добавить',
|
||||
'Name' => 'Имя',
|
||||
'Location' => 'Место хранения',
|
||||
'Min. stock amount' => 'Мин. количество в запасе',
|
||||
'Min. stock amount' => 'Мин. кол-во в запасе',
|
||||
'QU purchase' => 'Ед.изм. покупки',
|
||||
'QU stock' => 'Ед.изм. запаса',
|
||||
'QU factor' => 'Пересчёт ед.изм.',
|
||||
@ -79,7 +79,7 @@ return array(
|
||||
'Manage master data' => 'Управление основными данными',
|
||||
'This will apply to added products' => 'Будет применено к добавленным продуктам',
|
||||
'never' => 'никогда',
|
||||
'Add products that are below defined min. stock amount' => 'Add products that are below defined min. stock amount',
|
||||
'Add products that are below defined min. stock amount' => 'Добавить продукты, которых меньше мин. заданного кол-ва',
|
||||
'For purchases this amount of days will be added to today for the best before date suggestion' => 'For purchases this amount of days will be added to today for the best before date suggestion',
|
||||
'This means 1 #1 purchased will be converted into #2 #3 in stock' => 'Означает, что 1 купленный #1 будет пересчитан в #2 #3 в запасе',
|
||||
'Login' => 'Вход',
|
||||
@ -194,7 +194,7 @@ return array(
|
||||
'The price cannot be lower than #1' => 'Цена не может быть ниже #1',
|
||||
'#1 product expires within the next #2 days' => 'У #1 продукта закончится срок годности через #2 дня(дней)',
|
||||
'#1 product is already expired' => 'У #1 продукта уже закончился срок годности',
|
||||
'#1 product is below defined min. stock amount' => '#1 продукт имеется в количестве меньше минимально заданного',
|
||||
'#1 product is below defined min. stock amount' => '#1 продукт имеется меньше мин. заданного кол-ва',
|
||||
'Unit' => 'Ед.изм.',
|
||||
'Units' => 'Ед.изм.',
|
||||
'#1 chore is due to be done within the next #2 days' => 'Срок исполнения #1 работы по дому наступает в ближайшие #2 дня (дней) ',
|
||||
@ -239,11 +239,11 @@ return array(
|
||||
'Create product group' => 'Создать группу продуктов',
|
||||
'Edit product group' => 'Изменить группу продуктов',
|
||||
'Product group' => 'Группа продуктов',
|
||||
'Are you sure to delete product group "#1"?' => 'Are you sure to delete product group "#1"?',
|
||||
'Are you sure to delete product group "#1"?' => 'Вы уверены, что нужно удалить группу "#1"?',
|
||||
'Stay logged in permanently' => 'Оставаться в сети всегда',
|
||||
'When not set, you will get logged out at latest after 30 days' => 'Если не отмечено, то вы выйдете автоматически через 30 дней',
|
||||
'Filter by status' => 'Отфильтровать по статусу',
|
||||
'Below min. stock amount' => 'Below min. stock amount',
|
||||
'Below min. stock amount' => 'Меньше мин. заданного кол-ва',
|
||||
'Expiring soon' => 'Скоро заканчивается срок',
|
||||
'Already expired' => 'Срок годности вышел',
|
||||
'Due soon' => 'Срок выполнения подходит',
|
||||
@ -293,7 +293,7 @@ return array(
|
||||
'Undone on' => 'Отменено',
|
||||
'Batteries journal' => 'Журнал батарей',
|
||||
'Filter by battery' => 'Отфильтровать по батарее',
|
||||
'Undo charge cycle' => 'Undo charge cycle',
|
||||
'Undo charge cycle' => 'Отменить цикл заряда',
|
||||
'Undo chore execution' => 'Отменить выполнение работы по дому',
|
||||
'Chore execution successfully undone' => 'Успешно отменено выполнение работы по дому',
|
||||
'Undo' => 'Отменить',
|
||||
@ -301,49 +301,58 @@ return array(
|
||||
'Charge cycle successfully undone' => 'Charge cycle successfully undone',
|
||||
'This cannot be negative and must be an integral number' => 'This cannot be negative and must be an integral number',
|
||||
'Disable stock fulfillment checking for this ingredient' => 'Disable stock fulfillment checking for this ingredient',
|
||||
'Add all list items to stock' => 'Add all list items to stock',
|
||||
'Add #3 #1 of #2 to stock' => 'Add #3 #1 of #2 to stock',
|
||||
'Adding shopping list item #1 of #2' => 'Adding shopping list item #1 of #2',
|
||||
'Use a specific stock item' => 'Use a specific stock item',
|
||||
'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"' => 'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"',
|
||||
'Mark #3 #1 of #2 as open' => 'Mark #3 #1 of #2 as open',
|
||||
'Add all list items to stock' => 'Добавить всё в списке в запас',
|
||||
'Add #3 #1 of #2 to stock' => 'Добавить #3 #1 #2 в запас',
|
||||
'Adding shopping list item #1 of #2' => 'Добавляется элемент списка покупок #1 из #2',
|
||||
'Use a specific stock item' => 'Использовать конкретный элемент из запаса',
|
||||
'The first item in this list would be picked by the default rule which is "First expiring first, then first in first out"' => 'Первый элемент этого списка будет выбран по правилу "Сначала с меньшим сроком годности, затем по дате поступления"',
|
||||
'Mark #3 #1 of #2 as open' => 'Пометить #3 #1 #2 как открытую',
|
||||
'When a product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)' => 'When a product was marked as opened, the best before date will be replaced by today + this amount of days (a value of 0 disables this)',
|
||||
'Default best before days after opened' => 'Default best before days after opened',
|
||||
'Marked #1 #2 of #3 as opened' => 'Marked #1 #2 of #3 as opened',
|
||||
'Mark as opened' => 'Mark as opened',
|
||||
'Expires on #1; Bought on #2' => 'Expires on #1; Bought on #2',
|
||||
'Not opened' => 'Not opened',
|
||||
'Opened' => 'Opened',
|
||||
'Mark #3 #1 of #2 as open' => 'Mark #3 #1 of #2 as open',
|
||||
'#1 opened' => '#1 opened',
|
||||
'Product expires' => 'Product expires',
|
||||
'Task due' => 'Task due',
|
||||
'Marked #1 #2 of #3 as opened' => '#1 #2 #3 помечена открытой',
|
||||
'Mark as opened' => 'Пометить как открытые',
|
||||
'Expires on #1; Bought on #2' => 'Срок годности: #1; Приобретено: #2',
|
||||
'Not opened' => 'Не открыто',
|
||||
'Opened' => 'Открыто',
|
||||
'Mark #3 #1 of #2 as open' => 'Пометить #3 #1 #2 как открытую',
|
||||
'#1 opened' => '#1 открыто',
|
||||
'Product expires' => 'У продукта заканчивается срок годности',
|
||||
'Task due' => 'Срок выполнения задачи',
|
||||
'Chore due' => 'Срок выполнения работы по дому',
|
||||
'Battery charge cycle due' => 'Battery charge cycle due',
|
||||
'Show clock in header' => 'Show clock in header',
|
||||
'Stock settings' => 'Stock settings',
|
||||
'Show clock in header' => 'Показывать часы в заголовке',
|
||||
'Stock settings' => 'Настройки запаса',
|
||||
'Shopping list to stock workflow' => 'Shopping list to stock workflow',
|
||||
'Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default best before days" set' => 'Automatically do the booking using the last price and the amount of the shopping list item, if the product has "Default best before days" set',
|
||||
'Skip' => 'Skip',
|
||||
'Servings' => 'Servings',
|
||||
'Costs' => 'Costs',
|
||||
'Based on the prices of the last purchase per product' => 'Based on the prices of the last purchase per product',
|
||||
'Skip' => 'Пропустить',
|
||||
'Servings' => 'Порции',
|
||||
'Costs' => 'Цены',
|
||||
'Based on the prices of the last purchase per product' => 'На основании цен на недавние покупки продуктов',
|
||||
'The ingredients listed here result in this amount of servings' => 'The ingredients listed here result in this amount of servings',
|
||||
'Do not check against the shopping list when adding missing items to it' => 'Do not check against the shopping list when adding missing items to it',
|
||||
'By default the amount to be added to the shopping list is "needed amount - stock amount - shopping list amount" - when this is enabled, it is only checked against the stock amount, not against what is already on the shopping list' => 'By default the amount to be added to the shopping list is "needed amount - stock amount - shopping list amount" - when this is enabled, it is only checked against the stock amount, not against what is already on the shopping list',
|
||||
'Picture' => 'Picture',
|
||||
'Uncheck ingredients to not put them on the shopping list' => 'Uncheck ingredients to not put them on the shopping list',
|
||||
'This is for statistical purposes only' => 'This is for statistical purposes only',
|
||||
'You have to select a recipe' => 'You have to select a recipe',
|
||||
'Picture' => 'Изображение',
|
||||
'Uncheck ingredients to not put them on the shopping list' => 'Снимите выделение с элементов, чтобы не добавлять их в список покупок',
|
||||
'This is for statistical purposes only' => 'Нужно только для статистический целей',
|
||||
'You have to select a recipe' => 'Вам нужно выбрать рецепт',
|
||||
'Key type' => 'Key type',
|
||||
'Share/Integrate calendar (iCal)' => 'Share/Integrate calendar (iCal)',
|
||||
'Use the following (public) URL to share or integrate the calendar in iCal format' => 'Use the following (public) URL to share or integrate the calendar in iCal format',
|
||||
'Allow partial units in stock' => 'Allow partial units in stock',
|
||||
'Enable tare weight handling' => 'Enable tare weight handling',
|
||||
'This is useful e.g. for flour in jars - on purchase/consume/inventory you always weigh the whole jar, the amount to be posted is then automatically calculated based on what is in stock and the tare weight defined below' => 'This is useful e.g. for flour in jars - on purchase/consume/inventory you always weigh the whole jar, the amount to be posted is then automatically calculated based on what is in stock and the tare weight defined below',
|
||||
'Tare weight' => 'Tare weight',
|
||||
'Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated' => 'Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated',
|
||||
'You have to select a location' => 'You have to select a location',
|
||||
'List' => 'List',
|
||||
'Gallery' => 'Gallery'
|
||||
'Allow partial units in stock' => 'Разрешить дробные количества в запасе',
|
||||
'Enable tare weight handling' => 'Включить расчёт с учётом тары',
|
||||
'This is useful e.g. for flour in jars - on purchase/consume/inventory you always weigh the whole jar, the amount to be posted is then automatically calculated based on what is in stock and the tare weight defined below' => 'Это удобно, например, для хранения муки в контейнере - при покупке/потреблении/инветаризации взвесьте весь контейнер, а настоящее количество будет автоматически рассчитано на основе объёма в запасе и веса тары ниже',
|
||||
'Tare weight' => 'Вес тары',
|
||||
'Tare weight handling enabled - please weigh the whole container, the amount to be posted will be automatically calculcated' => 'Включён расчёт с учётом тары - пожалуйста, взвесьте весь контейнер, изменения в количестве будут автоматически рассчитаны',
|
||||
'You have to select a location' => 'Вам нужно выбрать место хранения',
|
||||
'List' => 'Список',
|
||||
'Gallery' => 'Галерея',
|
||||
'The current picture will be deleted when you save the recipe' => 'Текущее изображение будет удалено при сохранении рецепта',
|
||||
'Show product details' => 'Show product details',
|
||||
'Stock journal for this product' => 'Stock journal for this product',
|
||||
'Show chore details' => 'Show chore details',
|
||||
'Journal for this chore' => 'Journal for this chore',
|
||||
'Show battery details' => 'Show battery details',
|
||||
'Journal for this battery' => 'Journal for this battery',
|
||||
'System info' => 'System info',
|
||||
'Changelog' => 'Changelog'
|
||||
);
|
||||
|
||||
@ -85,5 +85,6 @@ return array(
|
||||
'Topping' => 'Süsleme',
|
||||
'French' => 'Fransızca',
|
||||
'Turkish' => 'Türkçe',
|
||||
'Spanish' => 'İspanyolca'
|
||||
'Spanish' => 'İspanyolca',
|
||||
'Russian' => 'Russian'
|
||||
);
|
||||
|
||||
@ -345,5 +345,13 @@ return array(
|
||||
'You have to select a location' => 'You have to select a location',
|
||||
'List' => 'List',
|
||||
'Gallery' => 'Gallery',
|
||||
'The current picture will be deleted when you save the recipe' => 'The current picture will be deleted when you save the recipe'
|
||||
'The current picture will be deleted when you save the recipe' => 'The current picture will be deleted when you save the recipe',
|
||||
'Show product details' => 'Show product details',
|
||||
'Stock journal for this product' => 'Stock journal for this product',
|
||||
'Show chore details' => 'Show chore details',
|
||||
'Journal for this chore' => 'Journal for this chore',
|
||||
'Show battery details' => 'Show battery details',
|
||||
'Journal for this battery' => 'Journal for this battery',
|
||||
'System info' => 'System info',
|
||||
'Changelog' => 'Changelog'
|
||||
);
|
||||
|
||||
@ -4,6 +4,7 @@
|
||||
"dependencies": {
|
||||
"@danielfarrell/bootstrap-combobox": "https://github.com/berrnd/bootstrap-combobox.git#master",
|
||||
"@fortawesome/fontawesome-free": "^5.7.2",
|
||||
"TagManager": "https://github.com/max-favilli/tagmanager.git#3.0.2",
|
||||
"bootbox": "https://github.com/makeusabrew/bootbox.git#v5.x",
|
||||
"bootstrap": "^4.3.1",
|
||||
"chart.js": "^2.7.3",
|
||||
@ -25,7 +26,6 @@
|
||||
"startbootstrap-sb-admin": "^4.0.0",
|
||||
"summernote": "^0.8.11",
|
||||
"swagger-ui-dist": "^3.21.0",
|
||||
"tagmanager": "https://github.com/max-favilli/tagmanager.git#3.0.2",
|
||||
"tempusdominus-bootstrap-4": "https://github.com/berrnd/tempusdominus-bootstrap-4.git#master",
|
||||
"timeago": "^1.6.5",
|
||||
"toastr": "^2.1.4"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{
|
||||
"Version": "2.0.0",
|
||||
"ReleaseDate": "2019-03-06"
|
||||
"Version": "2.1.0",
|
||||
"ReleaseDate": "2019-03-09"
|
||||
}
|
||||
|
||||
@ -9,11 +9,11 @@
|
||||
@section('viewJsName', 'productform')
|
||||
|
||||
@push('pageScripts')
|
||||
<script src="{{ $U('/node_modules/tagmanager/tagmanager.js?v=', true) }}{{ $version }}"></script>
|
||||
<script src="{{ $U('/node_modules/TagManager/tagmanager.js?v=', true) }}{{ $version }}"></script>
|
||||
@endpush
|
||||
|
||||
@push('pageStyles')
|
||||
<link href="{{ $U('/node_modules/tagmanager/tagmanager.css?v=', true) }}{{ $version }}" rel="stylesheet">
|
||||
<link href="{{ $U('/node_modules/TagManager/tagmanager.css?v=', true) }}{{ $version }}" rel="stylesheet">
|
||||
@endpush
|
||||
|
||||
@section('content')
|
||||
|
||||
45
yarn.lock
45
yarn.lock
@ -11,6 +11,12 @@
|
||||
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.7.2.tgz#1498c3eb78ee7c78c5488418707de90aaf58d5d7"
|
||||
integrity sha512-Ha4HshKdCVKgu4TVCtG8XyPPYdzTzNW4/fvPnn+LT7AosRABryhlRv4cc4+o84dgpvVJN9reN7jo/c+nYujFug==
|
||||
|
||||
"TagManager@https://github.com/max-favilli/tagmanager.git#3.0.2":
|
||||
version "3.0.1"
|
||||
resolved "https://github.com/max-favilli/tagmanager.git#df9eb9935c8585a392dfc00602f890caf233fa94"
|
||||
dependencies:
|
||||
jquery "1"
|
||||
|
||||
"bootbox@https://github.com/makeusabrew/bootbox.git#v5.x":
|
||||
version "5.0.0"
|
||||
resolved "https://github.com/makeusabrew/bootbox.git#5f506b2bffbd190ec42ed589c013dc0a983bb345"
|
||||
@ -48,7 +54,22 @@ chartjs-color-string@^0.5.0:
|
||||
dependencies:
|
||||
color-name "^1.0.0"
|
||||
|
||||
chartjs-color@^2.1.0, chartjs-color@~2.2.0:
|
||||
chartjs-color-string@^0.6.0:
|
||||
version "0.6.0"
|
||||
resolved "https://registry.yarnpkg.com/chartjs-color-string/-/chartjs-color-string-0.6.0.tgz#1df096621c0e70720a64f4135ea171d051402f71"
|
||||
integrity sha512-TIB5OKn1hPJvO7JcteW4WY/63v6KwEdt6udfnDE9iCAZgy+V4SrbSxoIbTw/xkUIapjEI4ExGtD0+6D3KyFd7A==
|
||||
dependencies:
|
||||
color-name "^1.0.0"
|
||||
|
||||
chartjs-color@^2.1.0:
|
||||
version "2.3.0"
|
||||
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.3.0.tgz#0e7e1e8dba37eae8415fd3db38bf572007dd958f"
|
||||
integrity sha512-hEvVheqczsoHD+fZ+tfPUE+1+RbV6b+eksp2LwAhwRTVXEjCSEavvk+Hg3H6SZfGlPh/UfmWKGIvZbtobOEm3g==
|
||||
dependencies:
|
||||
chartjs-color-string "^0.6.0"
|
||||
color-convert "^0.5.3"
|
||||
|
||||
chartjs-color@~2.2.0:
|
||||
version "2.2.0"
|
||||
resolved "https://registry.yarnpkg.com/chartjs-color/-/chartjs-color-2.2.0.tgz#84a2fb755787ed85c39dd6dd8c7b1d88429baeae"
|
||||
integrity sha1-hKL7dVeH7YXDndbdjHsdiEKbrq4=
|
||||
@ -134,18 +155,18 @@ datatables.net-rowgroup@1.1.0, datatables.net-rowgroup@^1.1.0:
|
||||
jquery ">=1.7"
|
||||
|
||||
datatables.net-select-bs4@^1.2.7:
|
||||
version "1.2.7"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.2.7.tgz#5e4ddd8feb412e974b54a15e81b2bb29840ba55b"
|
||||
integrity sha512-ch+PI9rcp7FAddgF7ZyUfqptoSq1Ck0FadL/HHh6X1xazT+VwZdPy+Gtt2qjMCZhJfCkzjAGxvi1Hk4aFgr3vg==
|
||||
version "1.3.0"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-select-bs4/-/datatables.net-select-bs4-1.3.0.tgz#f2a977fb5631cdeaa322f10c2968796cbabdeeb2"
|
||||
integrity sha512-lV+CiiBn4sIILsveSJ+Q4PohpUJ5HrmmoENqV3YqPU5X/GBIFutMVDQzJobgnjbLka83J99tiKvuva2a1XQBrQ==
|
||||
dependencies:
|
||||
datatables.net-bs4 "^1.10.15"
|
||||
datatables.net-select "1.2.7"
|
||||
datatables.net-select "1.3.0"
|
||||
jquery ">=1.7"
|
||||
|
||||
datatables.net-select@1.2.7, datatables.net-select@^1.2.7:
|
||||
version "1.2.7"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-select/-/datatables.net-select-1.2.7.tgz#7d5badfca49c438f8b51df04483d8d77857e917c"
|
||||
integrity sha512-C3XDi7wpruGjDXV36dc9hN/FrAX9GOFvBZ7+KfKJTBNkGFbbhdzHS91SMeGiwRXPYivAyxfPTcVVndVaO83uBQ==
|
||||
datatables.net-select@1.3.0, datatables.net-select@^1.2.7:
|
||||
version "1.3.0"
|
||||
resolved "https://registry.yarnpkg.com/datatables.net-select/-/datatables.net-select-1.3.0.tgz#0815efa54f09eed744af80fe6a19e236070e8cda"
|
||||
integrity sha512-sj72BM+Sx2n9mTHQjPiGMrGUoAVA1PCGmD+vEuAedhlDX1PAHcnqsOnG37eWrpqIsOQR/ZcSuE8IkU7gmiQkew==
|
||||
dependencies:
|
||||
datatables.net "^1.10.15"
|
||||
jquery ">=1.7"
|
||||
@ -243,12 +264,6 @@ swagger-ui-dist@^3.21.0:
|
||||
resolved "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.21.0.tgz#172bdd39d7d2efd4d4998411702ebe562a934631"
|
||||
integrity sha512-bAhzzpujhSIXdzpSI9b9RpvahC556lxcOIXxt1OOtTIasYodpy94gDlanQl4j7xavmi4nhaGiZ9iBcoFO+wHlA==
|
||||
|
||||
"tagmanager@https://github.com/max-favilli/tagmanager.git#3.0.2":
|
||||
version "3.0.1"
|
||||
resolved "https://github.com/max-favilli/tagmanager.git#df9eb9935c8585a392dfc00602f890caf233fa94"
|
||||
dependencies:
|
||||
jquery "1"
|
||||
|
||||
"tempusdominus-bootstrap-4@https://github.com/berrnd/tempusdominus-bootstrap-4.git#master":
|
||||
version "5.1.2"
|
||||
resolved "https://github.com/berrnd/tempusdominus-bootstrap-4.git#2cf725fed9216cb77a298e5ce46762bfe979eaa0"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user