Main Koha release repository https://koha-community.org
Find a file
Owen Leonard f4b7e470e7 Bug 15766: (follow-up) Correct merge errors
This patch corrects some problems applying this on current master and
removes an old merge conflict marker.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
2018-10-24 13:52:42 +00:00
acqui Bug 21365: Call BiblioAutoLink from AddBiblio and ModBiblio 2018-10-15 13:11:53 +00:00
admin Bug 21216: Add filter/search options to notices table 2018-10-24 13:38:48 +00:00
api/v1 Bug 20772: Return cost & price_paid in API 2018-10-13 08:34:32 -03:00
authorities Bug 21456: (QA follow-up) Catch missed case in authorities merge 2018-10-17 13:52:23 +00:00
basket Bug 16575: Irregular behaviour using window.print() followed by window.location.href 2018-07-19 16:12:56 +00:00
C4 Bug 15766: (follow-up) Hide description field if the batch is empty 2018-10-24 13:52:42 +00:00
catalogue Bug 21291: (follow-up) Pass subscriptionsnumber to all tools in staff detail's sidebar 2018-10-15 13:40:47 +00:00
cataloguing Bug 21365: Call BiblioAutoLink from AddBiblio and ModBiblio 2018-10-15 13:11:53 +00:00
circ Bug 15139: Add non-public item notes to overdue report 2018-10-15 13:56:22 +00:00
clubs Bug 18632: Remove 'CGI::param called in list context' warnings 2017-05-28 22:25:22 -04:00
course_reserves Bug 20467: (QA follow-up) Display error if no or invalid course id is passed 2018-07-02 12:55:38 +00:00
debian Bug 17084: Automatic debian/control updates (unstable/master) 2018-10-13 08:50:38 -03:00
docs Bug 7143: (follow-up) remove trailing apostrophe 2018-10-09 16:13:57 +00:00
errors Bug 19998: use Modern::Perl in error perl scripts 2018-02-05 09:45:48 -03:00
etc Bug 14302: (QA follow-up) Remove remaining file 2018-08-31 11:24:21 +00:00
ill Bug 20772: Display and edit of price_paid 2018-10-13 08:34:33 -03:00
installer Bug 15766: Adding descriptions to patron card batches 2018-10-24 13:52:40 +00:00
Koha Bug 15486: DBRev 18.06.00.043 2018-10-24 13:24:06 +00:00
koha-tmpl Bug 15766: (follow-up) Correct merge errors 2018-10-24 13:52:42 +00:00
labels Bug 15766: Adding descriptions to patron card batches 2018-10-24 13:52:40 +00:00
members Bug 21167: Fix price formatting on printed fee invoice and receipt 2018-09-28 19:41:36 +00:00
misc Bug 21351: Rename the Taiwanese language pack to use correct file name 2018-10-15 13:18:43 +00:00
offline_circ Bug 13779: (QA follow-up) Correct checkauth call in offline_circ/download.pl 2018-09-14 17:27:29 +00:00
opac Bug 21475: Fix crash on missing default itemtype 2018-10-19 15:51:26 +00:00
OpenILS
patron_lists Bug 19524: Use existing logged_in_user variable 2018-07-18 16:49:30 +00:00
patroncards Bug 15766: Adding descriptions to patron card batches 2018-10-24 13:52:40 +00:00
plugins Bug 20011: use Modern::Perl in plugins perl scripts 2018-02-05 09:46:44 -03:00
reports Bug 9188: Remove 'debug' information from patron statistics 2018-10-01 13:56:37 +00:00
reserve Bug 21291: (follow-up) Pass subscriptionsnumber to all tools in staff detail's sidebar 2018-10-15 13:40:47 +00:00
reviews Bug 18789: Send Koha::Patron object to the templates 2018-02-16 13:03:58 -03:00
rotating_collections Bug 21500: Remove warnings in rotating collections 2018-10-09 15:02:45 +00:00
serials Bug 21554: Add missing use statement in subscription-batchedit 2018-10-19 15:56:07 +00:00
services Bug 20019: use Modern::Perl in misc perl scripts 2018-02-05 09:47:08 -03:00
skel
suggestion Bug 21048: (QA follow-up) Fix authorized value statuses in filter 2018-08-08 20:58:23 +00:00
svc Bug 15766: Adding descriptions to patron card batches 2018-10-24 13:52:40 +00:00
t Bug 15486: Unit tests 2018-10-24 13:24:04 +00:00
tags Bug 20019: use Modern::Perl in misc perl scripts 2018-02-05 09:47:08 -03:00
test Bug 9819 - 'stopwords'-related code removed 2015-12-30 15:49:35 +00:00
tmp/modified_authorities
tools Bug 21579: Make showdiffmarc.pl work for authorities and biblios 2018-10-17 12:29:41 +00:00
virtualshelves Bug 19039: (follow-up) Results of virtual shelves (lists) not sortable by date 2018-08-24 16:23:27 +00:00
xt Bug 18959: Skip xt/author/Text_CSV_Various.t if Text::CSV::Unicode missing 2018-10-19 16:37:22 +00:00
.editorconfig
.gitignore Bug 20427: Convert OPAC LESS to SCSS 2018-08-09 15:17:07 +00:00
.htaccess
.mailmap Update mailmap - Jonathan Druart 2017-06-21 12:42:19 -03:00
.scss-lint.yml Bug 21237: Clean up staff client SCSS 2018-08-24 16:23:25 +00:00
about.pl Bug 14302: Remove GRS1 specific code 2018-08-31 11:24:20 +00:00
changelanguage.pl Bug 20019: use Modern::Perl in misc perl scripts 2018-02-05 09:47:08 -03:00
fix-perl-path.PL Bug 9978: (followup) Replace license header with the correct license (GPLv3+) 2015-04-20 09:59:43 -03:00
gulpfile.js Bug 20427: Convert OPAC LESS to SCSS 2018-08-09 15:17:07 +00:00
help.pl Bug 19817: Use the language from the interface if valid 2018-09-06 17:32:28 +00:00
INSTALL Bug 17626: Remove existing install instructions and link to the wiki pages instead 2016-11-22 11:29:07 +00:00
install-CPAN.pl
Koha.pm Bug 15486: DBRev 18.06.00.043 2018-10-24 13:24:06 +00:00
koha_perl_deps.pl Bug 20019: use Modern::Perl in misc perl scripts 2018-02-05 09:47:08 -03:00
kohaversion.pl Bug 13758: Move the Koha version from kohaversion.pl 2015-05-07 11:39:04 -03:00
LICENSE
mainpage.pl Bug 17698: Do not send pending_checkout_notes from all circ scripts 2018-07-23 15:23:44 +00:00
Makefile.PL Bug 19817: Remove local help files + edit help feature 2018-09-06 17:32:27 +00:00
MANIFEST.SKIP
package.json Bug 19474: Convert staff client CSS to SCSS 2018-08-09 15:12:20 +00:00
README
README.md Bug 15465: Fix typo in bugs.k-c.org 2017-05-26 11:45:31 -03:00
README.robots
rewrite-config.PL Bug 14302: Remove GRS1 specific code 2018-08-31 11:24:20 +00:00
yarn.lock Bug 19474: Convert staff client CSS to SCSS 2018-08-09 15:12:20 +00:00

Koha is a free software integrated library system (ILS).

Koha is distributed under the GNU GPL version 3 or later.

Note: This is a synced mirror of the official Koha repo.

Note: Koha does not accept pull requests from git hosting sites.

Note: This project has its own bug tracker, to report a bug or submit a patch visit http://bugs.koha-community.org.

For guidelines on submitting patches for Koha please visit https://wiki.koha-community.org/wiki/SubmitingAPatch

The developers handbook can be found at https://wiki.koha-community.org/wiki/Developer_handbook

http://koha-community.org/

Koha Logo