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:
	README.md
	composer.json
	composer.lock
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php
	lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/API/V1/result.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/schedulerState.php
	lib/classes/module/console/schedulerStop.php
	lib/classes/module/console/taskrun.php
	lib/classes/set/export.php
	lib/conf.d/_GV_template.inc
	lib/conf.d/configuration.yml
	templates/web/admin/setup.html.twig
	templates/web/admin/tasks/list.html.twig
	templates/web/api/auth/end_user_authorization.html.twig
	templates/web/prod/actions/Feedback/list.html.twig
	templates/web/prod/actions/publish/publish.html.twig
	templates/web/prod/upload/upload.html.twig
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/api/v1/api_v1_resultTest.php
This commit is contained in:
Nicolas Le Goff
2014-08-11 20:28:03 +02:00
parent 8994232022 26190331ed
commit 2899f152fb
2067 changed files with 123662 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
www/skins/login/less/skin.less
View File

@@ -514,7 +514,7 @@ button[type=submit] {
box-radius: @inputBorderRadius !important;
}
.input-table input {
.input-table input, .input-table select, .input-table textarea {
border: @inputBorder !important;
background-color: @inputBackground !important;
color: @textColor !important;

1
www/skins/prod/000000/prodcolor.css
View File

@@ -2200,7 +2200,6 @@ DIV.thesaurus U.w {
}
.GRP_IMAGE_REP {
background-color: #B1B1B1;
margin: 5px;
padding: 5px;
position: absolute;

1
www/skins/prod/959595/prodcolor.css
View File

@@ -2244,7 +2244,6 @@ DIV.thesaurus U.w {
}
.GRP_IMAGE_REP {
background-color: #B1B1B1;
margin: 5px;
padding: 5px;
position: absolute;

12
www/skins/prod/jquery.Feedback.js
View File

@@ -149,13 +149,13 @@
buttons[language.send] = function () {
if ($.trim($('input[name="name"]', $dialog.getDomElement()).val()) === '') {
options = {
var options = {
size: 'Alert',
closeButton: true,
title: language.warning
},
$dialog = p4.Dialog.Create(options, 3);
$dialog.setContent(language.FeedBackNameMandatory);
}
var $dialogAlert = p4.Dialog.Create(options, 3);
$dialogAlert.setContent(language.FeedBackNameMandatory);
return false;
}
@@ -514,7 +514,7 @@
var options = {
cancelButton: true,
buttons: buttons,
size: 'Alert'
size: '700x170'
};
p4.Dialog.Create(options, 2).setContent(box);
@@ -626,7 +626,7 @@
$('button.deleter', $container).bind('click', function (event) {
var list_id = $(this).find('input[name=list_id]').val();
var list_id = $(this).data("list-id");
var makeDialog = function (box) {

6
www/skins/prod/jquery.WorkZone.js
View File

@@ -155,6 +155,8 @@ var p4 = p4 || {};
}
selectedItem.remove();
} else {
return p4.WorkZone.reloadCurrent();
}
} else {
humane.error(data.message);
@@ -308,8 +310,8 @@ var p4 = p4 || {};
$('a.WorkZoneElementRemover', dest).bind('mousedown',function (event) {
return false;
}).bind('click', function (event) {
return WorkZoneElementRemover($(this), false);
});
return WorkZoneElementRemover($(this), false);
});
dest.droppable({
accept: function (elem) {