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 '3.8'

Browse Source 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
	lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Prod/Story.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/User/Adapter.php
	lib/classes/databox.php
	lib/classes/media/subdef.php
	lib/classes/module/report.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/module/report/nav.php
	lib/classes/module/report/question.php
	lib/classes/module/report/sqlaction.php
	lib/classes/module/report/sqlconnexion.php
	lib/classes/module/report/sqldownload.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/task/abstract.php
	locale/de_DE/LC_MESSAGES/phraseanet.mo
	locale/de_DE/LC_MESSAGES/phraseanet.po
	locale/en_GB/LC_MESSAGES/phraseanet.mo
	locale/en_GB/LC_MESSAGES/phraseanet.po
	locale/fr_FR/LC_MESSAGES/phraseanet.mo
	locale/fr_FR/LC_MESSAGES/phraseanet.po
	locale/nl_NL/LC_MESSAGES/phraseanet.mo
	locale/nl_NL/LC_MESSAGES/phraseanet.po
	locale/phraseanet.pot
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/report/activityTest.php
	tests/classes/report/editTest.php
This commit is contained in:
Nicolas Le Goff
2014-12-09 13:59:29 +01:00
parent 7d0a69c7b9 3aa8107fb0
commit 9f38823f27
55 changed files with 1106 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/skins/prod/jquery.main-prod.js
View File

@@ -761,7 +761,7 @@ $(document).ready(function () {
var parent = searchForm.parent();
var options = {
size: 'Full',
size: (bodySize.x - 120)+'x'+(bodySize.y - 120),
loading: false,
closeCallback: function (dialog) {

4
www/skins/report/jquery-ui-theme/report-base/jquery-ui-1.10.3.custom.css vendored
View File

@@ -823,7 +823,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-default,
.ui-widget-header .ui-state-default {
border: 1px solid #202020;
background: #313131 url(images/ui-bg_flat_75_313131_40x100.png) 50% 50% repeat-x;
background: #313131 url(images/ui-bg_flat_75_d2d1cf_40x100.png) 50% 50% repeat-x;
font-weight: bold;
color: #ffffff;
}
@@ -855,7 +855,7 @@ body .ui-tooltip {
.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active {
border: 1px solid #202020;
background: #555555 url(images/ui-bg_flat_65_555555_40x100.png) 50% 50% repeat-x;
background: #555555 url(images/ui-bg_flat_75_d2d1cf_40x100.png) 50% 50% repeat-x;
font-weight: bold;
color: #ff9000;
}

9
www/skins/report/report.js
View File

@@ -64,7 +64,8 @@ function bindEvents() {
$('#dminDash, #dmaxDash').datepicker({
changeMonth: true,
changeYear: true,
dateFormat: 'dd-mm-yy',
// dateFormat: 'dd-mm-yy',
dateFormat: 'yy-mm-dd',
numberOfMonths: 1,
maxDate: "-0d"
});
@@ -119,7 +120,8 @@ function reportDatePicker() {
defaultDate: -10,
changeMonth: true,
changeYear: true,
dateFormat: 'dd-mm-yy',
// dateFormat: 'dd-mm-yy',
dateFormat: 'yy-mm-dd',
numberOfMonths: 3,
maxDate: "-0d",
onSelect: function (selectedDate, instance) {
@@ -136,7 +138,8 @@ function dashboardDatePicker() {
defaultDate: -3,
changeMonth: true,
changeYear: true,
dateFormat: 'dd-mm-yy',
// dateFormat: 'dd-mm-yy',
dateFormat: 'yy-mm-dd',
numberOfMonths: 3,
maxDate: "-0d"
});

2
www/skins/thesaurus/win.js
View File

@@ -1638,7 +1638,7 @@ function GUI(varname, idbody, skin) {
node.style.left = "50px";
node.style.zIndex = 99;
node.style.visibility = "hidden";
node.src = "cursors/nodrop01.gif";
node.src = "/skins/icons/nodrop01.gif";
dragObj.objCursor = desk.appendChild(node);
desk.onmousemove = function (e) {