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 remote-tracking branch 'upstream/3.8'

Browse Source 
Conflicts:
	bower.json
	composer.lock
	lib/Alchemy/Phrasea/Application/Api.php
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/User/Query.php
	lib/classes/patch/320alpha4b.php
	templates/web/admin/statusbit.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/lazaret.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	www/scripts/apps/login/home/config.js
	www/skins/prod/000000/prodcolor.css
	www/skins/prod/959595/prodcolor.css
This commit is contained in:
Nicolas Le Goff
2015-02-23 19:16:56 +01:00
parent f06cb7eaec b6f6fe3217
commit 5b3e699599
31 changed files with 740 additions and 494 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
www/scripts/apps/login/home/config.js
View File

@@ -15,9 +15,9 @@ require.config({
"jquery.ui": "../assets/jquery.ui/jquery-ui",
underscore: "../assets/underscore-amd/underscore",
backbone: "../assets/backbone-amd/backbone",
i18n: "../assets/i18next/i18next.amd-1.6.3",
bootstrap: "../assets/bootstrap/js/bootstrap.min",
multiselect: "../assets/bootstrap-multiselect/js/bootstrap-multiselect",
i18n: "../assets/i18next/release/i18next.amd-1.6.2.min",
bootstrap: "../skins/build/bootstrap/js/bootstrap.min",
multiselect: "../assets/bootstrap-multiselect/dist/js/bootstrap-multiselect",
"jquery.geonames": "../assets/geonames-server-jquery-plugin/jquery.geonames"
},
shim: {

5
www/skins/admin/css/Bases.css
View File

@@ -75,3 +75,8 @@ div[id$="_indexed_percent"] {
a.btn {
text-decoration: none;
}
.status-img {
max-width: 16px;
max-heigh: 16px;
}

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

@@ -4360,3 +4360,8 @@ ui-dialog-titlebar {
max-width: 16px;
max-heigh: 16px;
}
#answers .status img {
max-width: 16px;
max-heigh: 16px;
}

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

@@ -4364,3 +4364,8 @@ ui-dialog-titlebar {
max-width: 16px;
max-heigh: 16px;
}
#answers .status img {
max-width: 16px;
max-heigh: 16px;
}

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

@@ -762,6 +762,7 @@ $(document).ready(function () {
var $record_types = $('#recordtype_sel');
if ($this.hasClass('mode_type_reg')) {
$record_types.hide();
$record_types.prop("selectedIndex", 0);
} else {
$record_types.show();
}