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

Merge branch 'master' into elastic-indexer

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Damien Alexandre
2014-09-08 11:39:02 +02:00
parent 0bbd028969 792e29a307
commit ab07cb8e17
2224 changed files with 1709 additions and 14016 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/crossdomain.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0"?>
<!DOCTYPE cross-domain-policy SYSTEM
"http://www.macromedia.com/xml/dtds/cross-domain-policy.dtd">
<cross-domain-policy>
<allow-access-from domain="*.cooliris.com" secure="false" />
</cross-domain-policy>

4
www/include/js/tests/jquery.Edit.js.html
View File

@@ -4,9 +4,9 @@
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="../../../assets/jquery/jquery.js"></script>
<script src="../../../../tmp-assets/qunit/qunit/qunit.js"></script>
<script src="../../../assets/qunit/qunit.js"></script>
<script src="../jquery.Edit.js"></script>
<link type="text/css" rel="stylesheet" href="../../../../tmp-assets/qunit/qunit/qunit.css"/>
<link type="text/css" rel="stylesheet" href="../../../assets/qunit/qunit.css"/>
<script> $(document).ready(function(){
// disable log messages in tests

4
www/include/js/tests/jquery.Selection.js.html
View File

@@ -4,9 +4,9 @@
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="../../../assets/jquery/jquery.js"></script>
<script src="../../../../tmp-assets/qunit/qunit/qunit.js"></script>
<script src="../../../assets/qunit/qunit.js"></script>
<script src="../jquery.Selection.js"></script>
<link type="text/css" rel="stylesheet" href="../../../../tmp-assets/qunit/qunit/qunit.css"/>
<link type="text/css" rel="stylesheet" href="../../../assets/qunit/qunit.css"/>
<script> $(document).ready(function(){

4
www/include/js/tests/jquery.Upload.js.html
View File

@@ -5,10 +5,10 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<script src="../../../assets/jquery/jquery.js"></script>
<script src="../../../assets/jquery.ui/jquery-ui.js"></script>
<script src="../../../../tmp-assets/qunit/qunit/qunit.js"></script>
<script src="../../../assets/qunit/qunit.js"></script>
<script src="../../../assets/blueimp-load-image/load-image.js"></script>
<script src="../../../skins/prod/jquery.Upload.js"></script>
<link type="text/css" rel="stylesheet" href="../../../../tmp-assets/qunit/qunit/qunit.css"/>
<link type="text/css" rel="stylesheet" href="../../../assets/qunit/qunit.css"/>
<script> $(document).ready(function(){
var getUploadManager = function(){

6
www/scripts/tests/admin.html
View File

@@ -3,12 +3,12 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Mocha Spec Runner</title>
<link rel="stylesheet" href="./../../../tmp-assets/mocha/mocha.css">
<link rel="stylesheet" href="../../assets//mocha/mocha.css">
</head>
<body>
<div id="mocha"></div>
<script src="./../../../tmp-assets/mocha/mocha.js"></script>
<script src="./../../../tmp-assets/sinonjs/sinon.js"></script>
<script src="../../assets/mocha/mocha.js"></script>
<script src="../../assets/sinonjs/sinon.js"></script>
<script src="../../assets/requirejs/require.js"></script>
<script src="common.js"></script>
<script type="text/javascript">

8
www/scripts/tests/common.js
View File

@@ -1,14 +1,14 @@
require.config({
baseUrl: "../../scripts",
paths: {
"chai" : "../../tmp-assets/chai/chai",
"fixtures": "../../tmp-assets/js-fixtures/fixtures",
"chai" : "../assets/chai/chai",
"fixtures": "../assets/js-fixtures/fixtures",
"jquery": "../assets/jquery/jquery",
"backbone": "../assets/backbone-amd/backbone",
"i18n": "../assets/i18next/i18next.amd-1.6.3",
"bootstrap": "../assets/bootstrap/js/bootstrap.min",
"sinonchai": "../../tmp-assets/sinon-chai/lib/sinon-chai",
"squire": "../../tmp-assets/squire/src/Squire",
"sinonchai": "../assets/sinon-chai/sinon-chai",
"squire": "../assets/squire/Squire",
"jquery.ui": "../assets/jquery.ui/jquery-ui",
"underscore": "../assets/underscore-amd/underscore",
"jquery.ui.widget": "../assets/jquery-file-upload/jquery.ui.widget",

6
www/scripts/tests/login.html
View File

@@ -3,12 +3,12 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Mocha Spec Runner</title>
<link rel="stylesheet" href="./../../../tmp-assets/mocha/mocha.css">
<link rel="stylesheet" href="../../assets/mocha/mocha.css">
</head>
<body>
<div id="mocha"></div>
<script src="./../../../tmp-assets/mocha/mocha.js"></script>
<script src="./../../../tmp-assets/sinonjs/sinon.js"></script>
<script src="../../assets/mocha/mocha.js"></script>
<script src="../../assets/sinonjs/sinon.js"></script>
<script src="../../assets/requirejs/require.js"></script>
<script src="common.js"></script>
<script>

6
www/scripts/tests/model.html
View File

@@ -3,12 +3,12 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Mocha Spec Runner</title>
<link rel="stylesheet" href="./../../../tmp-assets/mocha/mocha.css">
<link rel="stylesheet" href="../../assets/mocha/mocha.css">
</head>
<body>
<div id="mocha"></div>
<script src="./../../../tmp-assets/mocha/mocha.js"></script>
<script src="./../../../tmp-assets/sinonjs/sinon.js"></script>
<script src="../../assets/mocha/mocha.js"></script>
<script src="../../assets/sinonjs/sinon.js"></script>
<script src="../../assets/requirejs/require.js"></script>
<script src="common.js"></script>
<script>

6
www/scripts/tests/validator.html
View File

@@ -3,12 +3,12 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Mocha Spec Runner</title>
<link rel="stylesheet" href="./../../../tmp-assets/mocha/mocha.css">
<link rel="stylesheet" href="../../assets/mocha/mocha.css">
</head>
<body>
<div id="mocha"></div>
<script src="./../../../tmp-assets/mocha/mocha.js"></script>
<script src="./../../../tmp-assets/sinonjs/sinon.js"></script>
<script src="../../assets/mocha/mocha.js"></script>
<script src="../../assets/sinonjs/sinon.js"></script>
<script src="../../assets/requirejs/require.js"></script>
<script src="common.js"></script>
<script>

6
www/scripts/tests/websocket.html
View File

@@ -3,12 +3,12 @@
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Mocha Spec Runner</title>
<link rel="stylesheet" href="./../../../tmp-assets/mocha/mocha.css">
<link rel="stylesheet" href="../../assets/mocha/mocha.css">
</head>
<body>
<div id="mocha"></div>
<script src="./../../../tmp-assets/mocha/mocha.js"></script>
<script src="./../../../tmp-assets/sinonjs/sinon.js"></script>
<script src="../../assets/mocha/mocha.js"></script>
<script src="../../assets/sinonjs/sinon.js"></script>
<script src="../../assets/requirejs/require.js"></script>
<script src="common.js"></script>
<script>