Claire Hernandez [Fri, 4 May 2012 12:12:30 +0000 (14:12 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Conflicts solved:
misc/cronjobs/runreport.pl
Jonathan Druart [Fri, 4 May 2012 07:36:21 +0000 (09:36 +0200)]
MT9161: Prevent FF warning on printing slip
Jonathan Druart [Thu, 3 May 2012 10:11:23 +0000 (12:11 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9261' into dev/solr
Jonathan Druart [Thu, 3 May 2012 09:37:17 +0000 (11:37 +0200)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Jonathan Druart [Wed, 2 May 2012 07:30:34 +0000 (09:30 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT7481' into dev/solr
Conflicts solved:
C4/Record.pm
tools/export.pl
Jonathan Druart [Mon, 30 Apr 2012 09:44:08 +0000 (11:44 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9184' into dev/solr
Jonathan Druart [Wed, 25 Apr 2012 15:13:00 +0000 (17:13 +0200)]
[SOLR][LOGGER] FIX warnings when no file argument
Julian Maurice [Wed, 25 Apr 2012 11:17:17 +0000 (13:17 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9055' into dev/solr
Julian Maurice [Tue, 24 Apr 2012 13:39:37 +0000 (15:39 +0200)]
Merge remote-tracking branch 'origin/solr/ft/rpn2solr' into dev/solr
Matthias Meusburger [Thu, 8 Dec 2011 14:22:32 +0000 (15:22 +0100)]
MT7481 - MT8298 : Adds a CLI option to tools/export.pl to remove NSE/NSB characters from exported records
(cherry picked from commit
e3c3c672ddc40fece824f9451f3b5d0c87f359d1)
Conflicts solved:
tools/export.pl
Matthias Meusburger [Tue, 23 Aug 2011 15:25:15 +0000 (17:25 +0200)]
MT7481: Adds tools/export_borrowers.pl
- This script allows to export borrowers in a simple way (pipe-separated fields).
Fields to export can be supplied in command-line parameters.
(cherry picked from commit
fabce2a24fa7fa085e2f133de84f1919e44fea33)
Jonathan Druart [Fri, 20 Apr 2012 14:36:09 +0000 (16:36 +0200)]
[SOLR]RPN2Solr: Set timeout on general rule
Claire Hernandez [Thu, 19 Apr 2012 12:20:45 +0000 (14:20 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Conflicts solved:
cataloguing/addbiblio.pl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
Julian Maurice [Wed, 18 Apr 2012 07:13:58 +0000 (09:13 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9380' into dev/solr
Jonathan Druart [Mon, 16 Apr 2012 14:08:15 +0000 (16:08 +0200)]
Merge remote-tracking branch 'origin/solr/bug/MIN/MT8409' into dev/solr
Conflicts solved:
C4/Serials.pm
Jonathan Druart [Mon, 16 Apr 2012 13:58:26 +0000 (15:58 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9388' into dev/solr
Jonathan Druart [Mon, 16 Apr 2012 13:57:29 +0000 (15:57 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT7881' into dev/solr
Jonathan Druart [Mon, 16 Apr 2012 10:10:32 +0000 (12:10 +0200)]
MT9184: On return, statistics.itemtype is badly filled
Jonathan Druart [Thu, 12 Apr 2012 13:49:17 +0000 (15:49 +0200)]
MT9388 remove some warnings in cataloguing/addbiblio.pl
Jonathan Druart [Thu, 12 Apr 2012 14:27:05 +0000 (16:27 +0200)]
[SOLR]MT9388 remove some warnings in C4/Reserves.pm
Jonathan Druart [Thu, 12 Apr 2012 14:21:19 +0000 (16:21 +0200)]
[SOLR]MT9388 remove some warnings in C4/Members.pm
Jonathan Druart [Thu, 12 Apr 2012 14:15:34 +0000 (16:15 +0200)]
[SOLR]MT9388 remove some warnings in C4/Circulation.pm
Jonathan Druart [Thu, 12 Apr 2012 14:49:18 +0000 (16:49 +0200)]
[SOLR] Change the verbosity for Solr log
Jonathan Druart [Thu, 12 Apr 2012 13:34:37 +0000 (15:34 +0200)]
[SOLR]MT9388 Remove obsolete code counting issues by item type in circ (cf BZ5137)
Jonathan Druart [Thu, 12 Apr 2012 13:34:00 +0000 (15:34 +0200)]
[SOLR]MT9388 remove warnings in circ/ysearch.pl
Claire Hernandez [Thu, 12 Apr 2012 12:45:15 +0000 (14:45 +0200)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Claire Hernandez [Thu, 12 Apr 2012 12:44:02 +0000 (14:44 +0200)]
[SOLR] Logger followup - operator mistake
Jonathan Druart [Thu, 12 Apr 2012 08:10:30 +0000 (10:10 +0200)]
[SOLR] MT9380: Cannot delete records from Labeled MARC view
BZ4849
Julian Maurice [Wed, 11 Apr 2012 09:59:47 +0000 (11:59 +0200)]
MT9261: fix admin/matching-rules.pl
Fix a bug that prevent the user to add or remove matchchecks
Jonathan Druart [Tue, 10 Apr 2012 13:52:51 +0000 (15:52 +0200)]
MT7881: Followup: DataTables on additem.pl
FIX overflow
Jonathan Druart [Tue, 3 Apr 2012 09:15:35 +0000 (11:15 +0200)]
MT7881: DataTables on additem.pl
Julian Maurice [Fri, 6 Apr 2012 12:36:11 +0000 (14:36 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT8199' into dev/solr
Julian Maurice [Fri, 6 Apr 2012 12:34:59 +0000 (14:34 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9170' into dev/solr
Julian Maurice [Fri, 6 Apr 2012 12:33:08 +0000 (14:33 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT6556' into dev/solr
Julian Maurice [Fri, 6 Apr 2012 12:32:11 +0000 (14:32 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9326' into dev/solr
Julian Maurice [Fri, 6 Apr 2012 12:29:48 +0000 (14:29 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9258' into dev/solr
Claire Hernandez [Thu, 5 Apr 2012 13:39:44 +0000 (15:39 +0200)]
Fix Perl warnings in C4::Reserves
Jonathan Druart [Tue, 3 Apr 2012 08:33:26 +0000 (10:33 +0200)]
[SOLR]MT6556: Change permissions for renewscript.pl
Jonathan Druart [Wed, 4 Apr 2012 08:32:58 +0000 (10:32 +0200)]
[SOLR][LOGGER] FIX undefined variable issuingrules
Jonathan Druart [Tue, 3 Apr 2012 12:27:52 +0000 (14:27 +0200)]
MT9326: Displaying cn_source as Call number source in catalogue/detail.pl
Julian Maurice [Mon, 2 Apr 2012 11:59:49 +0000 (13:59 +0200)]
MT9170: addbiblio check mandatory fields and textarea
Check was only done on 'input' tags. So a mandatory field with all
'input' empty but with filled 'textarea' was preventing the record to be
saved with an alert message "Field XXX is mandatory, at least one of its
subfields must be filled"
Jonathan Druart [Mon, 2 Apr 2012 10:48:26 +0000 (12:48 +0200)]
MT9078: Followup Merging stetienne and limoges features for z3950 search
Sophie Meynieux [Tue, 20 Mar 2012 13:23:35 +0000 (14:23 +0100)]
MT9055 : Modify scheduler to run reports. Adding csv file output, and correct mail sending
Jonathan Druart [Mon, 2 Apr 2012 09:11:22 +0000 (11:11 +0200)]
MT9258: FIX Allow to delete shelf if there is > 20shelves
Claire Hernandez [Thu, 29 Mar 2012 09:51:37 +0000 (11:51 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Julian Maurice [Thu, 29 Mar 2012 09:50:26 +0000 (11:50 +0200)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Sophie Meynieux [Tue, 20 Mar 2012 13:23:35 +0000 (14:23 +0100)]
MT9055 : Modify scheduler to run reports. Adding csv file output, and correct mail sending
(cherry picked from commit
008758f32e7abdd165cd6ccbd097b23f60fb9860)
Claire Hernandez [Thu, 29 Mar 2012 09:26:06 +0000 (11:26 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Conflicts solved:
C4/Letters.pm
Julian Maurice [Wed, 28 Mar 2012 14:02:17 +0000 (16:02 +0200)]
[Logger] Take log level into account even if Log::LogLite fails to initialize
+ fix unit tests t/Logger.t
+ remove whitespace errors
Jonathan Druart [Wed, 28 Mar 2012 12:19:06 +0000 (14:19 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9200' into dev/solr
Jonathan Druart [Wed, 28 Mar 2012 12:18:03 +0000 (14:18 +0200)]
Merge remote-tracking branch 'origin/solr/ft/rpn2solr' into dev/solr
Jonathan Druart [Wed, 28 Mar 2012 12:17:38 +0000 (14:17 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9079' into dev/solr
Jonathan Druart [Wed, 28 Mar 2012 12:17:03 +0000 (14:17 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9183' into dev/solr
Jonathan Druart [Mon, 26 Mar 2012 10:10:36 +0000 (12:10 +0200)]
[SOLR][LOGGER] Display callback only if log level <= warning
FIX if logger is called by a script outside of koha (ie. rebuild_solr)
Jonathan Druart [Wed, 28 Mar 2012 07:10:50 +0000 (09:10 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT8894' into dev/solr
Conflicts solved:
C4/Search/Engine/Solr.pm
Jonathan Druart [Tue, 27 Mar 2012 14:44:59 +0000 (16:44 +0200)]
[SOLR][RPN2Solr] TMP: warning to prevent to loose logs
Jonathan Druart [Tue, 27 Mar 2012 14:40:43 +0000 (16:40 +0200)]
autoflushing stdout
Julian Maurice [Tue, 27 Mar 2012 11:53:58 +0000 (13:53 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Solved conflicts:
C4/Charset.pm
admin/z3950servers.pl
cataloguing/z3950_search.pl
installer/data/mysql/kohastructure.sql
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
Julian Maurice [Tue, 27 Mar 2012 11:16:54 +0000 (13:16 +0200)]
Revert "MT7563: Manage claims table with DataTables/Ajax"
This reverts commit
b81a35ad92be6bb1d7c66a662eaf8f977b097387.
Julian Maurice [Tue, 27 Mar 2012 11:16:39 +0000 (13:16 +0200)]
Revert "Merge remote-tracking branch 'origin/solr/ft/MT7563' into dev/solr"
This reverts commit
7ac77f57eab4b31992e2147c485f45a5c6256b06, reversing
changes made to
78f74922d814bc3abbfe2d55eae78d273dd688fd.
Jonathan Druart [Tue, 27 Mar 2012 07:19:04 +0000 (09:19 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9078' into dev/solr
Jonathan Druart [Tue, 27 Mar 2012 07:18:22 +0000 (09:18 +0200)]
Merge remote-tracking branch 'origin/solr/ft/MT9092' into dev/solr
Julian Maurice [Mon, 26 Mar 2012 15:14:19 +0000 (17:14 +0200)]
MT8199: use Net::Server::Daemonize to put process in background
Add Net::Server to the list of Koha dependencies
Julian Maurice [Mon, 26 Mar 2012 14:38:27 +0000 (16:38 +0200)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Solved conflicts:
C4/Installer.pm
C4/Reserves.pm
C4/Search.pm
C4/XSLT.pm
cataloguing/z3950_search.pl
Jonathan Druart [Tue, 21 Feb 2012 15:37:16 +0000 (16:37 +0100)]
MT8894: FIX encoding in FindDuplicate + routine EscapeString for Solr
Jonathan Druart [Fri, 16 Mar 2012 14:24:46 +0000 (15:24 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8894' into dev/solr
Conflicts solved:
C4/Biblio.pm
Jonathan Druart [Fri, 16 Mar 2012 14:23:35 +0000 (15:23 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8894' into dev/solr
Jonathan Druart [Fri, 16 Mar 2012 14:23:04 +0000 (15:23 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT9218' into dev/solr
Jonathan Druart [Tue, 21 Feb 2012 15:37:16 +0000 (16:37 +0100)]
MT8894: FIX encoding in FindDuplicate + routine EscapeString for Solr
Jonathan Druart [Fri, 16 Mar 2012 09:40:24 +0000 (10:40 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT9045' into dev/solr
Jonathan Druart [Fri, 16 Mar 2012 09:39:45 +0000 (10:39 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT9081' into dev/solr
Jonathan Druart [Fri, 16 Mar 2012 08:56:10 +0000 (09:56 +0100)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Jonathan Druart [Thu, 15 Mar 2012 09:32:47 +0000 (10:32 +0100)]
[SOLR]MT9078: Merging stetienne and limoges features for z3950 search
Jonathan Druart [Fri, 16 Mar 2012 08:27:45 +0000 (09:27 +0100)]
[SOLR][LOGGER] We can't use logger in C4::Context
Jonathan Druart [Thu, 15 Mar 2012 16:08:11 +0000 (17:08 +0100)]
MT9218: Fix Date format for a correct Solr search
Jonathan Druart [Tue, 21 Feb 2012 15:37:16 +0000 (16:37 +0100)]
MT8894: FIX encoding in FindDuplicate + routine EscapeString for Solr
Jonathan Druart [Wed, 14 Mar 2012 14:10:49 +0000 (15:10 +0100)]
Merge remote-tracking branch 'origin/solr/ft/logger' into dev/solr
Jonathan Druart [Thu, 8 Mar 2012 13:32:31 +0000 (14:32 +0100)]
MT9125: Hide biblio if hideatopac for each items and hidenoitems=1
Jonathan Druart [Mon, 5 Mar 2012 15:01:11 +0000 (16:01 +0100)]
MT4587,MT9125: Show biblio at opac if there is no item available.
Jonathan Druart [Wed, 14 Mar 2012 12:41:15 +0000 (13:41 +0100)]
[SOLR] FIX autocomplete in overdue
Julian Maurice [Tue, 13 Mar 2012 15:01:43 +0000 (16:01 +0100)]
Merge remote-tracking branch 'origin/solr/ft/rpn2solr' into dev/solr
Jonathan Druart [Mon, 12 Mar 2012 09:26:18 +0000 (10:26 +0100)]
[SOLR]MT9169: Followup FIX itypes: must be in the query, not in filters
Jonathan Druart [Fri, 9 Mar 2012 09:57:50 +0000 (10:57 +0100)]
[SOLR]MT9169: FIX itypes: must be in the query, not in filters
If these fields are in filters, Solr make an AND operator, we want OR
See the commit introduced this bug:
commit
54777892fd2b23ab6d59c77d7b6858d291852410
Author: Jonathan Druart <jonathan.druart@biblibre.com>
AuthorDate: Wed Jul 13 15:54:18 2011 +0200
[SOLR] Facets Multivalued
Jonathan Druart [Tue, 13 Mar 2012 11:52:54 +0000 (12:52 +0100)]
[SOLR] RPN2Solr: adds a logger function
Claire Hernandez [Thu, 8 Mar 2012 16:09:02 +0000 (17:09 +0100)]
Adds robots.txt.orig in apache DocumentRoot
- Rename it in robots.txt
- Must block main web crawlers
(cherry picked from commit
37cdfd103b70f1ef8caff01ddc78f1615a968d0f)
Jonathan Druart [Mon, 12 Mar 2012 16:26:38 +0000 (17:26 +0100)]
[SOLR] Logger
Replace warn with log
Remove useless warn
Replace syntax warnings
Stéphane Delaune [Fri, 9 Mar 2012 09:31:02 +0000 (10:31 +0100)]
(MT #9183) enable button Hide My Tags
Stéphane Delaune [Fri, 9 Mar 2012 16:54:45 +0000 (17:54 +0100)]
(MT #9079) fix C4::Members::GetMember call's in Letters.pm
Jonathan Druart [Mon, 12 Mar 2012 12:41:40 +0000 (13:41 +0100)]
[SOLR] MT9092: fix statisticvalue field on edit items
Jonathan Druart [Mon, 12 Mar 2012 10:53:13 +0000 (11:53 +0100)]
[SOLR] MT9081: update opac-topissues from the community version
commit
251d873b82bce4b869d2a6351b832e49e957d2c2
Author: Chris Cormack <chrisc@catalyst.net.nz>
Date: Sat Oct 29 08:49:20 2011 +1300
Bug 6947 : opac-topissues.pl wasn't respecting item live itemtypes
commit
af3c7d4ce7af4bfd104c4dc94c5c2da9a7b1863a
Author: Colin Campbell <colin.campbell@ptfs-europe.com>
Date: Mon Nov 29 15:15:47 2010 +0000
Bug 5453 Move declarations out of conditionals in opac
commit
f45969422c55f34edec3145b7e2fa1a85222932f
Author: Owen Leonard <oleonard@myacpl.org>
Date: Thu Jan 13 22:53:51 2011 +0100
Fix for Bug 3459, topissues doesn't take care of ccode
Jonathan Druart [Mon, 12 Mar 2012 09:16:52 +0000 (10:16 +0100)]
Merge remote-tracking branch 'origin/solr/ft/rpn2solr' into dev/solr
Claire Hernandez [Mon, 12 Mar 2012 08:42:59 +0000 (09:42 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8780' into dev/solr
Jonathan Druart [Wed, 7 Mar 2012 14:42:25 +0000 (15:42 +0100)]
DataTables: FIX sort on date if there is no data in cell
(cherry picked from commit
7c4f8f03053442503e9039c26c65786c1f57ac46)
Jonathan Druart [Mon, 5 Mar 2012 16:15:45 +0000 (17:15 +0100)]
RPN2Solr: Simplify the ccl query if contains only @attr 1=1016 and @and
Claire Hernandez [Wed, 7 Mar 2012 14:09:57 +0000 (15:09 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Jonathan Druart [Wed, 7 Mar 2012 14:05:49 +0000 (15:05 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8575' into dev/solr
Claire Hernandez [Wed, 7 Mar 2012 12:54:56 +0000 (13:54 +0100)]
Merge remote-tracking branch 'origin/dev/solr' into dev/limoges
Conflicts solved:
opac/opac-search.pl
Julian Maurice [Wed, 7 Mar 2012 10:05:21 +0000 (11:05 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT9103' into dev/solr
Julian Maurice [Wed, 7 Mar 2012 08:25:53 +0000 (09:25 +0100)]
Merge remote-tracking branch 'origin/solr/ft/MT8362' into dev/solr
Solved conflicts:
authorities/blinddetail-biblio-search.pl
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/blinddetail-biblio-search.tmpl
Julian Maurice [Fri, 25 Nov 2011 12:41:18 +0000 (13:41 +0100)]
MT8362: Squash of 3 commits:
MT8362: auth_finder.pl: improve multiple subfields management
Before this patch, choosing an authority which have multiple subfields
with the same tag, values were joined in a single subfield, seperating
values with a pipe ('|').
Now, if an authority has for example two $x subfields, there will be two
$x subfields in the biblio too. The exception is when the subfield is
not repeatable in the biblio marc framework. In this case, only the
first subfield is copied.
----
MT8362: auth_finder: fix multiple subfields order
----
MT8362: auth_finder.pl: insert fields ordered
Two new javascript functions:
- clear_field: remove cloned subfield and blank all others
- add_subfield: add a new subfield to specified field
blinddetail-biblio-search.pl behaviour is modified to use these two
functions in order to have authority subfields inserted in correct order
(they are no more grouped by subfield tag)