Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Solr hOCR search #163

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@
*.xml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2
*.yml text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tab-in-indent,tabwidth=2

# PHPStan's baseline uses tabs instead of spaces.
core/.phpstan-baseline.php text eol=lf whitespace=blank-at-eol,-blank-at-eof,-space-before-tab,tabwidth=2 diff=php linguist-language=php

# Define binary file attributes.
# - Do not treat them as text.
# - Include binary diff in patches instead of "binary files differ."
Expand Down
5 changes: 4 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,11 @@
],
"require": {
"php": "^7.4 || ^8",
"born-digital/islandora_iiif_hocr": "^2",
"composer/installers": "^1.9",
"cweagans/composer-patches": "^1.7",
"discoverygarden/dgi_image_discovery": "^1",
"discoverygarden/islandora_hocr": "*",
"drupal/admin_toolbar": "^3.1",
"drupal/advanced_search": "^2.0.0@beta",
"drupal/better_exposed_filters": "^6.0",
Expand All @@ -48,7 +50,7 @@
"drupal/flysystem": "^2.2@alpha",
"drupal/fpa": "^4.0",
"drupal/hal": "^1.0||^2.0",
"drupal/islandora": "^2.8.1",
"drupal/islandora": "^2.12.3",
"drupal/islandora_mirador": "^2",
"drupal/openseadragon": "^2",
"drupal/pathauto": "^1.12",
Expand Down Expand Up @@ -94,6 +96,7 @@
"append": "assets/patches/default_settings.txt"
adam-vessey marked this conversation as resolved.
Show resolved Hide resolved
}
}

},
"installer-paths": {
"web/core": [
Expand Down
Loading
Loading