Skip to content

P
Platform
Commit 4f65e6d2 authored by Nicolas Widart's avatar Nicolas Widart
Browse files
Options

Updating dependencies

parent 5af96601
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 47 deletions
composer.lock
View file @ 4f65e6d2
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/AsgardCms/AdminLTE.git", "url": "https://github.com/AsgardCms/AdminLTE.git",
"reference": "e4cb1fd8d2d4116d5e809207ac500758a8f695ef" "reference": "fe2d87dd11f13ed08bee10d9a22ee7d25ad69eae"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/AsgardCms/AdminLTE/zipball/e4cb1fd8d2d4116d5e809207ac500758a8f695ef", "url": "https://api.github.com/repos/AsgardCms/AdminLTE/zipball/fe2d87dd11f13ed08bee10d9a22ee7d25ad69eae",
"reference": "e4cb1fd8d2d4116d5e809207ac500758a8f695ef", "reference": "fe2d87dd11f13ed08bee10d9a22ee7d25ad69eae",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
"keywords": [ "keywords": [
"asgard-cms" "asgard-cms"
], ],
"time": "2015-04-21 11:49:29" "time": "2015-04-29 06:51:37"
}, },
{ {
"name": "asgardcms/core-module", "name": "asgardcms/core-module",
...@@ -48,12 +48,12 @@ ...@@ -48,12 +48,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/AsgardCms/Core.git", "url": "https://github.com/AsgardCms/Core.git",
"reference": "3135fa2228fc38717a32202f8fb5116ff475faa5" "reference": "baba28b5588b44c1dcebaec7009b7f619628f0b3"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/AsgardCms/Core/zipball/3135fa2228fc38717a32202f8fb5116ff475faa5", "url": "https://api.github.com/repos/AsgardCms/Core/zipball/baba28b5588b44c1dcebaec7009b7f619628f0b3",
"reference": "3135fa2228fc38717a32202f8fb5116ff475faa5", "reference": "baba28b5588b44c1dcebaec7009b7f619628f0b3",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
"asgardcms", "asgardcms",
"core" "core"
], ],
"time": "2015-04-21 09:10:25" "time": "2015-04-28 20:17:55"
}, },
{ {
"name": "asgardcms/dashboard-module", "name": "asgardcms/dashboard-module",
...@@ -171,12 +171,12 @@ ...@@ -171,12 +171,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/AsgardCms/Media.git", "url": "https://github.com/AsgardCms/Media.git",
"reference": "c9832a0eef0beb5e4fbbef451dcd84345ca90460" "reference": "b7af4683c5e893946e4b93dc9a04353a8520b9e6"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/AsgardCms/Media/zipball/c9832a0eef0beb5e4fbbef451dcd84345ca90460", "url": "https://api.github.com/repos/AsgardCms/Media/zipball/b7af4683c5e893946e4b93dc9a04353a8520b9e6",
"reference": "c9832a0eef0beb5e4fbbef451dcd84345ca90460", "reference": "b7af4683c5e893946e4b93dc9a04353a8520b9e6",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
"library", "library",
"media" "media"
], ],
"time": "2015-04-17 18:17:03" "time": "2015-04-29 11:14:44"
}, },
{ {
"name": "asgardcms/menu-module", "name": "asgardcms/menu-module",
...@@ -218,12 +218,12 @@ ...@@ -218,12 +218,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/AsgardCms/Menu.git", "url": "https://github.com/AsgardCms/Menu.git",
"reference": "ca625d50dfb61837815dabb2c2177b8d78a5629d" "reference": "67cd5a8d8686ef786aa7856f6700017e00d17568"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/AsgardCms/Menu/zipball/ca625d50dfb61837815dabb2c2177b8d78a5629d", "url": "https://api.github.com/repos/AsgardCms/Menu/zipball/67cd5a8d8686ef786aa7856f6700017e00d17568",
"reference": "ca625d50dfb61837815dabb2c2177b8d78a5629d", "reference": "67cd5a8d8686ef786aa7856f6700017e00d17568",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
"nested sets", "nested sets",
"tree" "tree"
], ],
"time": "2015-04-25 19:44:28" "time": "2015-04-28 19:27:50"
}, },
{ {
"name": "asgardcms/page-module", "name": "asgardcms/page-module",
...@@ -267,12 +267,12 @@ ...@@ -267,12 +267,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/AsgardCms/Page.git", "url": "https://github.com/AsgardCms/Page.git",
"reference": "165a80ae46ef89d08feffaea949b12cdcb4c751b" "reference": "31fe7b10884ded7fca10bf7a68a57a5bd7df4d01"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/AsgardCms/Page/zipball/165a80ae46ef89d08feffaea949b12cdcb4c751b", "url": "https://api.github.com/repos/AsgardCms/Page/zipball/31fe7b10884ded7fca10bf7a68a57a5bd7df4d01",
"reference": "165a80ae46ef89d08feffaea949b12cdcb4c751b", "reference": "31fe7b10884ded7fca10bf7a68a57a5bd7df4d01",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
"asgardcms", "asgardcms",
"pages" "pages"
], ],
"time": "2015-04-17 18:16:11" "time": "2015-04-28 18:49:37"
}, },
{ {
"name": "asgardcms/setting-module", "name": "asgardcms/setting-module",
...@@ -304,12 +304,12 @@ ...@@ -304,12 +304,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/AsgardCms/Setting.git", "url": "https://github.com/AsgardCms/Setting.git",
"reference": "3b5de8c0dd51d950ea517c927a1f62241975d2eb" "reference": "486b8b14f281b5ffdeaafefc347f4ff844cf1974"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/AsgardCms/Setting/zipball/3b5de8c0dd51d950ea517c927a1f62241975d2eb", "url": "https://api.github.com/repos/AsgardCms/Setting/zipball/486b8b14f281b5ffdeaafefc347f4ff844cf1974",
"reference": "3b5de8c0dd51d950ea517c927a1f62241975d2eb", "reference": "486b8b14f281b5ffdeaafefc347f4ff844cf1974",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
"Settings", "Settings",
"asgardcms" "asgardcms"
], ],
"time": "2015-04-21 10:10:59" "time": "2015-04-28 19:14:27"
}, },
{ {
"name": "asgardcms/user-module", "name": "asgardcms/user-module",
...@@ -346,12 +346,12 @@ ...@@ -346,12 +346,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/AsgardCms/User.git", "url": "https://github.com/AsgardCms/User.git",
"reference": "16d5f499fe8aa7943753591f3d9de7a4673ebaf4" "reference": "df7f49b9e4301f2372e07577a990d09d25de06d2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/AsgardCms/User/zipball/16d5f499fe8aa7943753591f3d9de7a4673ebaf4", "url": "https://api.github.com/repos/AsgardCms/User/zipball/df7f49b9e4301f2372e07577a990d09d25de06d2",
"reference": "16d5f499fe8aa7943753591f3d9de7a4673ebaf4", "reference": "df7f49b9e4301f2372e07577a990d09d25de06d2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -377,7 +377,7 @@ ...@@ -377,7 +377,7 @@
"authorisation", "authorisation",
"user" "user"
], ],
"time": "2015-04-27 17:41:49" "time": "2015-04-28 19:14:26"
}, },
{ {
"name": "asgardcms/workshop-module", "name": "asgardcms/workshop-module",
...@@ -385,12 +385,12 @@ ...@@ -385,12 +385,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/AsgardCms/Workshop.git", "url": "https://github.com/AsgardCms/Workshop.git",
"reference": "35da4dfacf204b39736a69ca650b88378a917588" "reference": "b98b6f2b8cc73ba0e3c839e797518ac8bf390c2b"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/AsgardCms/Workshop/zipball/35da4dfacf204b39736a69ca650b88378a917588", "url": "https://api.github.com/repos/AsgardCms/Workshop/zipball/b98b6f2b8cc73ba0e3c839e797518ac8bf390c2b",
"reference": "35da4dfacf204b39736a69ca650b88378a917588", "reference": "b98b6f2b8cc73ba0e3c839e797518ac8bf390c2b",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -422,7 +422,7 @@ ...@@ -422,7 +422,7 @@
"modules", "modules",
"workshop" "workshop"
], ],
"time": "2015-04-24 14:39:00" "time": "2015-04-28 08:50:34"
}, },
{ {
"name": "cartalyst/sentry", "name": "cartalyst/sentry",
...@@ -2542,12 +2542,12 @@ ...@@ -2542,12 +2542,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/pingpong-labs/modules.git", "url": "https://github.com/pingpong-labs/modules.git",
"reference": "7cd411a3540ebbf194e8ce8c3be51c3a237a1d3d" "reference": "d7dbb30cd3d52bf0e91d7eb72979275331c98769"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/pingpong-labs/modules/zipball/7cd411a3540ebbf194e8ce8c3be51c3a237a1d3d", "url": "https://api.github.com/repos/pingpong-labs/modules/zipball/d7dbb30cd3d52bf0e91d7eb72979275331c98769",
"reference": "7cd411a3540ebbf194e8ce8c3be51c3a237a1d3d", "reference": "d7dbb30cd3d52bf0e91d7eb72979275331c98769",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -2591,7 +2591,7 @@ ...@@ -2591,7 +2591,7 @@
"modules", "modules",
"pingpong" "pingpong"
], ],
"time": "2015-04-20 15:10:19" "time": "2015-04-28 20:44:10"
}, },
{ {
"name": "psr/log", "name": "psr/log",
...@@ -3935,16 +3935,16 @@ ...@@ -3935,16 +3935,16 @@
}, },
{ {
"name": "phpspec/prophecy", "name": "phpspec/prophecy",
"version": "1.4.0", "version": "v1.4.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/phpspec/prophecy.git", "url": "https://github.com/phpspec/prophecy.git",
"reference": "8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5" "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/phpspec/prophecy/zipball/8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5", "url": "https://api.github.com/repos/phpspec/prophecy/zipball/3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
"reference": "8724cd239f8ef4c046f55a3b18b4d91cc7f3e4c5", "reference": "3132b1f44c7bf2ec4c7eb2d3cb78fdeca760d373",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -3991,7 +3991,7 @@ ...@@ -3991,7 +3991,7 @@
"spy", "spy",
"stub" "stub"
], ],
"time": "2015-03-27 19:31:25" "time": "2015-04-27 22:15:08"
}, },
{ {
"name": "phpunit/php-code-coverage", "name": "phpunit/php-code-coverage",
...@@ -4241,16 +4241,16 @@ ...@@ -4241,16 +4241,16 @@
}, },
{ {
"name": "phpunit/phpunit", "name": "phpunit/phpunit",
"version": "4.6.4", "version": "4.6.5",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git", "url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "163232991e652e6efed2f8470326fffa61e848e2" "reference": "1c54dd1d9a782d7c8715bb3604cde7b6e23c2614"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/163232991e652e6efed2f8470326fffa61e848e2", "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1c54dd1d9a782d7c8715bb3604cde7b6e23c2614",
"reference": "163232991e652e6efed2f8470326fffa61e848e2", "reference": "1c54dd1d9a782d7c8715bb3604cde7b6e23c2614",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
...@@ -4309,7 +4309,7 @@ ...@@ -4309,7 +4309,7 @@
"testing", "testing",
"xunit" "xunit"
], ],
"time": "2015-04-11 05:23:21" "time": "2015-04-29 05:04:43"
}, },
{ {
"name": "phpunit/phpunit-mock-objects", "name": "phpunit/phpunit-mock-objects",
......
public/modules/Media/js/init-dropzone.js 0 → 100644
View file @ 4f65e6d2
$( document ).ready(function() {
Dropzone.autoDiscover = false;
var myDropzone = new Dropzone(".dropzone", {
url: '/api/file',
autoProcessQueue: true,
maxFilesize: maxFilesize,
acceptedFiles : acceptedFiles
});
myDropzone.on("success", function(file, http) {
window.setTimeout(function(){
location.reload();
}, 1000);
});
myDropzone.on("sending", function(file, fromData) {
if ($('.alert-danger').length > 0) {
$('.alert-danger').remove();
}
});
myDropzone.on("error", function(file, errorMessage) {
var html = '<div class="alert alert-danger" role="alert">' + errorMessage.error + '</div>';
$('.col-md-12').first().prepend(html);
setTimeout(function() {
myDropzone.removeFile(file);
}, 2000);
});
});
public/themes/adminlte/css/asgard.css
View file @ 4f65e6d2
...@@ -20,7 +20,7 @@ footer.main-footer p.text-muted { ...@@ -20,7 +20,7 @@ footer.main-footer p.text-muted {
margin-top: -30px; margin-top: -30px;
} }
.skin-blue .sidebar-menu .append:hover, .skin-blue .sidebar-menu .append:hover,
.skin-blue .sidebar-menu > li.active > a:last-child { .skin-blue .sidebar-menu > li.active > a.append {
color: #fff; color: #fff;
background: none; background: none;
border: 0; border: 0;
......
public/themes/adminlte/js/main.js 0 → 100644
View file @ 4f65e6d2
$(document).ready(function () {
$("form").sisyphus();
});
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023