hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 12:33:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.8'

Browse Source
This commit is contained in:
Romain Neutron
2013-11-12 13:26:15 +01:00
parent 89fb774f96 e48c2cc158
commit 3cf2cbd6f1
78 changed files with 5184 additions and 6309 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
www/scripts/tests/main.js
View File

@@ -13,7 +13,7 @@ require.config({
bootstrap: "../assets/bootstrap/js/bootstrap.min"
},
shim: {
bootstrap : ["jquery"],
bootstrap: ["jquery"],
jqueryui: {
deps: ["jquery"]
}
@@ -26,11 +26,12 @@ mocha.setup({
globals: ['js-fixtures']
});
console = window.console || function() {};
console = window.console || function () {
};
window.notrack = true;
var runMocha = function() {
var runMocha = function () {
if (window.mochaPhantomJS) {
mochaPhantomJS.run();
} else {