Merge branch 'develop' of https://github.com/tainacan/tainacan into develop

This commit is contained in:
weryques 2018-07-12 10:47:22 -03:00
commit e2bff2942d
4 changed files with 12 additions and 6 deletions

View File

@ -1,5 +1,5 @@
<template> <template>
<div> <div class="extra-margin">
<collections-filter <collections-filter
:open="collapsed" :open="collapsed"
:query="getQuery" :query="getQuery"
@ -40,3 +40,9 @@
} }
} }
</script> </script>
<style>
.extra-margin {
margin-bottom: 40px;
}
</style>

View File

@ -67,7 +67,7 @@ class CSV extends Importer {
$column = $this->handle_encoding( $values[ $cont ] ); $column = $this->handle_encoding( $values[ $cont ] );
$processedItem[ $header ] = ( $metadatum->get_multiple() ) ? $processedItem[ $header ] = ( $metadatum->is_multiple() ) ?
explode( $this->get_option('multivalued_delimiter'), $column) : $column; explode( $this->get_option('multivalued_delimiter'), $column) : $column;
$cont++; $cont++;

View File

@ -2,9 +2,9 @@
Contributors: fabianobn, jacsonp, leogermani, weryques, wetah Contributors: fabianobn, jacsonp, leogermani, weryques, wetah
Tags: museums, libraries, archives, GLAM, collections, repository Tags: museums, libraries, archives, GLAM, collections, repository
Requires at least: 4.8 Requires at least: 4.8
Tested up to: 4.9 Tested up to: 4.9.7
Requires PHP: 5.6 Requires PHP: 5.6
Stable tag: 0.1 Stable tag: 0.2
License: GPLv2 or later License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-3.0.html License URI: http://www.gnu.org/licenses/gpl-3.0.html

View File

@ -4,7 +4,7 @@ Plugin Name: Tainacan
Plugin URI: https://tainacan.org/new Plugin URI: https://tainacan.org/new
Description: powerfull and flexible repository platform for WordPress. Manage and publish you digital collections as easily as publishing a post to your blog, while having all the tools of a professional respository platform. Description: powerfull and flexible repository platform for WordPress. Manage and publish you digital collections as easily as publishing a post to your blog, while having all the tools of a professional respository platform.
Author: Media Lab / UFG Author: Media Lab / UFG
Version: 0.1 Version: 0.2
Text Domain: tainacan Text Domain: tainacan
License: GPLv2 or later License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-3.0.html License URI: http://www.gnu.org/licenses/gpl-3.0.html