gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
58,918 Commits 39 Branches 720 Tags 6 GiB
Perl 44.2%
JavaScript 41.1%
HTML 6%
XSLT 3.1%
Vue 1.9%
Other 3.2%
Go to file
Jonathan Druart cc72eabc5f
Bug 40858: Search merge conflict on files part of the git index 
Same as bug 34303 and bug 33743, our test suite must parse/process files
that are part of the index, not all the other files.

It's currently failing on kohadev-db-request.txt that is owned by root.
But it's not part of the Koha codebase, this file should not be tested.

There were also node_modules and po files that were processed.

Test plan:
  prove t/00-merge-conflict-markers.t
must now return gren

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
Signed-off-by: Paul Derscheid <paul.derscheid@lmscloud.de>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
 		2025-09-24 09:25:03 -06:00
C4 Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
Koha Bug 40858: Search merge conflict on files part of the git index 2025-09-24 09:25:03 -06:00
acqui Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
admin Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
api Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
authorities Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
basket Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
bin
…
bookings Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
catalogue Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
cataloguing Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
circ Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
clubs Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
course_reserves Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
debian Bug 40163: (follow-up) Fix Bugzilla URL 2025-09-23 16:21:30 -06:00
docs Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
erm Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
errors Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
etc Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
ill Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
installer Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
koha-tmpl Bug 40262: (follow-up) Refactor copyright clearance to use dedicated methods 2025-09-23 16:21:31 -06:00
labels Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
lib Bug 38664: Tidy the whole codebase 2025-02-11 14:58:24 +01:00
members Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
misc Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
offline_circ Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
opac Bug 40262: (follow-up) Refactor copyright clearance to use dedicated methods 2025-09-23 16:21:31 -06:00
patron_lists Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
patroncards Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
plugins Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
pos Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
preservation Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
recalls Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
reports Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
reserve Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
reviews Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
rotating_collections Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
serials Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
services Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
skel
…
suggestion Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
svc Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
t Bug 40858: Search merge conflict on files part of the git index 2025-09-24 09:25:03 -06:00
tags Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
tools Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
virtualshelves Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
xt Bug 40858: Rename context 'all' with 'core' 2025-09-24 09:24:55 -06:00
.codespell-ignore Bug 39325: (QA follow-up) Adjust some issues 2025-04-28 18:51:30 +02:00
.editorconfig
…
.git-blame-ignore-revs Bug 39096: Add 'tidy all' commits to a git blame ignore file 2025-02-17 13:10:25 +01:00
.gitignore Bug 40838: Add generated bookings CSS assets to gitignore 2025-09-19 08:42:47 -06:00
.htaccess
…
.mailmap 25.05.00: Update .mailmap (part 4) 2025-05-26 10:19:09 -03:00
.perlcriticrc
…
.perltidyrc
…
.prettierrc.js Bug 38664: Treat .vue files like other JS files 2025-02-11 14:58:25 +01:00
.proverc.dist
…
.stylelintrc.json
…
INSTALL
…
Koha.pm Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
LICENSE Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
MANIFEST.SKIP
…
Makefile.PL Bug 40773: Do not map "vue/dist" files in Makefile 2025-09-18 13:51:56 -06:00
README
…
README.md Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
README.robots
…
about.pl Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
app.psgi
…
build-resources.PL
…
changelanguage.pl Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
cpanfile Bug 40663: Update GD::Barcode::QRcode to v2.01 2025-09-05 15:10:34 -06:00
cypress.config.ts Bug 40346: Use KOHA_INTRANET_URL for the baseUrl 2025-07-21 14:01:23 -06:00
eslint.config.mjs Bug 38524: Enable ESLint for .ts and .vue files 2025-01-16 15:56:17 +01:00
fix-perl-path.PL Bug 39325: (QA follow-up) Adjust some issues 2025-04-28 18:51:30 +02:00
gulpfile.js Bug 38664: Tidy the whole codebase 2025-02-11 14:58:24 +01:00
help.pl Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
kohaversion.pl Bug 38664: Tidy the whole codebase 2025-02-11 14:58:24 +01:00
mainpage.pl Bug 40163: Fix several http addresses in the code docs 2025-09-23 16:21:29 -06:00
package.json Bug 40170: Replace cypress-mysql with mysql2 - Cypress tests 2025-07-08 15:42:03 -06:00
rewrite-config.PL Bug 39834: Replace some tabs with spaces 2025-06-02 15:26:17 -06:00
rspack.config.js Bug 40173: Make http-client reusable from Cypress tests 2025-07-21 14:01:07 -06:00
tsconfig.json
…
yarn.lock Bug 40170: Update yarn.lock 2025-07-10 09:43:26 -06:00

README.md

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

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

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 https://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

https://koha-community.org/

Koha Logo