Claire Hernandez [Mon, 6 Feb 2012 16:17:27 +0000 (17:17 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/itt
Conflicts solved:
installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/updatedatabase.pl
kohaversion.pl
Julian Maurice [Wed, 1 Feb 2012 08:46:19 +0000 (09:46 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Wed, 1 Feb 2012 08:44:11 +0000 (09:44 +0100)]
[SOLR] Fix kohaversion
Julian Maurice [Wed, 1 Feb 2012 08:10:57 +0000 (09:10 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Solved conflicts:
installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/updatedatabase.pl
Julian Maurice [Wed, 1 Feb 2012 08:04:19 +0000 (09:04 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8735' into dev/solr
Julian Maurice [Fri, 27 Jan 2012 08:59:26 +0000 (09:59 +0100)]
MT4587: Add missing sysprefs
hidenoitems in updatedatabase.pl and sysprefs.sql files (en and fr)
OpacHiddenItems in sysprefs.sql files (en and fr)
(cherry picked from commit
b626f557b132ef057fe9ed36f881f50771f4efe6)
Solved Conflicts:
installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
installer/data/mysql/updatedatabase.pl
Julian Maurice [Thu, 26 Jan 2012 14:36:55 +0000 (15:36 +0100)]
MT8887: Fix call to SimpleSearch in acqui/tables/orders.pl
Julian Maurice [Thu, 26 Jan 2012 13:30:12 +0000 (14:30 +0100)]
MT8868: Fix call to SimpleSearch in C4::Serials
sub GetSubscriptionsByFirstLetters
Jonathan Druart [Wed, 7 Sep 2011 14:06:40 +0000 (16:06 +0200)]
MT7667: Store in uppercase member surnames
(cherry picked from commit
278fd5e3613ba1f5ce26a8c24c535c888f41c73d)
Julian Maurice [Wed, 25 Jan 2012 13:07:08 +0000 (14:07 +0100)]
Fix merge of dev/stetienne into dev/itt
Claire Hernandez [Wed, 25 Jan 2012 10:35:44 +0000 (11:35 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Tue, 24 Jan 2012 14:40:11 +0000 (15:40 +0100)]
MT8654: Check 100$a pos 28-29 to detect encoding
Julian Maurice [Wed, 25 Jan 2012 09:48:08 +0000 (10:48 +0100)]
Merge remote-tracking branch 'origin/itt/ft/MT6869' into dev/itt
Solved conflicts:
installer/data/mysql/updatedatabase.pl
kohaversion.pl
Julian Maurice [Wed, 25 Jan 2012 09:15:37 +0000 (10:15 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Wed, 25 Jan 2012 09:10:38 +0000 (10:10 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT7654' into dev/solr
Julian Maurice [Wed, 25 Jan 2012 09:08:09 +0000 (10:08 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8746' into dev/solr
Jonathan Druart [Tue, 17 Jan 2012 13:58:09 +0000 (14:58 +0100)]
[SOLR] MT8746: Perfs: Exit after redirect to opac maintenance
Julian Maurice [Wed, 25 Jan 2012 09:07:13 +0000 (10:07 +0100)]
Merge remote-tracking branch 'origin/solr/ft/optim' into dev/solr
Claire Hernandez [Tue, 24 Jan 2012 08:36:03 +0000 (09:36 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/itt
Conflicts solved: (complex conflicts)
koha-tmpl/opac-tmpl/prog/en/includes/doc-head-close.inc
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
opac/opac-detail.pl
opac/opac-search.pl
Jonathan Druart [Thu, 19 Jan 2012 13:30:44 +0000 (14:30 +0100)]
[SOLR] Fix call to SimpleSearch in C4::RPN2SOLR
Julian Maurice [Wed, 18 Jan 2012 08:38:51 +0000 (09:38 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Solved conflicts:
acqui/neworderbiblio.pl
installer/data/mysql/updatedatabase.pl
kohaversion.pl
Julian Maurice [Tue, 17 Jan 2012 12:57:09 +0000 (13:57 +0100)]
[SOLR] Rename a variable to prevent Perl warnings
Jonathan Druart [Mon, 16 Jan 2012 13:15:47 +0000 (14:15 +0100)]
[SOLR]MT8735: Perfs disconnect mysql connections after end of script
Jonathan Druart [Mon, 16 Jan 2012 12:18:21 +0000 (13:18 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8702' into dev/solr
Jonathan Druart [Mon, 16 Jan 2012 12:17:06 +0000 (13:17 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8627' into dev/solr
Claire Hernandez [Fri, 13 Jan 2012 16:56:26 +0000 (17:56 +0100)]
Merge remote-tracking branch 'remotes/origin/solr/ft/cronjobs' into dev/solr
Jonathan Druart [Thu, 12 Jan 2012 15:51:23 +0000 (16:51 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8621' into dev/solr
Jonathan Druart [Thu, 12 Jan 2012 15:50:12 +0000 (16:50 +0100)]
[SOLR] Followup: Search: Disable submit button after click
FIX: Delete useless call to js function
Julian Maurice [Thu, 12 Jan 2012 15:37:45 +0000 (16:37 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8621' into dev/solr
Julian Maurice [Thu, 12 Jan 2012 15:36:32 +0000 (16:36 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8552' into dev/solr
Julian Maurice [Thu, 12 Jan 2012 15:35:07 +0000 (16:35 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT7494' into dev/solr
Jonathan Druart [Thu, 12 Jan 2012 11:36:24 +0000 (12:36 +0100)]
[SOLR] Search: Disable submit button after click
Preventing double form submission on search (opac and intranet)
Jonathan Druart [Wed, 11 Jan 2012 11:10:01 +0000 (12:10 +0100)]
[SOLR] MT8702: BZ6627: Update to improve security in specified log files
BZ6627 Adapted patch
Jonathan Druart [Wed, 11 Jan 2012 09:59:02 +0000 (10:59 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8572' into dev/solr
Jonathan Druart [Wed, 11 Jan 2012 09:46:34 +0000 (10:46 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8579' into dev/solr
Jonathan Druart [Wed, 11 Jan 2012 09:39:06 +0000 (10:39 +0100)]
Merge remote-tracking branch 'origin/solr/ft/traces' into dev/solr
Conflicts solved:
C4/Search/Engine/Solr.pm
Jonathan Druart [Wed, 11 Jan 2012 09:33:15 +0000 (10:33 +0100)]
Merge remote-tracking branch 'origin/solr/ft/optim' into dev/solr
Conflicts solved:
C4/Data/Record/Check.pm
C4/Matcher.pm
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tmpl
Julian Maurice [Tue, 10 Jan 2012 14:55:57 +0000 (15:55 +0100)]
MT7654: dedup_authorities: add he-main to the list of "good indexes"
The query is now executed only if it contains at least one of the
following indexes: he, he-main, ppn
Claire Hernandez [Mon, 9 Jan 2012 17:45:48 +0000 (18:45 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/itt
Conflicts solved:
koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
Claire Hernandez [Mon, 9 Jan 2012 17:38:05 +0000 (18:38 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Henri-Damien LAURENT [Fri, 17 Jun 2011 20:55:37 +0000 (22:55 +0200)]
[SOLR] Adding sqlwhere for UNIMARC_sync_date_created
This allows to synchronise dates into some local use fields
On a little scale and not the entire database :
*** Adding 099$c and $d where there is none
perl misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl \
--run --where \
"Extractvalue(marcxml,'count(//datafield[@tag=\"099\"]/subfield[@code=\"c\" or @code=\"d\"])')=0"
*** updating 099$c and $d where they are not synched
perl misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl \
--run --where \
"Extractvalue(marcxml,'//datafield[@tag=\"099\"]/subfield[@code=\"c\"]')<>biblio.datecreated"
perl misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl \
--run --where \
"Extractvalue(marcxml,'//datafield[@tag=\"099\"]/subfield[@code=\"d\"]')<>biblio.timestamp"
*** One can even use LIMIT parameter in order to test
perl misc/maintenance/UNIMARC_sync_date_created_with_marc_biblio.pl \
--run --where \
"Extractvalue(marcxml,'//datafield[@tag=\"099\"]/subfield[@code=\"d\"]')<>biblio.timestamp LIMIT 50"
(cherry picked from commit
0bbfe79d15210ba70944879719565bd9ad7c902c)
Jonathan Druart [Thu, 5 Jan 2012 10:34:02 +0000 (11:34 +0100)]
MT8627: Add xslt "functions" in UNIMARCslimUtils.xsl to escape solr string
example:
<xsl:attribute name="href">/cgi-bin/koha/opac-search.pl?q=se:"<xsl:call-template name="escape_solr_char">
<xsl:with-param name="text"><xsl:value-of select="marc:subfield[@code='t']"/></xsl:with-param>
</xsl:call-template>"</xsl:attribute>
<xsl:value-of select="marc:subfield[@code='t']"/>
Jonathan Druart [Wed, 4 Jan 2012 13:16:28 +0000 (14:16 +0100)]
[SOLR] OPTIM Processing facets
Claire Hernandez [Wed, 4 Jan 2012 13:00:56 +0000 (14:00 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Conflicts solved:
C4/Auth.pm
Julian Maurice [Tue, 3 Jan 2012 14:29:36 +0000 (15:29 +0100)]
DataTables: Strings are put in .inc file to be translatable
(cherry picked from commit
4e295e53651256ba8af8608d635041f72ffa8bf1)
Jonathan Druart [Mon, 2 Jan 2012 12:42:55 +0000 (13:42 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8501' into dev/stetienne
Julian Maurice [Mon, 2 Jan 2012 12:37:34 +0000 (13:37 +0100)]
MT8261: Check 'allowonshelfholds' in CanItemBeReserved
CanBookBeReserved now takes a branchcode in parameter and check only
for corresponding items.
These two changes prevent a user to reserve on 'next available branch'
if
this branch's items are all available (on shelf)
squash:
From
bbc0f2a7d1b3c114c52e4b8c6d9d8f63ffbbe8e0 Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Mon, 12 Dec 2011 11:40:24 +0100
Subject: [PATCH 1/3] MT8261: Check 'allowonshelfholds' in
CanItemBeReserved
CanBookBeReserved now takes a branchcode in parameter and check only
for corresponding items.
These two changes prevent a user to reserve on 'next available branch'
if
this branch's items are all available (on shelf)
From
56be62b5d66f1cba4b4284a05cbd84d0101db4e2 Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Wed, 14 Dec 2011 11:29:59 +0100
Subject: [PATCH 2/3] MT8261: Display an error message if hold cannot be
placed
From
5cd7936989f564e673ac6d22f3b7f893c18fc2aa Mon Sep 17 00:00:00 2001
From: Julian Maurice <julian.maurice@biblibre.com>
Date: Tue, 27 Dec 2011 15:21:24 +0100
Subject: [PATCH 3/3] MT8261: Show error messages in OPAC
Matthias Meusburger [Fri, 30 Dec 2011 10:26:50 +0000 (11:26 +0100)]
MT8501: Fix parameters handling for CAS login
Julian Maurice [Thu, 29 Dec 2011 13:19:33 +0000 (14:19 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8435' into dev/solr
Julian Maurice [Thu, 29 Dec 2011 13:19:06 +0000 (14:19 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8553' into dev/solr
Julian Maurice [Thu, 29 Dec 2011 12:46:03 +0000 (13:46 +0100)]
[SOLR] Followup: Optim: don't get facets for rss results
Don't try to build facets if they were not returned by Solr
Matthias Meusburger [Tue, 27 Sep 2011 13:46:20 +0000 (15:46 +0200)]
MT6869/MT3973: Make previous serial automatically available when collecting a new one
Cherry-pick of am123/ft/MT3973 branch
- Fix: test if $defaultvalues is defined (true) before trying to access it
as a hash
- Also change itype for previous serial, according to subscription.previousitemtype
(cherry picked from commit
1f4a2a77a8f656d081f533f2056456cf46501e04)
Squashed commits:
MT3973, Follow-up: Make previous serial automatically available when collecting a new one
- GetPreviousSerialid is now based on serialid and status, which is more reliable than planneddate
(cherry picked from commit
e14c88c8f734804b1fdcf0b4a7f41f103aade919)
----
MT3973, Follow-up: Make previous serial automatically available when collecting a new one
- Remove unuseful warn
(cherry picked from commit
91158f97067ac599cb63d3551f13291b50be0a6a)
Julian Maurice [Thu, 29 Dec 2011 09:09:48 +0000 (10:09 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8250' into dev/stetienne
Julian Maurice [Wed, 28 Dec 2011 08:42:13 +0000 (09:42 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8350' into dev/stetienne
Julian Maurice [Wed, 28 Dec 2011 08:40:35 +0000 (09:40 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT7156' into dev/stetienne
Julian Maurice [Wed, 28 Dec 2011 08:37:47 +0000 (09:37 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8311' into dev/solr
Julian Maurice [Wed, 21 Dec 2011 15:23:27 +0000 (16:23 +0100)]
MT8311: MarcToUTF8Record fix
By default, if $source_encoding is not set, it will assume that encoding
is ISO-5426. It's not a good behaviour. With this patch, it checks
against 100$a (if UNIMARC) to detect ISO-5426 or ISO-8859-1 encoding.
+ place AddBiblioToBatch into eval{} to avoid crash of
stage-marc-import.pl
+ count import errors in BatchStageMarcRecords
+ check SimpleSearch return in C4::Matcher
Jonathan Druart [Mon, 26 Dec 2011 15:34:39 +0000 (16:34 +0100)]
MT7494: FIX some stuff about csv export
- Modify columns in format_export table
- Don't use \n, \r or \r\n for csv sep
Julian Maurice [Tue, 27 Dec 2011 13:22:43 +0000 (14:22 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT6799' into dev/stetienne
Julian Maurice [Tue, 27 Dec 2011 11:19:42 +0000 (12:19 +0100)]
[SOLR] Fix call to SimpleSearch in C4::Matcher
Jonathan Druart [Wed, 21 Dec 2011 14:08:53 +0000 (15:08 +0100)]
MT8350: FIX permissions for edit_catalogue
Julian Maurice [Tue, 27 Dec 2011 10:20:13 +0000 (11:20 +0100)]
MT8435: BiblioAddAuthorities: check on auth-heading-main too
Julian Maurice [Tue, 27 Dec 2011 09:36:16 +0000 (10:36 +0100)]
Revert "MT8435: BiblioAddAuthorities improvements"
This reverts commit
ead576aea58d5ea0e3f684e9d7430f54e0d5278e.
Julian Maurice [Mon, 26 Dec 2011 15:51:46 +0000 (16:51 +0100)]
MT8435: Fix SimpleSearch call
Julian Maurice [Mon, 26 Dec 2011 15:46:24 +0000 (16:46 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/itt
Julian Maurice [Mon, 26 Dec 2011 15:32:32 +0000 (16:32 +0100)]
MT8435: BiblioAddAuthorities improvements
Before linking an existing authority to a biblio, it check consistency
with manually entered authority information, subfield by subfield.
It avoid linking an authority which has been returned by search because
the $z matched with manually entered $a.
Jonathan Druart [Mon, 26 Dec 2011 11:18:51 +0000 (12:18 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Conflicts solved:
admin/smart-rules.pl
Jonathan Druart [Mon, 26 Dec 2011 11:16:21 +0000 (12:16 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8492' into dev/solr
Jonathan Druart [Mon, 26 Dec 2011 11:08:40 +0000 (12:08 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT7268' into dev/stetienne
Julian Maurice [Mon, 26 Dec 2011 10:53:04 +0000 (11:53 +0100)]
Merge remote-tracking branch 'origin/itt/ft/MT6861' into dev/itt
Solved conflicts:
C4/Budgets.pm
C4/Category.pm
C4/Input.pm
C4/Koha.pm
C4/Members.pm
C4/Members/AttributeTypes.pm
admin/authorised_values.pl
admin/categorie.pl
cataloguing/addbiblio.pl
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/authorised_values.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/patron-attr-types.tmpl
members/member.pl
tools/batchMod.pl
Jonathan Druart [Wed, 19 Oct 2011 13:12:26 +0000 (15:12 +0200)]
MT6861: Adds Filters on Category, patron-attr and authorised values
Adds possibility to filter Category, attributes patrons and authorised
values when created or modified, from a list of site.
The value appears all the time unless we have choose a site. In this
case,
it appears exclusively if connection site is choosen.
Squashed commits:
--
MT6861: Fix authorised values branch limitation
No more needs to have one line in authorised_values_branches for every
line in authorised_values
Delete authorised_values_branches corresponding lines when an AV is
deleted
--
MT6861: Minor improvement
No more needs to have one line with branchcode=NULL in
borrower_attribute_types_branches and categories_branches for every line
in corresponding tables (borrower_attribute_types and categories)
updatedatabase.pl modified accordingly
--
MT6861: Hide authorised_values on facets
We don't want display facets for authorised linked with a branch
--
MT6861: Followup: Hide authorised_values on facets
Julian Maurice [Mon, 26 Dec 2011 09:24:24 +0000 (10:24 +0100)]
MT8552: Do not add RSS searches to search history
It happens when using Firefox (and maybe other browsers) RSS reader
functionnality with an open Koha session (anonymous or not)
Jonathan Druart [Mon, 26 Dec 2011 09:13:41 +0000 (10:13 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8397' into dev/solr
Julian Maurice [Fri, 23 Dec 2011 10:52:11 +0000 (11:52 +0100)]
MT8553: Don't retrieve anonymous search history when login
Julian Maurice [Fri, 23 Dec 2011 07:36:13 +0000 (08:36 +0100)]
MT6799: Show 'new' link if no routing lists (serials-collection.pl)
Julian Maurice [Thu, 22 Dec 2011 16:08:25 +0000 (17:08 +0100)]
MT7156: Disable cell input if planning type is BRANCHES and fund is
restricted on a branch
Jonathan Druart [Thu, 22 Dec 2011 15:50:25 +0000 (16:50 +0100)]
[SOLR] Delete duplicated code
Jonathan Druart [Tue, 20 Dec 2011 10:13:56 +0000 (11:13 +0100)]
[SOLR] Followup FIX cleaning syspref
Jonathan Druart [Wed, 21 Dec 2011 13:32:01 +0000 (14:32 +0100)]
[SOLR] Catch error "400 URL must be absolute"
This error appears when syspref SolrAPI is not set correctly
Jonathan Druart [Tue, 20 Dec 2011 16:09:00 +0000 (17:09 +0100)]
MT7268: Followup Hide serials in claims if we have not permission
Julian Maurice [Tue, 20 Dec 2011 14:23:53 +0000 (15:23 +0100)]
MT8492: Fix addbiblio when deleting multiple mandatory fields
In AreMandatoriesNotOk(), mandatory fields list is built by the template
engine and no check was made on presence of the field while saving.
This caused Save button to do nothing when a mandatory field was
removed.
This check is now done when clicking on Save button
Jonathan Druart [Tue, 20 Dec 2011 15:12:43 +0000 (16:12 +0100)]
MT7268: Hide serials in claims if we have not permission
+ Delete code for "preview". It appears to be an unused feature.
Jonathan Druart [Tue, 20 Dec 2011 13:14:50 +0000 (14:14 +0100)]
MT8352: FIX budget remaining in aqbudgets.pl
Jonathan Druart [Tue, 20 Dec 2011 10:44:29 +0000 (11:44 +0100)]
MT6863: FIX cardnumber value lost when step != 3
Julian Maurice [Mon, 19 Dec 2011 10:14:15 +0000 (11:14 +0100)]
Merge remote-tracking branch 'origin/itt/ft/MT7170' into dev/itt
Julian Maurice [Fri, 16 Dec 2011 14:33:40 +0000 (15:33 +0100)]
MT7170: Use dataTables for member search results
Replace 'Fines' column by a 'Attributes' column which list borrower
attributes.
Jonathan Druart [Mon, 19 Dec 2011 09:12:38 +0000 (10:12 +0100)]
Merge remote-tracking branch 'origin/itt/ft/MT8329' into dev/itt
Matthias Meusburger [Thu, 15 Dec 2011 16:09:49 +0000 (17:09 +0100)]
MT8250: Adds filter for items list when -library is specified
Matthias Meusburger [Thu, 15 Dec 2011 13:02:52 +0000 (14:02 +0100)]
MT8266: Fix issue confirmation message when user has overdues
Julian Maurice [Wed, 14 Dec 2011 14:38:43 +0000 (15:38 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT5546' into dev/stetienne
Julian Maurice [Wed, 14 Dec 2011 14:18:30 +0000 (15:18 +0100)]
MT5546: Fix JSON keys to prevent translation of them
Julian Maurice [Wed, 14 Dec 2011 08:34:36 +0000 (09:34 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/stetienne
Julian Maurice [Wed, 14 Dec 2011 08:33:47 +0000 (09:33 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT8252' into dev/stetienne
Julian Maurice [Wed, 14 Dec 2011 08:30:41 +0000 (09:30 +0100)]
Merge remote-tracking branch 'origin/stetienne/ft/MT7611' into dev/stetienne
Jonathan Druart [Tue, 13 Dec 2011 15:36:00 +0000 (16:36 +0100)]
Optim: Delete call RotatingCollection.
RotatingCollection is not usable
Julian Maurice [Mon, 12 Dec 2011 13:43:13 +0000 (14:43 +0100)]
MT7611: Fix message display when user has already checked out biblio
Jonathan Druart [Mon, 12 Dec 2011 13:37:27 +0000 (14:37 +0100)]
[SOLR] Optim FIX check return after call to SimpleSearch
Claire Hernandez [Mon, 12 Dec 2011 12:41:40 +0000 (13:41 +0100)]
Merge remote-tracking branch 'origin/dev/stetienne' into dev/itt
Conflicts solved:
installer/data/mysql/en/mandatory/sysprefs.sql
installer/data/mysql/fr-FR/1-Obligatoire/unimarc_standard_systemprefs.sql
Julian Maurice [Mon, 12 Dec 2011 11:34:27 +0000 (12:34 +0100)]
MT8252: Hide 'diffbranch' message if HoldNextInLibrary is ON
Jonathan Druart [Mon, 12 Dec 2011 10:41:56 +0000 (11:41 +0100)]
MT8329: Adds return link on uncertainprice.pl
+ FIX op param on filter (no validate !)