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

merge upstream develop #29

Merged
merged 104 commits into from
Sep 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
104 commits
Select commit Hold shift + click to select a range
8d6f278
Bump actions/checkout from 4.1.6 to 4.1.7
dependabot[bot] Jun 17, 2024
757a8e3
Merge pull request #383 from Edirom/dependabot/github_actions/actions…
bwbohl Jun 25, 2024
92ca75d
Fix invalid XQL
bwbohl Jun 26, 2024
86c1686
XQuery update to styleguide
bwbohl Jun 27, 2024
8e8ce56
fix JS indentation
bwbohl Jun 27, 2024
a85ead7
Ignore annotation category or priority filter if not defined
bwbohl Jun 27, 2024
897dd7b
OpenSeadragonViewer: remove duplicate funtion definition
bwbohl Jun 27, 2024
9121944
Fix: annotationOverlay due to invalid XQL
riedde Jun 27, 2024
d5cba22
fix tip target
bwbohl Jun 27, 2024
d4f8750
add some code comments
bwbohl Jun 27, 2024
4d08448
ad some code comments
bwbohl Jun 27, 2024
47d3b33
View OpenSeaDragonView: fix what is pushed to me.shapes annotations
bwbohl Jun 27, 2024
c16012e
Viw OpenSeaDragonView: fix alternative retrieval of shape element
bwbohl Jun 27, 2024
79c0036
View OpenSeaDargonViewer: push to array instead of insert
bwbohl Jun 27, 2024
4d1ace3
View OpenSeaDragonViewer: stick to standard annotation ID scheme for…
bwbohl Jun 27, 2024
df98a4c
View OpenSeadragonViewer: add some ode comment
bwbohl Jun 27, 2024
f6e1429
View SourceView: do not iterate over PrioritiesMenu if it is null
bwbohl Jun 27, 2024
d846306
getAnnotationsOnPage: element name as fallback for annotation type
bwbohl Jun 27, 2024
1825bec
XQdoc
bwbohl Jun 28, 2024
6ca8684
Styleguide: improve conformity
bwbohl Jun 28, 2024
22a395e
add som e code comments
bwbohl Jun 28, 2024
c23a9eb
XQuery: style conformance improve and TODO comment
bwbohl Jun 28, 2024
90e676b
View SourceView: check if categroeis menu exists when populating visi…
bwbohl Jun 28, 2024
c3ccb19
fix indentation
bwbohl Jun 28, 2024
765b009
View SourceView: only add annotation filter menu entries if respectiv…
bwbohl Jun 28, 2024
2e812b3
View SourceView: fix JS syntax error
bwbohl Jun 28, 2024
a62afee
ADD SOME DEBUG console logging
bwbohl Jun 28, 2024
d489432
View SourceView: add some TODOs
bwbohl Jun 28, 2024
7c3f555
whitespace
bwbohl Jun 28, 2024
b39095b
Controller SourceView: remove lang parameter as not available
bwbohl Jun 28, 2024
065bc44
whitespace
bwbohl Jun 28, 2024
0c613b8
ADD SOME DEBUG console logging
bwbohl Jun 28, 2024
3d14008
code comments
bwbohl Jun 28, 2024
72fb2ac
ADD SOME DEBUG console logging
bwbohl Jun 28, 2024
43921f7
ADD SOME DEBUG console logging
bwbohl Jun 28, 2024
d473cd9
View PageBasedView: use annotation.id to retrieve element
bwbohl Jun 28, 2024
d534d7a
whitespace
bwbohl Jun 28, 2024
fecbada
whitespace
bwbohl Jun 28, 2024
a91a5a1
View OpenSeaDragonViewer: add a html template from ImageViewer
bwbohl Jun 28, 2024
e32d30a
View OpenSeaDragonVirwer: add some code comments
bwbohl Jun 28, 2024
77864e2
ADD SOME DEBUG console logging
bwbohl Jun 28, 2024
72535ef
View MeasureBasedView HorizontalMeasureViewer: fix retrieval of annot…
bwbohl Jun 28, 2024
fca2adb
whitespace
bwbohl Jun 28, 2024
7afd0d8
View PageBasedView: fix annotation filer
bwbohl Jun 28, 2024
24da899
View OpenSeadragonViewer: fix annotation IDs
bwbohl Jun 28, 2024
257fb2c
View PageBasedView: fix annotation filters
bwbohl Jun 30, 2024
bef8bce
Add cursor "pointer" to annot view text preview areas, fix for #89
nikobeer Jul 3, 2024
6e769b4
Update add/index.xql
bwbohl Jul 3, 2024
b45eeb6
Merge branch 'develop' into fix/annotations-on-page
bwbohl Jul 3, 2024
a422ba6
View TextFacsimileSplitView: add openseadragon as alternative viewer
bwbohl Jul 3, 2024
fea2bd9
Update issue templates
krHERO Jul 5, 2024
441337c
Update problem-report.md
krHERO Jul 5, 2024
a82d3b0
Update problem-report.md
krHERO Jul 8, 2024
7eafbc5
Bump actions/upload-artifact from 4.3.3 to 4.3.4
dependabot[bot] Jul 8, 2024
925404b
Merge pull request #395 from krHERO/develop
roewenstrunk Jul 8, 2024
61e97b7
NFDI4Culture Registry Badge integrated
roewenstrunk Jul 10, 2024
2f39f63
Merge pull request #397 from Edirom/ftr-nfdi4culture-badge
krHERO Jul 10, 2024
72fb478
Merge branch 'develop' into fix/annotations-on-page
bwbohl Jul 11, 2024
2d1d0da
Merge pull request #393 from Edirom/feature/89-CSS-annotTextPreviewArea
bwbohl Jul 11, 2024
554fd88
View SourceView: gray-out go to movement menu if number of movements …
bwbohl Jul 11, 2024
88506b7
View SourceView GotoMsg: gray-out movement combobox if number of move…
bwbohl Jul 11, 2024
a6ef24d
Merge pull request #396 from Edirom/dependabot/github_actions/actions…
bwbohl Jul 11, 2024
038f369
View VerovioView: gray-out gotoMovement menu if number of movements 1…
bwbohl Jul 12, 2024
8461f4e
View MeasureBasedView: refine a TODO comment
bwbohl Jul 12, 2024
b48c420
View MeasureBasedView: disable movement-comboBox on one or lesser mov…
bwbohl Jul 12, 2024
e3108a7
Merge branch 'develop' into ftr/358-grayout-gotoMovement
bwbohl Jul 12, 2024
a8e4f6f
Merge branch 'develop' into fix/annotations-on-page
bwbohl Jul 15, 2024
0809e00
Merge branch 'develop' into fix/339-facsimile-view-with-tei-documents
bwbohl Jul 16, 2024
282ae2b
Merge branch 'develop' into bazga/dev
bwbohl Aug 12, 2024
98f15db
Merge pull request #26 from Edirom/fix/annotations-on-page
bwbohl Aug 12, 2024
5e2043f
Create CODE_OF_CONDUCT.md
krHERO Aug 14, 2024
7bebefa
Create STYLE-GUIDE.md
krHERO Aug 14, 2024
1479c2d
Update CODE_OF_CONDUCT.md
krHERO Aug 15, 2024
1965c7d
Merge pull request #404 from krHERO/ftr-styleguide
bwbohl Aug 15, 2024
62aad2d
Merge pull request #27 from Edirom/fix/339-facsimile-view-with-tei-do…
bwbohl Aug 15, 2024
9b09664
Merge branch 'bazga/dev' into ftr/358-grayout-gotoMovement
bwbohl Aug 15, 2024
dd64a4c
Create pull_request_template.md
krHERO Aug 15, 2024
d43b03b
Set up CONTRIBUTING.md
krHERO Aug 15, 2024
005cb41
Merge branch 'Edirom:develop' into ftr-CodeOfConduct
krHERO Aug 16, 2024
d23ed85
add test advices
krHERO Aug 16, 2024
bed4570
Apply suggestions from code review
krHERO Aug 19, 2024
dce7e96
Update and Rebuild README.md
krHERO Aug 19, 2024
dbcd103
Create images
krHERO Aug 19, 2024
4573223
add images for readme
krHERO Aug 19, 2024
8140e7d
Delete test dummy
krHERO Aug 19, 2024
c137775
add table of content
krHERO Aug 19, 2024
76fb190
minor update to showcases
krHERO Aug 22, 2024
019e89c
Apply suggestions from code review
krHERO Aug 22, 2024
0d6002c
improve reading flow by shorten sentences
krHERO Aug 23, 2024
9bb7d74
minor typos
krHERO Aug 23, 2024
d0a63d7
Merge pull request #410 from krHERO/ftr-update-readme
daniel-jettka Aug 28, 2024
779f15a
Update CONTRIBUTING.md
daniel-jettka Aug 28, 2024
35c2088
Update CONTRIBUTING.md
daniel-jettka Aug 28, 2024
1c7c244
Merge pull request #408 from krHERO/ftr-update_CONTRIBUTING
daniel-jettka Aug 28, 2024
460e73c
Merge pull request #405 from krHERO/ftr-CodeOfConduct
daniel-jettka Aug 28, 2024
b9003fd
Merge pull request #407 from krHERO/ftr-pull_request_template
daniel-jettka Aug 28, 2024
de346bc
Merge pull request #398 from Edirom/ftr/358-grayout-gotoMovement
bwbohl Sep 5, 2024
7201951
Bump actions/upload-artifact from 4.3.4 to 4.4.0
dependabot[bot] Sep 5, 2024
0f0991f
checkout repository recursively
peterstadler Sep 5, 2024
d31d591
Merge pull request #413 from Edirom/peterstadler-patch-1
peterstadler Sep 6, 2024
02cdfc5
replace proprietary `exist:serialize` options
peterstadler Sep 5, 2024
b0a278c
adjust some namespace declarations
peterstadler Sep 5, 2024
dc69127
Merge pull request #414 from Edirom/ftr/362-xquery-replace-all-exists…
bwbohl Sep 6, 2024
52a8c2f
Merge pull request #412 from Edirom/dependabot/github_actions/actions…
bwbohl Sep 6, 2024
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
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest a feature to be implemented in Edirom
title: "[ftr]"
labels: 'Type: feature request'
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is.

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/problem-report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Problem report
about: Create a report to a problem
title: "[BUG]"
assignees: ''

---

**Describe the problem**
A clear and concise description of what the problem is.

**To Reproduce**
Steps to reproduce the behavior, e.g.:
1. Go to '...' [e.g. https://klarinettenquintett.weber-gesamtausgabe.de]
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Data**
Please provide a link to your data (e.g. https://github.com/Edirom/EditionExample) to see the problem or an extract of your data to reproduce the problem.

**Edirom information**
- Version of Edirom [e.g. Release v1.0.0-beta.4 (Emeritus), see [releases](https://github.com/Edirom/Edirom-Online/releases)]
- Add any other context, that might be helpful

**Environment information**
- Browser [e.g. Chrome, Safari, Firefox]
- Version of your MEI files [e.g. 5.0]
- Add any other context, that might be helpful

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Additional context**
Add any other context about the problem here.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
## Description, Context and related Issue
<!--- Please describe your changes. Why is this change required? What problem does it solve? -->

<!--- This project only accepts pull requests related to open issues. Please link to the issue here: -->
Refs #

## How Has This Been Tested?
<!--- Please describe in detail how you tested your changes. -->
<!--- Include details of your testing environment, and the tests you ran. -->

## Types of changes
<!--- What types of changes does your code introduce? Please delete options that are not relevant. -->
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
- [ ] Documentation Update

## Checklist
<!--- Go over all the following points, and delete options that are not relevant. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My change requires a change to the documentation.
- [ ] I have updated the documentation accordingly.
- [ ] I have performed a self-review of my code
- [ ] I have read the [CONTRIBUTING](https://github.com/Edirom/Edirom-Online/blob/develop/CONTRIBUTING.md) document.
- [ ] I have added tests to cover my changes.
- [ ] All new and existing tests passed.
6 changes: 4 additions & 2 deletions .github/workflows/pre-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,9 @@ jobs:

steps:
- name: Chekout repository
uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
submodules: 'recursive'

- name: Get short sha
uses: benjlevesque/short-sha@599815c8ee942a9616c92bcfb4f947a3b670ab0b # v3.0
Expand All @@ -36,7 +38,7 @@ jobs:

- name: Upload Artifacts to action run
if: github.repository == 'Edirom/Edirom-Online'
uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3
uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
# The name that the artifact will be made available under
name: EdiromOnline_${{ steps.short-sha.outputs.sha }}.zip
Expand Down
133 changes: 133 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@

# Contributor Covenant Code of Conduct

## Our Pledge

We as members, contributors, and leaders pledge to make participation in our
community a harassment-free experience for everyone, regardless of age, body
size, visible or invisible disability, ethnicity, sex characteristics, gender
identity and expression, level of experience, education, socio-economic status,
nationality, personal appearance, race, caste, color, religion, or sexual
identity and orientation.

We pledge to act and interact in ways that contribute to an open, welcoming,
diverse, inclusive, and healthy community.

## Our Standards

Examples of behavior that contributes to a positive environment for our
community include:

* Demonstrating empathy and kindness toward other people
* Being respectful of differing opinions, viewpoints, and experiences
* Giving and gracefully accepting constructive feedback
* Accepting responsibility and apologizing to those affected by our mistakes,
and learning from the experience
* Focusing on what is best not just for us as individuals, but for the overall
community

Examples of unacceptable behavior include:

* The use of sexualized language or imagery, and sexual attention or advances of
any kind
* Trolling, insulting or derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or email address,
without their explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting

## Enforcement Responsibilities

Community leaders are responsible for clarifying and enforcing our standards of
acceptable behavior and will take appropriate and fair corrective action in
response to any behavior that they deem inappropriate, threatening, offensive,
or harmful.

Community leaders have the right and responsibility to remove, edit, or reject
comments, commits, code, wiki edits, issues, and other contributions that are
not aligned to this Code of Conduct, and will communicate reasons for moderation
decisions when appropriate.

## Scope

This Code of Conduct applies within all community spaces, and also applies when
an individual is officially representing the community in public spaces.
Examples of representing our community include using an official email address,
posting via an official social media account, or acting as an appointed
representative at an online or offline event.

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
info@edirom.de.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
reporter of any incident.

## Enforcement Guidelines

Community leaders will follow these Community Impact Guidelines in determining
the consequences for any action they deem in violation of this Code of Conduct:

### 1. Correction

**Community Impact**: Use of inappropriate language or other behavior deemed
unprofessional or unwelcome in the community.

**Consequence**: A private, written warning from community leaders, providing
clarity around the nature of the violation and an explanation of why the
behavior was inappropriate. A public apology may be requested.

### 2. Warning

**Community Impact**: A violation through a single incident or series of
actions.

**Consequence**: A warning with consequences for continued behavior. No
interaction with the people involved, including unsolicited interaction with
those enforcing the Code of Conduct, for a specified period of time. This
includes avoiding interactions in community spaces as well as external channels
like social media. Violating these terms may lead to a temporary or permanent
ban.

### 3. Temporary Ban

**Community Impact**: A serious violation of community standards, including
sustained inappropriate behavior.

**Consequence**: A temporary ban from any sort of interaction or public
communication with the community for a specified period of time. No public or
private interaction with the people involved, including unsolicited interaction
with those enforcing the Code of Conduct, is allowed during this period.
Violating these terms may lead to a permanent ban.

### 4. Permanent Ban

**Community Impact**: Demonstrating a pattern of violation of community
standards, including sustained inappropriate behavior, harassment of an
individual, or aggression toward or disparagement of classes of individuals.

**Consequence**: A permanent ban from any sort of public interaction within the
community.

## Attribution

This Code of Conduct is adapted from the [Contributor Covenant][homepage],
version 2.1, available at
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].

Community Impact Guidelines were inspired by
[Mozilla's code of conduct enforcement ladder][Mozilla CoC].

For answers to common questions about this code of conduct, see the FAQ at
[https://www.contributor-covenant.org/faq][FAQ]. Translations are available at
[https://www.contributor-covenant.org/translations][translations].

[homepage]: https://www.contributor-covenant.org
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
[Mozilla CoC]: https://github.com/mozilla/diversity
[FAQ]: https://www.contributor-covenant.org/faq
[translations]: https://www.contributor-covenant.org/translations
Loading
Loading