updated to AdminLTE 2.4.8 (#274)
This commit is contained in:
@@ -9,6 +9,9 @@ require('fullcalendar/dist/gcal.min');
|
||||
require('fullcalendar/dist/locale-all');
|
||||
require('fullcalendar/dist/fullcalendar.min.css');
|
||||
|
||||
// ------ for charts ------
|
||||
require('chart.js/dist/Chart.min');
|
||||
|
||||
// ------ Kimai itself ------
|
||||
require('./kimai.js');
|
||||
require('./datatable.js');
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
"friendsofsymfony/rest-bundle": "^2.3",
|
||||
"friendsofsymfony/user-bundle": "~2.0",
|
||||
"jms/serializer-bundle": "^2.4",
|
||||
"kevinpapst/adminlte-bundle": "^1.2",
|
||||
"kevinpapst/adminlte-bundle": "^2.0",
|
||||
"nelmio/api-doc-bundle": "^3.2",
|
||||
"ocramius/proxy-manager": "2.1.1",
|
||||
"sensio/framework-extra-bundle": "^5.1",
|
||||
|
||||
12
composer.lock
generated
12
composer.lock
generated
@@ -4,7 +4,7 @@
|
||||
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"content-hash": "c5204d1dd48134e0b9ed8a2c0033dc05",
|
||||
"content-hash": "916334cc4252096cbe9d328a38ba81a5",
|
||||
"packages": [
|
||||
{
|
||||
"name": "beberlei/DoctrineExtensions",
|
||||
@@ -1839,16 +1839,16 @@
|
||||
},
|
||||
{
|
||||
"name": "kevinpapst/adminlte-bundle",
|
||||
"version": "1.2",
|
||||
"version": "2.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/kevinpapst/AdminLTEBundle.git",
|
||||
"reference": "e9ba0374f1cb952d9c987b5d2f2fd78274c8d3dd"
|
||||
"reference": "ee9406d2fc60a4d26d317fe555104df803ca130c"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/kevinpapst/AdminLTEBundle/zipball/e9ba0374f1cb952d9c987b5d2f2fd78274c8d3dd",
|
||||
"reference": "e9ba0374f1cb952d9c987b5d2f2fd78274c8d3dd",
|
||||
"url": "https://api.github.com/repos/kevinpapst/AdminLTEBundle/zipball/ee9406d2fc60a4d26d317fe555104df803ca130c",
|
||||
"reference": "ee9406d2fc60a4d26d317fe555104df803ca130c",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
@@ -1895,7 +1895,7 @@
|
||||
}
|
||||
],
|
||||
"description": "Admin Theme based on the AdminLTE 2.3 for easy integration with Symfony 4",
|
||||
"time": "2018-07-21T18:49:21+00:00"
|
||||
"time": "2018-08-15T21:18:05+00:00"
|
||||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
"devDependencies": {
|
||||
"@fortawesome/fontawesome-free": "~5.1.1",
|
||||
"@symfony/webpack-encore": "^0.20.1",
|
||||
"admin-lte": "~2.3.11",
|
||||
"admin-lte": "~2.4.8",
|
||||
"bootstrap-sass": "^3.3.7",
|
||||
"bootstrap-select": "^1.13.1",
|
||||
"chart.js": "~2.7.2",
|
||||
|
||||
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.
|
Before Width: | Height: | Size: 121 KiB |
@@ -1,9 +1,8 @@
|
||||
{
|
||||
"build/app.js": "/build/app.js?677d965d103e8d9800c9",
|
||||
"build/app.css": "/build/app.css?921dcef8f150f460b1e6bfe0e0e17aa7",
|
||||
"build/app.js": "/build/app.js?a67489c4fc07f30e6f86",
|
||||
"build/app.css": "/build/app.css?4a410e64531e74d755b949cc6e2b2697",
|
||||
"build/fonts/fa-solid-900.woff": "/build/fonts/fa-solid-900.woff?dfc040d5",
|
||||
"build/images/boxed-bg.jpg": "/build/images/boxed-bg.jpg?7799dece",
|
||||
"build/images/blue.png": "/build/images/blue.png?96f8a905",
|
||||
"build/images/blue@2x.png": "/build/images/blue@2x.png?2694acfd",
|
||||
"build/fonts/fa-solid-900.woff2": "/build/fonts/fa-solid-900.woff2?e8a92a29",
|
||||
"build/images/fa-solid-900.svg": "/build/images/fa-solid-900.svg?666a82cb",
|
||||
"build/images/glyphicons-halflings-regular.svg": "/build/images/glyphicons-halflings-regular.svg?89889688",
|
||||
@@ -14,7 +13,7 @@
|
||||
"build/fonts/fa-brands-400.woff": "/build/fonts/fa-brands-400.woff?e9f83339",
|
||||
"build/fonts/glyphicons-halflings-regular.woff2": "/build/fonts/glyphicons-halflings-regular.woff2?448c34a5",
|
||||
"build/fonts/fa-solid-900.eot": "/build/fonts/fa-solid-900.eot?0b93480e",
|
||||
"build/images/blue@2x.png": "/build/images/blue@2x.png?2694acfd",
|
||||
"build/images/blue.png": "/build/images/blue.png?96f8a905",
|
||||
"build/fonts/fa-regular-400.woff": "/build/fonts/fa-regular-400.woff?d9e29124",
|
||||
"build/fonts/fa-regular-400.woff2": "/build/fonts/fa-regular-400.woff2?930c1264",
|
||||
"build/images/fa-regular-400.svg": "/build/images/fa-regular-400.svg?4e41caaf",
|
||||
|
||||
Reference in New Issue
Block a user