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' into fix-latest-merge

Browse Source 
Conflicts:
	CHANGELOG.md
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Media/Subdef/Image.php
	lib/conf.d/_GV_template.inc
	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
	templates/web/prod/Story/Reorder.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Download/prepare.html.twig
	templates/web/prod/templates/push.html.twig
This commit is contained in:
Nicolas Le Goff
2014-07-11 17:19:39 +02:00
parent 24b885eb7c b4141f92a7
commit 3565d1c795
20 changed files with 300 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
www/include/jquery.tooltip.js
View File

@@ -414,7 +414,10 @@
}
if (resizeImgTips) {
var factor = Math.max(Math.min((width - 45) / width, (height - 75) / height), 1);
var factor = Math.min((width - 45) / width, (height - 75) / height);
if (factor > 1) {
factor = 1;
}
var imgWidth = Math.round(width * factor);
var imgHeight = Math.round(height * factor);

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

@@ -184,7 +184,7 @@ function submiterAction(domSubmiter) {
request = $.ajax({
type: "POST",
url: "/index_dev.php/report/init",
url: "/report/init",
data: data,
beforeSend: function () {
container.find('.content').empty();